From 610ddf46badde66a2b4c6e9b003790bcaf676db8 Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Wed, 4 Sep 2024 13:57:30 +0200 Subject: [PATCH 1/7] First version where the current parameters (property, valueset, list of codes) are replaced by a RetrieveParameters record. --- .../CSharpLibrarySetToStreamsWriter.cs | 2 + .../CSharp/CqlBooleanTest-1.0.000.g.cs | 1 + .../CSharp/FHIRConversionTest-2023.0.0.g.cs | 1 + Cql/CoreTests/CSharp/FHIRHelpers-4.0.1.g.cs | 1 + Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs | 3 +- .../CSharp/TestRetrieveInclude-1.0.1.g.cs | 1 + Cql/CoreTests/Fhir/DataSourceTests.cs | 22 ++- Cql/CoreTests/ModelTest.cs | 15 +- .../CqlOperatorsBinder.Specific.cs | 30 +-- Cql/Cql.Compiler/ExpressionBuilderContext.cs | 48 ++--- .../Expressions/NullExpression.cs | 5 +- Cql/Cql.Firely/BundleDataSource.cs | 56 +++--- Cql/Cql.Operators/CompositeDataSource.cs | 33 +--- .../CqlOperators.ClinicalOperators2.cs | 8 +- Cql/Cql.Operators/CqlOperators.cs | 7 +- Cql/Cql.Operators/ICqlOperators.cs | 5 +- Cql/Cql.Operators/IDataSource.cs | 28 +-- Cql/Cql.Operators/PublicAPI.Unshipped.txt | 28 ++- ...ationofCurrentMedicationsFHIR-0.2.000.g.cs | 9 +- .../CSharp/FHIRHelpers-4.3.000.g.cs | 1 + .../MultipleResourcesExample-0.0.1.g.cs | 7 +- .../CSharp/ParametersExample-0.0.1.g.cs | 3 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 3 +- .../CSharp/Status-1.6.000.g.cs | 3 +- .../SupplementalDataElements-3.4.000.g.cs | 5 +- .../CSharp/AHAOverall-2.6.000.g.cs | 41 +++-- .../CSharp/ALARACTOQRFHIR-0.1.001.g.cs | 7 +- .../AdultOutpatientEncounters-4.8.000.g.cs | 17 +- .../AdvancedIllnessandFrailty-1.8.000.g.cs | 31 ++-- .../CSharp/AlaraCTFHIR-0.1.001.g.cs | 5 +- .../CSharp/AlaraCTIQRFHIR-0.1.000.g.cs | 7 +- .../CSharp/Antibiotic-1.5.000.g.cs | 3 +- ...AtrialFibrillationFlutterFHIR-0.3.000.g.cs | 17 +- ...ssantMedicationManagementFHIR-0.1.000.g.cs | 41 +++-- ...teDXAScansForWomenUnder65FHIR-0.0.000.g.cs | 111 +++++------ ...iateTestingforPharyngitisFHIR-0.1.000.g.cs | 55 +++--- ...ropriateTreatmentforSTEMIFHIR-1.0.000.g.cs | 57 +++--- ...erRespiratoryInfectionURIFHIR-0.1.000.g.cs | 49 ++--- .../CSharp/CQMCommon-2.0.000.g.cs | 133 +++++++------- ...ReceiptofSpecialistReportFHIR-0.2.000.g.cs | 19 +- ...racts2040BCVAwithin90DaysFHIR-0.1.000.g.cs | 119 ++++++------ .../CervicalCancerScreeningFHIR-0.0.001.g.cs | 23 +-- .../CSharp/CesareanBirthFHIR-0.2.000.g.cs | 25 +-- ...rMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs | 21 ++- ...ildhoodImmunizationStatusFHIR-0.1.000.g.cs | 115 ++++++------ ...HaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs | 7 +- ...ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs | 59 +++--- .../ColonCancerScreeningFHIR-0.1.000.g.cs | 17 +- .../CumulativeMedicationDuration-4.0.000.g.cs | 3 +- ...PhysicianManagingDiabetesFHIR-0.1.000.g.cs | 59 +++--- ...mentiaCognitiveAssessmentFHIR-0.1.000.g.cs | 33 ++-- .../CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs | 25 +-- ...lobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs | 9 +- ...edonAntithromboticTherapyFHIR-0.9.000.g.cs | 19 +- .../CSharp/FHIRHelpers-4.3.000.g.cs | 1 + ...creeningForFutureFallRiskFHIR-0.1.000.g.cs | 35 ++-- ...escribedADHDMedicationADDFHIR-0.1.000.g.cs | 173 +++++++++--------- ...entforTotalHipReplacementFHIR-0.0.008.g.cs | 53 +++--- ...ssessmentsforHeartFailureFHIR-0.1.000.g.cs | 69 +++---- ...obalMalnutritionCompositeFHIR-0.1.000.g.cs | 23 +-- ...BetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs | 39 ++-- .../CSharp/HIVRetentionFHIR-0.1.000.g.cs | 55 +++--- .../HIVViralSuppressionFHIR-0.1.000.g.cs | 29 +-- Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs | 15 +- ...pioidRelatedAdverseEventsFHIR-0.1.000.g.cs | 13 +- ...ospitalHarmPressureInjuryFHIR-0.1.000.g.cs | 13 +- ...talHarmSevereHypoglycemiaFHIR-0.1.000.g.cs | 13 +- ...bridHospitalWideMortalityFHIR-0.0.001.g.cs | 53 +++--- ...idHospitalWideReadmissionFHIR-0.0.001.g.cs | 61 +++--- ...tteGuerinForBladderCancerFHIR-1.3.000.g.cs | 39 ++-- .../KidneyHealthEvaluationFHIR-0.1.000.g.cs | 27 +-- ...gyPainIntensityQuantifiedFHIR-0.1.000.g.cs | 17 +- .../CSharp/PCMaternal-5.16.000.g.cs | 21 ++- .../PCSBPScreeningFollowUpFHIR-0.2.000.g.cs | 117 ++++++------ .../POAGOpticNerveEvaluationFHIR-0.1.000.g.cs | 27 +-- .../CSharp/PalliativeCare-1.9.000.g.cs | 11 +- ...gAndCessationInterventionFHIR-0.0.001.g.cs | 57 +++--- ...entionasOfferedbyDentistsFHIR-0.0.002.g.cs | 7 +- ...aAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs | 19 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 3 +- ...ereObstetricComplicationsFHIR-0.1.000.g.cs | 21 ++- Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs | 3 +- .../SupplementalDataElements-3.4.000.g.cs | 5 +- .../CSharp/TJCOverall-8.11.000.g.cs | 9 +- ...enignProstaticHyperplasiaFHIR-1.3.000.g.cs | 21 ++- ...skMedicationsintheElderlyFHIR-0.1.000.g.cs | 137 +++++++------- Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs | 3 +- ...forChildrenandAdolescentsFHIR-0.1.000.g.cs | 29 +-- ...dultOutpatientEncountersFHIR4-2.2.000.g.cs | 13 +- ...andFrailtyExclusionECQMFHIR4-5.17.000.g.cs | 37 ++-- .../CSharp/BCSEHEDISMY2022-1.0.0.g.cs | 31 ++-- .../BreastCancerScreeningsFHIR-0.0.009.g.cs | 31 ++-- .../CervicalCancerScreeningFHIR-0.0.005.g.cs | 27 +-- ...olorectalCancerScreeningsFHIR-0.0.003.g.cs | 51 +++--- ...lativeMedicationDurationFHIR4-1.0.000.g.cs | 3 +- ...PhysicianManagingDiabetesFHIR-0.0.004.g.cs | 57 +++--- .../CSharp/DevDays-2023.0.0.g.cs | 7 +- ...lobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs | 11 +- ...edonAntithromboticTherapyFHIR-0.0.010.g.cs | 9 +- .../CSharp/Exam125FHIR-0.0.009.g.cs | 31 ++-- .../CSharp/Exam130FHIR-0.0.003.g.cs | 51 +++--- .../Measures.Demo/CSharp/FHIR347-0.1.021.g.cs | 97 +++++----- .../CSharp/FHIRHelpers-4.0.001.g.cs | 3 +- .../CSharp/HospiceFHIR4-2.3.000.g.cs | 9 +- ...miainHospitalizedPatientsFHIR-0.0.006.g.cs | 19 +- ...talHarmSevereHypoglycemiaFHIR-0.0.012.g.cs | 15 +- .../CSharp/HybridHWMFHIR-0.102.005.g.cs | 37 ++-- .../CSharp/HybridHWRFHIR-1.3.005.g.cs | 43 ++--- ...MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs | 27 +-- .../NCQAAdvancedIllnessandFrailty-1.0.0.g.cs | 37 ++-- .../CSharp/NCQACQLBase-1.0.0.g.cs | 1 + .../CSharp/NCQAClaims-1.0.0.g.cs | 5 +- .../CSharp/NCQAEncounter-1.0.0.g.cs | 1 + .../CSharp/NCQAFHIRBase-1.0.0.g.cs | 3 +- .../NCQAHealthPlanEnrollment-1.0.0.g.cs | 1 + .../CSharp/NCQAHospice-1.0.0.g.cs | 7 +- .../CSharp/NCQAPalliativeCare-1.0.0.g.cs | 9 +- .../CSharp/NCQAStatus-1.0.0.g.cs | 3 +- .../CSharp/NCQATerminology-1.0.0.g.cs | 1 + .../CSharp/PalliativeCareFHIR-0.6.000.g.cs | 9 +- ...edbyPCPsincludingDentistsFHIR-0.0.008.g.cs | 21 ++- ...oidsConcurrentPrescribingFHIR-0.0.012.g.cs | 23 +-- ...SupplementalDataElementsFHIR4-2.0.000.g.cs | 5 +- .../CSharp/TJCOverallFHIR-1.8.000.g.cs | 11 +- .../CSharp/VTEFHIR4-4.8.000.g.cs | 3 +- 125 files changed, 1756 insertions(+), 1663 deletions(-) diff --git a/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs b/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs index 6bf64dfc3..ee0db194e 100644 --- a/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs +++ b/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs @@ -20,6 +20,7 @@ using System.Reflection; using System.Text; using Hl7.Cql.Compiler; +using Hl7.Cql.Operators; using Microsoft.Extensions.Options; namespace Hl7.Cql.CodeGeneration.NET @@ -71,6 +72,7 @@ private static HashSet BuildUsings(TypeResolver typeResolver) typeof(IValueSetFacade).Namespace!, typeof(Iso8601.DateIso8601).Namespace!, typeof(PropertyInfo).Namespace!, + typeof(RetrieveParameters).Namespace!, }; foreach (var @using in typeResolver.ModelNamespaces) diff --git a/Cql/CoreTests/CSharp/CqlBooleanTest-1.0.000.g.cs b/Cql/CoreTests/CSharp/CqlBooleanTest-1.0.000.g.cs index eb101ef23..ac984a440 100644 --- a/Cql/CoreTests/CSharp/CqlBooleanTest-1.0.000.g.cs +++ b/Cql/CoreTests/CSharp/CqlBooleanTest-1.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Cql/CoreTests/CSharp/FHIRConversionTest-2023.0.0.g.cs b/Cql/CoreTests/CSharp/FHIRConversionTest-2023.0.0.g.cs index 0e096ff5d..aed291a02 100644 --- a/Cql/CoreTests/CSharp/FHIRConversionTest-2023.0.0.g.cs +++ b/Cql/CoreTests/CSharp/FHIRConversionTest-2023.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Cql/CoreTests/CSharp/FHIRHelpers-4.0.1.g.cs b/Cql/CoreTests/CSharp/FHIRHelpers-4.0.1.g.cs index 51f6ce8a7..2ab986fef 100644 --- a/Cql/CoreTests/CSharp/FHIRHelpers-4.0.1.g.cs +++ b/Cql/CoreTests/CSharp/FHIRHelpers-4.0.1.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs b/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs index bf7aa02a3..72e64473c 100644 --- a/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs +++ b/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -191,7 +192,7 @@ public object MeasurementPeriod() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Cql/CoreTests/CSharp/TestRetrieveInclude-1.0.1.g.cs b/Cql/CoreTests/CSharp/TestRetrieveInclude-1.0.1.g.cs index 72f146858..9b4cf0728 100644 --- a/Cql/CoreTests/CSharp/TestRetrieveInclude-1.0.1.g.cs +++ b/Cql/CoreTests/CSharp/TestRetrieveInclude-1.0.1.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Cql/CoreTests/Fhir/DataSourceTests.cs b/Cql/CoreTests/Fhir/DataSourceTests.cs index b5272af17..abe5f80ec 100644 --- a/Cql/CoreTests/Fhir/DataSourceTests.cs +++ b/Cql/CoreTests/Fhir/DataSourceTests.cs @@ -6,6 +6,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Linq; +using Hl7.Cql.Operators; namespace CoreTests.Fhir { @@ -17,27 +18,29 @@ public void FiltersOnResourceType() { var dr = buildDataSource(); - var results = dr.RetrieveByCodes(); + var results = dr.Retrieve(null); results.Should().HaveCount(2); results.Should().AllBeOfType(); } + private static RetrieveParameters Pars(params CqlCode[] codes) => new(null, null, codes); + [TestMethod] public void FiltersOnDefaultProp() { var dr = buildDataSource(); - var results = dr.RetrieveByCodes(new[] { new CqlCode("x", "http://nu.nl", null, null) }); + var results = dr.Retrieve(Pars(new CqlCode("x", "http://nu.nl"))); results.Should().HaveCount(1); results.Should().AllBeOfType().And.AllSatisfy(o => o.Code.Coding[0].Code.Should().Be("x")); - results = dr.RetrieveByCodes(new[] { new CqlCode("z", "http://nu.nl", null, null) }); + results = dr.Retrieve(Pars(new CqlCode("z", "http://nu.nl"))); results.Should().BeEmpty(); - Assert.ThrowsException(() => - dr.RetrieveByCodes(new[] { new CqlCode("x", "http://nu.nl", null, null) })); + Assert.ThrowsException( + () => dr.Retrieve(Pars(new CqlCode("x", "http://nu.nl")))); - results = dr.RetrieveByCodes(new[] { new CqlCode("x", "http://nu.nl", null, null), new CqlCode("y", "http://nu.nl", null, null) }); + results = dr.Retrieve(Pars(new CqlCode("x", "http://nu.nl"), new CqlCode("y", "http://nu.nl"))); results.Should().HaveCount(2); results.Should().AllBeOfType().And.AllSatisfy(o => o.Code.Coding[0].System.Should().Be("http://nu.nl")); } @@ -50,13 +53,14 @@ public void FiltersOnSpecificProp() var genderProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient"), "gender"); genderProp.Should().NotBeNull(); - var results = dr.RetrieveByCodes(new[] { new CqlCode("male", "http://hl7.org/fhir/administrative-gender", null, null) }, genderProp); + var results = dr.Retrieve(new RetrieveParameters(genderProp, null, + [new CqlCode("male", "http://hl7.org/fhir/administrative-gender")])); results.Should().HaveCount(1); results.Should().AllBeOfType().And.AllSatisfy(p => p.Gender.Should().Be(AdministrativeGender.Male)); var activeProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient"), "active"); Assert.ThrowsException(() => - dr.RetrieveByCodes(new[] { new CqlCode("male", "http://hl7.org/fhir/administrative-gender", null, null) }, activeProp).ToList()); + dr.Retrieve(new RetrieveParameters(activeProp, null, new[] { new CqlCode("male", "http://hl7.org/fhir/administrative-gender") })).ToList()); } private BundleDataSource buildDataSource() @@ -75,4 +79,4 @@ private BundleDataSource buildDataSource() return new BundleDataSource(bundle, new HashValueSetDictionary()); // we're not calling IsInValueSet, so we can pass an empty dict } } -} +} \ No newline at end of file diff --git a/Cql/CoreTests/ModelTest.cs b/Cql/CoreTests/ModelTest.cs index 9eab1e1e7..5a570e996 100644 --- a/Cql/CoreTests/ModelTest.cs +++ b/Cql/CoreTests/ModelTest.cs @@ -57,24 +57,17 @@ private class UnitTestPatient public DateIso8601 birthDate { get; set; } } - private class UnitTestDataSource : IDataSource + private class UnitTestDataSource(IEnumerable data) : IDataSource { - public UnitTestDataSource(IEnumerable data) - { - Data = data?.ToList() ?? new List(); - } - - public IList Data { get; } + public IList Data { get; } = data?.ToList() ?? new List(); #if VNEXT public event EventHandler DataChanged; #endif - public IEnumerable RetrieveByCodes(IEnumerable codes = null, PropertyInfo _ = null) where T : class => + public IEnumerable Retrieve(RetrieveParameters _) where T : class => Data.OfType(); - public IEnumerable RetrieveByValueSet(CqlValueSet valueSet = null, PropertyInfo _ = null) where T : class => - Data.OfType(); } private class UnitTestTypeResolver : BaseTypeResolver @@ -92,4 +85,4 @@ private class UnitTestTypeResolver : BaseTypeResolver internal override bool ShouldUseSourceObject(Type type, string propertyName) => true; } } -} +} \ No newline at end of file diff --git a/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs b/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs index 96eb4475d..4a41aeb60 100644 --- a/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs +++ b/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs @@ -8,6 +8,7 @@ using System; using System.Collections.Generic; using System.ComponentModel; +using System.Linq; using System.Linq.Expressions; using System.Reflection; using Hl7.Cql.Compiler.Expressions; @@ -202,25 +203,26 @@ private MethodCallExpression Retrieve( } + protected MethodCallExpression Retrieve( Type resourceType, Expression codes, Expression codeProperty) { - MethodInfo? forType = null; + var forType = typeof(ICqlOperators).GetMethod(nameof(ICqlOperators.Retrieve))!.MakeGenericMethod(resourceType); + Expression codeExpression = NullExpression.ForType>(); + Expression valuesetExpression = NullExpression.ForType(); + if (codes.Type == typeof(CqlValueSet)) - { - var method = typeof(ICqlOperators).GetMethod(nameof(ICqlOperators.RetrieveByValueSet))!; - forType = method.MakeGenericMethod(resourceType); - } + valuesetExpression = codes; else if (_typeResolver.IsListType(codes.Type)) { var elementType = _typeResolver.GetListElementType(codes.Type, true)!; if (elementType == typeof(CqlCode)) { - var method = typeof(ICqlOperators).GetMethod(nameof(ICqlOperators.RetrieveByCodes))!; - forType = method.MakeGenericMethod(resourceType); + codeExpression = codes; } + // cql-to-elm blindly calls ToList when an expression ref is used // for expressions like: // [Source : "Definition returning List"] @@ -228,16 +230,20 @@ protected MethodCallExpression Retrieve( else if (_typeResolver.IsListType(elementType) && _typeResolver.GetListElementType(elementType) == typeof(CqlCode)) { // call Flatten. - codes = Flatten(codes); - var method = typeof(ICqlOperators).GetMethod(nameof(ICqlOperators.RetrieveByCodes))!; - forType = method.MakeGenericMethod(resourceType); + codeExpression = Flatten(codes); } else throw new ArgumentException($"Retrieve statements with an ExpressionRef in the terminology position must be list of {nameof(CqlCode)} or a list of lists of {nameof(CqlCode)}. Instead, the list's element type is {elementType.Name}.", nameof(codes)); } else throw new ArgumentException($"Retrieve statements can only accept terminology expressions whose type is {nameof(CqlValueSet)} or {nameof(IEnumerable)}. The expression provided has a type of {codes.Type.FullName}", nameof(codes)); - var call = BindToDirectMethod(forType, codes, codeProperty); + var constructor = typeof(RetrieveParameters).GetConstructors(BindingFlags.Public | BindingFlags.Instance).Single(); + var hasFilters = !codeProperty.IsNullConstant() || !codeExpression.IsNullConstant() || !valuesetExpression.IsNullConstant(); + Expression createParameters = hasFilters + ? Expression.New(constructor, codeProperty, valuesetExpression, codeExpression) + : NullExpression.ForType(); + + var call = BindToDirectMethod(forType, createParameters); return call; } @@ -314,4 +320,4 @@ private MethodCallExpression SelectManyResults( var call = BindToBestMethodOverload(nameof(ICqlOperators.SelectManyResults), [source, collectionSelector, resultSelector], [firstGenericArgument, secondGenericArgument, resultSelector.ReturnType])!; return call; } -} +} \ No newline at end of file diff --git a/Cql/Cql.Compiler/ExpressionBuilderContext.cs b/Cql/Cql.Compiler/ExpressionBuilderContext.cs index 2a9b936c0..7cabe39f1 100644 --- a/Cql/Cql.Compiler/ExpressionBuilderContext.cs +++ b/Cql/Cql.Compiler/ExpressionBuilderContext.cs @@ -6,6 +6,16 @@ * available at https://raw.githubusercontent.com/FirelyTeam/firely-cql-sdk/main/LICENSE */ +using Hl7.Cql.Abstractions; +using Hl7.Cql.Abstractions.Infrastructure; +using Hl7.Cql.Compiler.Expressions; +using Hl7.Cql.Compiler.Infrastructure; +using Hl7.Cql.Elm; +using Hl7.Cql.Model; +using Hl7.Cql.Operators; +using Hl7.Cql.Primitives; +using Hl7.Cql.Runtime; +using Microsoft.Extensions.Logging; using System; using System.Collections.Generic; using System.Collections.Immutable; @@ -18,26 +28,16 @@ using System.Linq.Expressions; using System.Reflection; using System.Xml; -using Hl7.Cql.Abstractions; -using Hl7.Cql.Abstractions.Infrastructure; -using Hl7.Cql.Compiler.Expressions; -using Hl7.Cql.Compiler.Infrastructure; -using Hl7.Cql.Elm; -using Hl7.Cql.Model; -using Hl7.Cql.Operators; -using Hl7.Cql.Primitives; -using Hl7.Cql.Runtime; -using Microsoft.Extensions.Logging; using ChoiceTypeSpecifier = Hl7.Cql.Elm.ChoiceTypeSpecifier; using Convert = System.Convert; using DateTime = Hl7.Cql.Elm.DateTime; using Expression = System.Linq.Expressions.Expression; -using TypeConverter = Hl7.Cql.Conversion.TypeConverter; -using TypeSpecifier = Hl7.Cql.Elm.TypeSpecifier; using ListTypeSpecifier = Hl7.Cql.Elm.ListTypeSpecifier; using NamedTypeSpecifier = Hl7.Cql.Elm.NamedTypeSpecifier; using Tuple = Hl7.Cql.Elm.Tuple; using TupleTypeSpecifier = Hl7.Cql.Elm.TupleTypeSpecifier; +using TypeConverter = Hl7.Cql.Conversion.TypeConverter; +using TypeSpecifier = Hl7.Cql.Elm.TypeSpecifier; namespace Hl7.Cql.Compiler; @@ -49,7 +49,7 @@ namespace Hl7.Cql.Compiler; /// /// The scope information in this class is useful for and is supplied to . /// -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { private readonly CqlOperatorsBinder _cqlOperatorsBinder; private readonly CqlContextBinder _contextBinder; @@ -1168,7 +1168,7 @@ protected Expression InvokeDefinedFunctionThroughRuntimeContext( var rtt = TypeFor(returnType) ?? throw this.NewExpressionBuildingException($"Unable to resolve type for {returnType}"); var convertedArguments = arguments - .Select((a,i) => convertChoice(a,signature?[i])) + .Select((a, i) => convertChoice(a, signature?[i])) .Prepend(CqlExpressions.ParameterExpression) .ToArray(); var funcType = convertedArguments.Select(a => a.Type).Append(rtt).ToArray(); @@ -1184,7 +1184,7 @@ protected Expression InvokeDefinedFunctionThroughRuntimeContext( // choice is not compatible with the parameter, so we'll use an As in C#. Expression convertChoice(Expression argument, TypeSpecifier? actualType) { - if(actualType is not null && argument.Type == typeof(object)) + if (actualType is not null && argument.Type == typeof(object)) { var type = TypeFor(actualType) ?? throw new InvalidOperationException($"Unable to resolve type for {actualType}"); return argument.NewTypeAsExpression(type); @@ -1247,7 +1247,7 @@ private Expression ProcessValueSet(ValueSetRef valueSetRef, Elm.Expression value #region ArithmeticOperators -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { private const string Int32MaxPlusOneAsString = "2147483648"; @@ -1279,7 +1279,7 @@ private Expression Negate(Negate e) #region ComparisonOperators -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { protected Expression Equivalent(Equivalent eqv) { @@ -1301,7 +1301,7 @@ protected Expression Equivalent(Equivalent eqv) #region ErrorsAndMessaging -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { private Expression Message(Message e) { @@ -1332,7 +1332,7 @@ private Expression Message(Message e) #region IntervalOperators -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { protected Expression? Includes(Includes e) { @@ -1520,7 +1520,7 @@ protected Expression IncludedIn(IncludedIn e) #region NullologicalOperators -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { protected Expression Coalesce(Coalesce ce) { @@ -1566,7 +1566,7 @@ protected Expression IsNull(IsNull isn) #endregion #region Query -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { protected Expression Query(Query query) { @@ -2112,7 +2112,7 @@ protected Expression AggregateClause( #region Type Operators -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { protected Expression As(As @as) //@ TODO: Cast - As { @@ -2161,7 +2161,7 @@ protected Expression As(As @as) //@ TODO: Cast - As { var type = TypeFor(@as.asTypeSpecifier!)!; var operand = TranslateArg(@as.operand!); - var converted = ChangeType(operand, type, out var typeConversion, safeUpcastAllowed:true); + var converted = ChangeType(operand, type, out var typeConversion, safeUpcastAllowed: true); switch (typeConversion) { case TypeConversion.NoMatch: @@ -2253,7 +2253,7 @@ protected Expression Is(Is @is) // @TODO: Cast - Is #region ChangeType -partial class ExpressionBuilderContext +internal partial class ExpressionBuilderContext { private Expression ChangeType( Expression expr, diff --git a/Cql/Cql.Compiler/Expressions/NullExpression.cs b/Cql/Cql.Compiler/Expressions/NullExpression.cs index e98c3af04..66f99235b 100644 --- a/Cql/Cql.Compiler/Expressions/NullExpression.cs +++ b/Cql/Cql.Compiler/Expressions/NullExpression.cs @@ -28,8 +28,11 @@ public static ConstantExpression ForType() public static ConstantExpression ForType(Type type) => (ConstantExpression)ForType_GenericDefinitionMethodInfo.MakeGenericMethod(type).Invoke(null, [])!; + public static bool IsNullConstant(this Expression expression) => + expression is ConstantExpression { Value: null }; + private static class Typed { public static readonly ConstantExpression Instance = Expression.Constant(null, typeof(T)); } -} +} \ No newline at end of file diff --git a/Cql/Cql.Firely/BundleDataSource.cs b/Cql/Cql.Firely/BundleDataSource.cs index 7bd279158..89c4bdc20 100644 --- a/Cql/Cql.Firely/BundleDataSource.cs +++ b/Cql/Cql.Firely/BundleDataSource.cs @@ -14,8 +14,6 @@ using Hl7.Fhir.Model; using System.Reflection; -#nullable enable - namespace Hl7.Cql.Fhir { /// @@ -59,42 +57,41 @@ public BundleDataSource(Bundle bundle, public event EventHandler? DataChanged; #endif - /// - public IEnumerable RetrieveByCodes(IEnumerable? allowedCodes = null, PropertyInfo? codeProperty = null) where T : class + public IEnumerable Retrieve(RetrieveParameters? parameters) where T : class { - if (allowedCodes is not null) + return parameters switch { - Predicate filter = allowedCodes is IValueSetFacade valueSet ? - c => valueSet.IsCodeInValueSet(c.Code, c.System) == true - : listFilter; + null => Bundle.FilterByType(), + { Codes: { } codes } => RetrieveByCodes(codes, parameters.CodeProperty), + { ValueSet: { } valueSet } => RetrieveByValueSet(valueSet, parameters.CodeProperty), + _ => Bundle.FilterByType() + }; + } - return executeFilter(filter, codeProperty); + /// + private IEnumerable RetrieveByCodes(IEnumerable allowedCodes, PropertyInfo? codeProperty = null) where T : class + { + Predicate filter = allowedCodes is IValueSetFacade valueSet ? + c => valueSet.IsCodeInValueSet(c.Code, c.System) == true + : listFilter; - bool listFilter(Coding l) => allowedCodes.Any(allowed => - allowed is not null && - _systemComparer.Equivalent(l.System, allowed.system, null) && - _codeComparer.Equivalent(l.Code, allowed.code, null)); - } - else - { - return Bundle.FilterByType(); - } + return ExecuteFilter(filter, codeProperty); + + bool listFilter(Coding l) => allowedCodes.Any(allowed => + allowed is not null && + _systemComparer.Equivalent(l.System, allowed.system, null) && + _codeComparer.Equivalent(l.Code, allowed.code, null)); } /// - public IEnumerable RetrieveByValueSet(CqlValueSet? valueSet = null, PropertyInfo? codeProperty = null) where T : class + private IEnumerable RetrieveByValueSet(CqlValueSet valueSet, PropertyInfo? codeProperty = null) where T : class { - if (valueSet != null && valueSet.id != null) - { - return executeFilter(c => ValueSets.IsCodeInValueSet(valueSet.id, c.Code, c.System), codeProperty); - } - else - { - return Bundle.FilterByType(); - } + return valueSet.id != null ? + ExecuteFilter(c => ValueSets.IsCodeInValueSet(valueSet.id, c.Code, c.System), codeProperty) : + Bundle.FilterByType(); } - private IEnumerable executeFilter(Predicate filter, PropertyInfo? codeProperty) where T : class + private IEnumerable ExecuteFilter(Predicate filter, PropertyInfo? codeProperty) where T : class { if (codeProperty is null) { @@ -121,5 +118,4 @@ IEnumerable getCodedValues(T instance) } } } -} -#nullable disable \ No newline at end of file +} \ No newline at end of file diff --git a/Cql/Cql.Operators/CompositeDataSource.cs b/Cql/Cql.Operators/CompositeDataSource.cs index fff68c492..e0c6005b9 100644 --- a/Cql/Cql.Operators/CompositeDataSource.cs +++ b/Cql/Cql.Operators/CompositeDataSource.cs @@ -27,9 +27,7 @@ public class CompositeDataSource : IDataSource /// If is public CompositeDataSource(params IDataSource[] sources) { - DataSources = sources ?? throw new ArgumentNullException(nameof(sources)); - if (sources.Any(r => r is null)) - throw new ArgumentNullException(nameof(sources), "At least one data source supplied is null."); + DataSources = sources; #if VNEXT foreach (var r in sources) r.DataChanged += triggerDataChanged; @@ -51,29 +49,8 @@ private void triggerDataChanged(object? sender, EventArgs e) /// public IDataSource[] DataSources { get; } - /// - /// Retrieves resources whose code path contains a code from the if specified. - /// Otherwise, returns all resources of type . - /// - /// The type of resource to return. - /// The list of codes on which to filter the resources, or . - /// The property of which defines the code to compare against . This parameter should be when is . - /// Resources of type matching the parameter criteria. - public IEnumerable RetrieveByCodes(IEnumerable? codes = null, PropertyInfo? codeProperty = null) where T : class => - DataSources - .SelectMany(r => - r.RetrieveByCodes(codes, codeProperty)); - - /// - /// Retrieves resources whose code path contains a code from the if specified. - /// Otherwise, returns all resources of type . - /// - /// The type of resource to return. - /// The value set on which to filter the resources, or . - /// The property of which defines the code to compare against . This parameter should be when is . - /// Resources of type matching the parameter criteria. - public IEnumerable RetrieveByValueSet(CqlValueSet? valueSet = null, PropertyInfo? codeProperty = null) where T : class => - DataSources.SelectMany(r => - r.RetrieveByValueSet(valueSet, codeProperty)); + /// + public IEnumerable Retrieve(RetrieveParameters? parameters) where T : class => + DataSources.SelectMany(r => r.Retrieve(parameters)); } -} +} \ No newline at end of file diff --git a/Cql/Cql.Operators/CqlOperators.ClinicalOperators2.cs b/Cql/Cql.Operators/CqlOperators.ClinicalOperators2.cs index e6abf4ed5..4cfe910e9 100644 --- a/Cql/Cql.Operators/CqlOperators.ClinicalOperators2.cs +++ b/Cql/Cql.Operators/CqlOperators.ClinicalOperators2.cs @@ -27,9 +27,9 @@ internal partial class CqlOperators var birthDateProperty = TypeResolver.PatientBirthDateProperty ?? throw new InvalidOperationException($"This type resolver provided a null value for {nameof(TypeResolver.PatientBirthDateProperty)}"); var method = typeof(IDataSource) - .GetMethod(nameof(IDataSource.RetrieveByValueSet))! + .GetMethod(nameof(IDataSource.Retrieve))! .MakeGenericMethod(patientType); - var patients = method.Invoke(DataSource, [null, null]) as IEnumerable; + var patients = method.Invoke(DataSource, [null]) as IEnumerable; var patientsArray = patients?.ToArray() ?? Array.Empty(); if (patientsArray.Length == 1) { @@ -51,9 +51,9 @@ internal partial class CqlOperators var birthDateProperty = TypeResolver.PatientBirthDateProperty ?? throw new InvalidOperationException($"This type resolver provided a null value for {nameof(TypeResolver.PatientBirthDateProperty)}"); var method = typeof(IDataSource) - .GetMethod(nameof(IDataSource.RetrieveByValueSet))! + .GetMethod(nameof(IDataSource.Retrieve))! .MakeGenericMethod(patientType); - var patients = method.Invoke(DataSource, [null, null]) as IEnumerable; + var patients = method.Invoke(DataSource, [null]) as IEnumerable; var patientsArray = patients?.ToArray() ?? Array.Empty(); if (patientsArray.Length == 1) { diff --git a/Cql/Cql.Operators/CqlOperators.cs b/Cql/Cql.Operators/CqlOperators.cs index 6638e8eff..9622ae056 100644 --- a/Cql/Cql.Operators/CqlOperators.cs +++ b/Cql/Cql.Operators/CqlOperators.cs @@ -192,11 +192,8 @@ public T Message(T source, string code, string severity, string message) public T? Convert(object? from) => TypeConverter.Convert(from); - public IEnumerable RetrieveByCodes(IEnumerable? codes = null, PropertyInfo? codeProperty = null) where T : class => - DataSource.RetrieveByCodes(codes, codeProperty); - - public IEnumerable RetrieveByValueSet(CqlValueSet? valueSet = null, PropertyInfo? codeProperty = null) where T : class => - DataSource.RetrieveByValueSet(valueSet, codeProperty); + public IEnumerable Retrieve(RetrieveParameters? parameters) where T : class => + DataSource.Retrieve(parameters); } } #pragma warning restore CS1591 // Missing XML comment for publicly visible type or member \ No newline at end of file diff --git a/Cql/Cql.Operators/ICqlOperators.cs b/Cql/Cql.Operators/ICqlOperators.cs index ebef11d7e..5673ab400 100644 --- a/Cql/Cql.Operators/ICqlOperators.cs +++ b/Cql/Cql.Operators/ICqlOperators.cs @@ -28,8 +28,7 @@ public interface ICqlOperators T? Convert(object? from); - IEnumerable RetrieveByValueSet(CqlValueSet? valueSet = null, PropertyInfo? codeProperty = null) where T : class; - IEnumerable RetrieveByCodes(IEnumerable? codes = null, PropertyInfo? codeProperty = null) where T : class; + IEnumerable Retrieve(RetrieveParameters? parameters) where T : class; #region Operators @@ -575,4 +574,6 @@ public interface ICqlOperators #endregion } + + public record RetrieveParameters(PropertyInfo? CodeProperty, CqlValueSet? ValueSet, IEnumerable? Codes); } \ No newline at end of file diff --git a/Cql/Cql.Operators/IDataSource.cs b/Cql/Cql.Operators/IDataSource.cs index 5dbd9cc2a..7c6ae16a1 100644 --- a/Cql/Cql.Operators/IDataSource.cs +++ b/Cql/Cql.Operators/IDataSource.cs @@ -17,13 +17,13 @@ namespace Hl7.Cql.Operators /// Defines how the Retrieve operator acquires its data. /// /// - /// For CQL libraries defining context Patient it is implied that all results of retrieve statements + /// For CQL libraries defining context Patient it is implied that all results of retrieve statements /// will only pertain to the singular patient "in context." This is typically operationalized by storing all /// resources germane to a specific patient resource in a single bundle. /// /// /// Other options are available. Implementers can acquire data however they want (e.g., remotely from a FHIR server or database), - /// as long as libraries that assert a context Patient will be provided only relevant data to that patient. + /// as long as libraries that assert a context Patient will be provided only relevant data to that patient. /// /// /// This interface requires specific understanding of the model binding, and should pair with implementations of @@ -33,28 +33,14 @@ namespace Hl7.Cql.Operators public interface IDataSource { /// - /// Retrieves resources whose code path contains a code from the if specified. - /// Otherwise, returns all resources of type . + /// Retrieves resources based on a set of filter criteria in . /// /// The type of resource to return. - /// The list of codes on which to filter the resources, or . - /// The property of which defines the code to compare - /// against . This parameter should be when - /// is . + /// The filtering criteria to use for the retrieve, or to retrieve + /// all resources of type . /// Resources of type matching the parameter criteria. - IEnumerable RetrieveByCodes(IEnumerable? codes = null, PropertyInfo? codeProperty = null) where T : class; + IEnumerable Retrieve(RetrieveParameters? parameters) where T : class; - /// - /// Retrieves resources whose code path contains a code from the if specified. - /// Otherwise, returns all resources of type . - /// - /// The type of resource to return. - /// The value set on which to filter the resources, or . - /// The property of which defines the code to compare - /// against . This parameter should be when - /// is . - /// Resources of type matching the parameter criteria. - IEnumerable RetrieveByValueSet(CqlValueSet? valueSet = null, PropertyInfo? codeProperty = null) where T : class; #if VNEXT /// @@ -64,4 +50,4 @@ public interface IDataSource event EventHandler? DataChanged; #endif } -} +} \ No newline at end of file diff --git a/Cql/Cql.Operators/PublicAPI.Unshipped.txt b/Cql/Cql.Operators/PublicAPI.Unshipped.txt index c2811ce5b..872fb16ef 100644 --- a/Cql/Cql.Operators/PublicAPI.Unshipped.txt +++ b/Cql/Cql.Operators/PublicAPI.Unshipped.txt @@ -2,8 +2,7 @@ Hl7.Cql.Operators.CompositeDataSource Hl7.Cql.Operators.CompositeDataSource.CompositeDataSource(params Hl7.Cql.Operators.IDataSource![]! sources) -> void Hl7.Cql.Operators.CompositeDataSource.DataSources.get -> Hl7.Cql.Operators.IDataSource![]! -Hl7.Cql.Operators.CompositeDataSource.RetrieveByCodes(System.Collections.Generic.IEnumerable? codes = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! -Hl7.Cql.Operators.CompositeDataSource.RetrieveByValueSet(Hl7.Cql.Primitives.CqlValueSet? valueSet = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! +Hl7.Cql.Operators.CompositeDataSource.Retrieve(Hl7.Cql.Operators.RetrieveParameters? parameters) -> System.Collections.Generic.IEnumerable! Hl7.Cql.Operators.ICqlOperators Hl7.Cql.Operators.ICqlOperators.Abs(decimal? argument) -> decimal? Hl7.Cql.Operators.ICqlOperators.Abs(Hl7.Cql.Primitives.CqlQuantity? argument) -> Hl7.Cql.Primitives.CqlQuantity? @@ -399,8 +398,7 @@ Hl7.Cql.Operators.ICqlOperators.Product(System.Collections.Generic.IEnumerable Hl7.Cql.Primitives.CqlQuantity? Hl7.Cql.Operators.ICqlOperators.ReplaceMatches(string! source, string! pattern, string! substitution) -> string? Hl7.Cql.Operators.ICqlOperators.ResolveValueSet(Hl7.Cql.Primitives.CqlValueSet! valueSet) -> System.Collections.Generic.IEnumerable! -Hl7.Cql.Operators.ICqlOperators.RetrieveByCodes(System.Collections.Generic.IEnumerable? codes = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! -Hl7.Cql.Operators.ICqlOperators.RetrieveByValueSet(Hl7.Cql.Primitives.CqlValueSet? valueSet = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! +Hl7.Cql.Operators.ICqlOperators.Retrieve(Hl7.Cql.Operators.RetrieveParameters? parameters) -> System.Collections.Generic.IEnumerable! Hl7.Cql.Operators.ICqlOperators.Round(decimal? argument, int? precision) -> decimal? Hl7.Cql.Operators.ICqlOperators.SameAs(Hl7.Cql.Primitives.CqlDate? left, Hl7.Cql.Primitives.CqlDate? right, string? precision) -> bool? Hl7.Cql.Operators.ICqlOperators.SameAs(Hl7.Cql.Primitives.CqlDateTime? left, Hl7.Cql.Primitives.CqlDateTime? right, string? precision) -> bool? @@ -504,10 +502,28 @@ Hl7.Cql.Operators.ICqlOperators.Width(Hl7.Cql.Primitives.CqlInterval? thi Hl7.Cql.Operators.ICqlOperators.Xor(bool? left, bool? right) -> bool? Hl7.Cql.Operators.ICqlOperators.Xor(System.Lazy! left, System.Lazy! right) -> bool? Hl7.Cql.Operators.IDataSource -Hl7.Cql.Operators.IDataSource.RetrieveByCodes(System.Collections.Generic.IEnumerable? codes = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! -Hl7.Cql.Operators.IDataSource.RetrieveByValueSet(Hl7.Cql.Primitives.CqlValueSet? valueSet = null, System.Reflection.PropertyInfo? codeProperty = null) -> System.Collections.Generic.IEnumerable! +Hl7.Cql.Operators.IDataSource.Retrieve(Hl7.Cql.Operators.RetrieveParameters? parameters) -> System.Collections.Generic.IEnumerable! Hl7.Cql.Operators.MessageEventArgs Hl7.Cql.Operators.MessageEventArgs.Code.get -> string? Hl7.Cql.Operators.MessageEventArgs.Message.get -> string? Hl7.Cql.Operators.MessageEventArgs.Severity.get -> string? Hl7.Cql.Operators.MessageEventArgs.Source.get -> object? +Hl7.Cql.Operators.RetrieveParameters +Hl7.Cql.Operators.RetrieveParameters.CodeProperty.get -> System.Reflection.PropertyInfo? +Hl7.Cql.Operators.RetrieveParameters.CodeProperty.init -> void +Hl7.Cql.Operators.RetrieveParameters.Codes.get -> System.Collections.Generic.IEnumerable? +Hl7.Cql.Operators.RetrieveParameters.Codes.init -> void +Hl7.Cql.Operators.RetrieveParameters.Deconstruct(out System.Reflection.PropertyInfo? CodeProperty, out Hl7.Cql.Primitives.CqlValueSet? ValueSet, out System.Collections.Generic.IEnumerable? Codes) -> void +Hl7.Cql.Operators.RetrieveParameters.RetrieveParameters(Hl7.Cql.Operators.RetrieveParameters! original) -> void +Hl7.Cql.Operators.RetrieveParameters.RetrieveParameters(System.Reflection.PropertyInfo? CodeProperty, Hl7.Cql.Primitives.CqlValueSet? ValueSet, System.Collections.Generic.IEnumerable? Codes) -> void +Hl7.Cql.Operators.RetrieveParameters.ValueSet.get -> Hl7.Cql.Primitives.CqlValueSet? +Hl7.Cql.Operators.RetrieveParameters.ValueSet.init -> void +override Hl7.Cql.Operators.RetrieveParameters.Equals(object? obj) -> bool +override Hl7.Cql.Operators.RetrieveParameters.GetHashCode() -> int +override Hl7.Cql.Operators.RetrieveParameters.ToString() -> string! +static Hl7.Cql.Operators.RetrieveParameters.operator !=(Hl7.Cql.Operators.RetrieveParameters? left, Hl7.Cql.Operators.RetrieveParameters? right) -> bool +static Hl7.Cql.Operators.RetrieveParameters.operator ==(Hl7.Cql.Operators.RetrieveParameters? left, Hl7.Cql.Operators.RetrieveParameters? right) -> bool +virtual Hl7.Cql.Operators.RetrieveParameters.$() -> Hl7.Cql.Operators.RetrieveParameters! +virtual Hl7.Cql.Operators.RetrieveParameters.EqualityContract.get -> System.Type! +virtual Hl7.Cql.Operators.RetrieveParameters.Equals(Hl7.Cql.Operators.RetrieveParameters? other) -> bool +virtual Hl7.Cql.Operators.RetrieveParameters.PrintMembers(System.Text.StringBuilder! builder) -> bool diff --git a/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs b/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs index 61cd84a55..b897b7ab9 100644 --- a/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -121,7 +122,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -178,7 +179,7 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_during_day_of_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_to_Document_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter ValidEncounter) { Code e_ = ValidEncounter?.StatusElement; @@ -231,7 +232,7 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Documentation_of_current_medications__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Procedure MedicationsDocumented) { DataType k_ = MedicationsDocumented?.Performed; @@ -272,7 +273,7 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Documentation_of_current_medications__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Procedure MedicationsNotDocumented) { bool? k_(Extension @this) diff --git a/Demo/Measures.Authoring/CSharp/FHIRHelpers-4.3.000.g.cs b/Demo/Measures.Authoring/CSharp/FHIRHelpers-4.3.000.g.cs index dc06370ec..a1281f535 100644 --- a/Demo/Measures.Authoring/CSharp/FHIRHelpers-4.3.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/FHIRHelpers-4.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs b/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs index c08883d81..034889ebf 100644 --- a/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs +++ b/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -87,7 +88,7 @@ public CqlCode[] LOINC() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -101,7 +102,7 @@ private IEnumerable Smoking_status_observation_Value() { CqlCode a_ = this.Tobacco_Smoking_Status(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation O) { Code f_ = O?.StatusElement; @@ -126,7 +127,7 @@ public IEnumerable Smoking_status_observation() => private IEnumerable Lung_cancer_diagnosis_Value() { CqlValueSet a_ = this.Lung_Cancer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition C) { CodeableConcept e_ = C?.ClinicalStatus; diff --git a/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs b/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs index cdcbbc442..5620f769e 100644 --- a/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs +++ b/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -72,7 +73,7 @@ public CqlValueSet Marital_Status() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs b/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs index def15c262..bebf3ba89 100644 --- a/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -829,7 +830,7 @@ public CqlCode[] USCoreConditionCategoryExtensionCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs b/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs index b549077e4..80866e18d 100644 --- a/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -117,7 +118,7 @@ public CqlCode[] ConditionClinicalStatusCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs b/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs index 616a1c068..0a7038155 100644 --- a/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -87,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -224,7 +225,7 @@ DataType ag_(Extension @this) private IEnumerable<(CqlConcept code, CqlInterval period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer_Type(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); (CqlConcept code, CqlInterval period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs index 498ef78f5..c014759b3 100644 --- a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -263,7 +264,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -327,23 +328,23 @@ public Patient Patient() => private IEnumerable Heart_Failure_Outpatient_Encounter_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); IEnumerable o_(Encounter QualifyingEncounter) { CqlValueSet s_ = this.Heart_Failure(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); bool? u_(Condition HeartFailure) { CqlInterval y_ = QICoreCommon_2_0_000.prevalenceInterval(HeartFailure); @@ -386,7 +387,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter() => private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() { CqlValueSet a_ = this.Ejection_Fraction(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation EjectionFraction) { DataType n_ = EjectionFraction?.Value; @@ -409,11 +410,11 @@ private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() }; IEnumerable d_ = context.Operators.Where(b_, c_); CqlValueSet e_ = this.Moderate_or_Severe_LVSD(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); IEnumerable g_ = context.Operators.Union((d_ as IEnumerable), (f_ as IEnumerable)); CqlCode h_ = this.Left_ventricular_systolic_dysfunction__disorder_(); IEnumerable i_ = context.Operators.ToList(h_); - IEnumerable j_ = context.Operators.RetrieveByCodes(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, i_)); bool? k_(Condition LVSDDiagnosis) { CodeableConcept y_ = LVSDDiagnosis?.Severity; @@ -472,7 +473,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter_with_History_of private bool? Has_Heart_Transplant_Complications_Value() { CqlValueSet a_ = this.Heart_Transplant_Complications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition HeartTransplantComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -517,7 +518,7 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Placement(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Procedure LVADOutpatient) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -564,7 +565,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Complications_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Complications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition LVADComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -609,20 +610,20 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private IEnumerable Qualifying_Outpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Patient_Provider_Interaction(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter ValidEncounter) @@ -695,7 +696,7 @@ Encounter u_(Encounter Encounter2) => private bool? Has_Heart_Transplant_Value() { CqlValueSet a_ = this.Heart_Transplant(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Procedure HeartTransplant) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); diff --git a/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs b/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs index 4c5300c3b..57b7c33e0 100644 --- a/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -133,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -147,7 +148,7 @@ private IEnumerable Qualified_Scan_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation CTScan) { CqlInterval f_ = this.Measurement_Period(); @@ -182,7 +183,7 @@ private IEnumerable Initial_Population_Value() IEnumerable c_(Observation CTScan) { CqlValueSet f_ = this.Encounter_Inpatient(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Encounter InpatientEncounter) { CqlInterval l_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs b/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs index 5b1a67e1c..d0cff9713 100644 --- a/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -128,7 +129,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -141,24 +142,24 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.isEncounterPerformed(t_); bool? v_(Encounter ValidEncounter) diff --git a/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs b/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs index 29d4bb1ea..c9f7a8927 100644 --- a/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -244,7 +245,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -257,8 +258,8 @@ public Patient Patient() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isDeviceOrder(e_); bool? g_(DeviceRequest FrailtyDeviceOrder) @@ -279,7 +280,7 @@ public Patient Patient() => bool? i_ = context.Operators.Exists(h_); CqlCode j_ = this.Medical_equipment_used(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.RetrieveByCodes(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); IEnumerable m_ = Status_1_6_000.isAssessmentPerformed(l_); bool? n_(Observation EquipmentUsed) { @@ -301,7 +302,7 @@ public Patient Patient() => bool? p_ = context.Operators.Exists(o_); bool? q_ = context.Operators.Or(i_, p_); CqlValueSet r_ = this.Frailty_Diagnosis(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); bool? t_(Condition FrailtyDiagnosis) { CqlInterval bf_ = QICoreCommon_2_0_000.prevalenceInterval(FrailtyDiagnosis); @@ -314,7 +315,7 @@ public Patient Patient() => bool? v_ = context.Operators.Exists(u_); bool? w_ = context.Operators.Or(q_, v_); CqlValueSet x_ = this.Frailty_Encounter(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable z_ = Status_1_6_000.isEncounterPerformed(y_); bool? aa_(Encounter FrailtyEncounter) { @@ -330,7 +331,7 @@ public Patient Patient() => bool? ac_ = context.Operators.Exists(ab_); bool? ad_ = context.Operators.Or(w_, ac_); CqlValueSet ae_ = this.Frailty_Symptom(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); IEnumerable ag_ = Status_1_6_000.isSymptom(af_); bool? ah_(Observation FrailtySymptom) { @@ -356,14 +357,14 @@ public Patient Patient() => private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Emergency_Department_Evaluation_and_Management_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Nonacute_Inpatient(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); IEnumerable l_ = Status_1_6_000.isEncounterPerformed(k_); @@ -446,7 +447,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t private bool? Has_Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter InpatientEncounter) { @@ -490,8 +491,8 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t private bool? Has_Dementia_Medications_in_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationActive(e_); bool? g_(MedicationRequest DementiaMedication) @@ -606,7 +607,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t bool? i_ = context.Operators.GreaterOrEqual(h_, 66); CqlCode j_ = this.Housing_status(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.RetrieveByCodes(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); IEnumerable m_ = Status_1_6_000.isAssessmentPerformed(l_); bool? n_(Observation HousingStatus) { diff --git a/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs b/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs index 8b5d2edc8..234b2910d 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -135,7 +136,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -193,7 +194,7 @@ private IEnumerable Qualifying_CTScan_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation CTScanResult) { CqlInterval f_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs index c9ed70680..88fa4ce4e 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -133,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -146,7 +147,7 @@ public Patient Patient() => private IEnumerable Qualifying_Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter InpatientEncounter) { Period e_ = InpatientEncounter?.Period; @@ -222,7 +223,7 @@ private IEnumerable Initial_Population_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_(Observation CTScan) { IEnumerable f_ = this.Qualifying_Inpatient_Encounters(); diff --git a/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs b/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs index 2b2dfc002..ecbe3fbba 100644 --- a/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -54,7 +55,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs b/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs index 31c5dd14d..93fd29131 100644 --- a/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -199,7 +200,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -226,7 +227,7 @@ private IEnumerable Encounter_with_a_History_of_Atrial_Ablation_Value bool? b_(Encounter IschemicStrokeEncounter) { CqlValueSet l_ = this.Atrial_Ablation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); bool? n_(Procedure AtrialAblationProcedure) { Code q_ = AtrialAblationProcedure?.StatusElement; @@ -254,7 +255,7 @@ private IEnumerable Encounter_with_a_History_of_Atrial_Ablation_Value IEnumerable e_(Encounter IschemicStrokeEncounter) { CqlValueSet ad_ = this.History_of_Atrial_Ablation(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); bool? af_(Condition AtrialAblationDiagnosis) { CodeableConcept aj_ = AtrialAblationDiagnosis?.VerificationStatus; @@ -289,7 +290,7 @@ Encounter ah_(Condition AtrialAblationDiagnosis) => IEnumerable i_(Encounter IschemicStrokeEncounter) { CqlValueSet bb_ = this.History_of_Atrial_Ablation(); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(bb_, default); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, bb_, default)); bool? bd_(Observation AtrialAblationObservation) { Code bh_ = AtrialAblationObservation?.StatusElement; @@ -386,7 +387,7 @@ private IEnumerable Encounter_with_Prior_or_Present_Diagnosis_of_Atri IEnumerable b_(Encounter IschemicStrokeEncounter) { CqlValueSet h_ = this.Atrial_Fibrillation_or_Flutter(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); bool? j_(Condition AtrialFibrillationFlutter) { CodeableConcept n_ = AtrialFibrillationFlutter?.VerificationStatus; @@ -547,8 +548,8 @@ private IEnumerable Numerator_Value() IEnumerable b_(Encounter Encounter) { CqlValueSet d_ = this.Anticoagulant_Therapy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest DischargeAnticoagulant) { @@ -609,7 +610,7 @@ public IEnumerable Numerator() => private IEnumerable Documented_Reason_for_Not_Giving_Anticoagulant_at_Discharge_Value() { CqlValueSet a_ = this.Anticoagulant_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(MedicationRequest NoAnticoagulant) { List e_ = NoAnticoagulant?.ReasonCode; diff --git a/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs index 04097daec..8bbd0d6db 100644 --- a/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -225,7 +226,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -282,8 +283,8 @@ public CqlInterval Intake_Period() => private CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); bool? g_(MedicationDispense Antidepressant) @@ -328,7 +329,7 @@ public CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period() => private bool? Has_Initial_Major_Depression_Diagnosis_Value() { CqlValueSet a_ = this.Major_Depression(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition MajorDepression) { CqlDate f_ = this.Earliest_Antidepressant_Dispensed_During_Intake_Period(); @@ -360,32 +361,32 @@ public CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Annual_Wellness_Visit(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Nursing_Facility_Visit(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Psych_Visit_Psychotherapy(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Telephone_Visits(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Online_Assessments(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); bool? ad_(Encounter ValidEncounter) @@ -453,8 +454,8 @@ public IEnumerable Qualifying_Encounters() => { bool? a_ = Hospice_6_9_000.Has_Hospice_Services(); CqlValueSet b_ = this.Antidepressant_Medication(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); - IEnumerable e_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable g_ = Status_1_6_000.Active_Medication(f_); bool? h_(MedicationRequest ActiveAntidepressant) @@ -506,8 +507,8 @@ CqlInterval u_(object Meds) private IEnumerable> Antidepressant_Medication_Period_Between_IPSD_and_114_Days_After_IPSD_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); CqlInterval g_(MedicationDispense Antidepressant) @@ -557,8 +558,8 @@ public IEnumerable> Antidepressant_Medication_Period_Betwee private IEnumerable> Antidepressant_Medication_Period_Between_IPSD_and_231_Days_After_IPSD_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); CqlInterval g_(MedicationDispense Antidepressant) diff --git a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs index e5f36b871..ff10a5d6c 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -697,7 +698,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -754,11 +755,11 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Encounter E) { List x_ = E?.Type; @@ -784,17 +785,17 @@ CqlConcept y_(CodeableConcept @this) }; IEnumerable h_ = context.Operators.Where(f_, g_); CqlValueSet i_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Outpatient_Consultation(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); CqlValueSet o_ = this.Online_Assessments(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Telephone_Visits(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); IEnumerable u_ = context.Operators.Union(r_, t_); bool? v_(Encounter ValidEncounters) { @@ -856,7 +857,7 @@ public IEnumerable Qualifying_Encounter() => private Observation First_BMI_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_ = Status_1_6_000.BMI(a_); bool? c_(Observation BMIRatio) { @@ -921,7 +922,7 @@ private Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_T { CqlCode a_ = this.Alcoholic_drinks_per_drinking_day___Reported(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation AverageDrinks) { @@ -977,7 +978,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteoporosis_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteoporosis(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition OsteoporosisDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteoporosisDiagnosis); @@ -1001,7 +1002,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteopenia_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteopenia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition OsteopeniaDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteopeniaDiagnosis); @@ -1038,7 +1039,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private IEnumerable Parent_History_of_Hip_Fracture_Assessment_Value() { CqlValueSet a_ = this.History_of_hip_fracture_in_parent(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Survey_Observation(b_); bool? d_(Observation ParentFractureHistory) { @@ -1064,7 +1065,7 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => private bool? Has_Risk_Factor_Any_Time_in_History_Prior_to_Measurement_Period_and_Do_Not_Need_to_be_Active_During_Measurement_Period_Value() { CqlValueSet a_ = this.Gastric_Bypass_Surgery(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure GastricBypass) { @@ -1080,8 +1081,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Aromatase_Inhibitors(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = Status_1_6_000.Active_Medication(j_); bool? l_(MedicationRequest AromataseInhibitorActive) @@ -1097,8 +1098,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable m_ = context.Operators.Where(k_, l_); IEnumerable n_ = context.Operators.Union((e_ as IEnumerable), (m_ as IEnumerable)); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable r_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = Status_1_6_000.Active_or_Completed_Medication_Request(s_); bool? u_(MedicationRequest AromataseInhibitorOrder) @@ -1149,8 +1150,8 @@ bool as_() private int? Glucocorticoid_Active_Medication_Duration_in_Days_Value() { CqlValueSet a_ = this.Glucocorticoids__oral_only_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Medication(e_); bool? g_(MedicationRequest OralGlucocorticoid) @@ -1255,16 +1256,16 @@ public IEnumerable ProcedureInPatientHistory(IEnumerable P private bool? Has_Double_or_Bilateral_Oophorectomy_Value() { CqlValueSet a_ = this.Bilateral_Oophorectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = this.ProcedureInPatientHistory(b_); bool? d_ = context.Operators.Exists(c_); CqlValueSet e_ = this.Evidence_of_Bilateral_Oophorectomy(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); IEnumerable g_ = this.ProcedureInPatientHistory(f_); bool? h_ = context.Operators.Exists(g_); bool? i_ = context.Operators.Or(d_, h_); CqlValueSet j_ = this.Unilateral_Oophorectomy__Unspecified_Laterality(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); bool? l_(Procedure UnilateralOophorectomy) { List ad_ = UnilateralOophorectomy?.BodySite; @@ -1290,11 +1291,11 @@ CqlConcept ae_(CodeableConcept @this) }; IEnumerable m_ = context.Operators.Where(k_, l_); CqlValueSet n_ = this.Unilateral_Oophorectomy_Right(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = this.ProcedureInPatientHistory(p_); bool? r_ = context.Operators.Exists(q_); - IEnumerable t_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); bool? u_(Procedure UnilateralOophorectomy) { List an_ = UnilateralOophorectomy?.BodySite; @@ -1320,7 +1321,7 @@ CqlConcept ao_(CodeableConcept @this) }; IEnumerable v_ = context.Operators.Where(t_, u_); CqlValueSet w_ = this.Unilateral_Oophorectomy_Left(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); IEnumerable y_ = context.Operators.Union(v_, x_); IEnumerable z_ = this.ProcedureInPatientHistory(y_); bool? aa_ = context.Operators.Exists(z_); @@ -1337,12 +1338,12 @@ CqlConcept ao_(CodeableConcept @this) private bool? Has_Organ_Transplants_Value() { CqlValueSet a_ = this.Major_Transplant(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Kidney_Transplant(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Bone_Marrow_Transplant(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = this.ProcedureInPatientHistory(h_); bool? j_ = context.Operators.Exists(i_); @@ -1358,69 +1359,69 @@ CqlConcept ao_(CodeableConcept @this) { bool? a_ = this.Has_90_or_More_Active_Glucocorticoid_Medication_Days(); CqlValueSet b_ = this.Osteoporotic_Fractures(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); CqlValueSet d_ = this.Malabsorption_Syndromes(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = context.Operators.Union(c_, e_); CqlValueSet g_ = this.Chronic_Malnutrition(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); CqlValueSet i_ = this.Chronic_Liver_Disease(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(f_, k_); CqlValueSet m_ = this.Rheumatoid_Arthritis(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); CqlValueSet o_ = this.Hyperthyroidism(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Type_1_Diabetes(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); CqlValueSet u_ = this.End_Stage_Renal_Disease(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); IEnumerable w_ = context.Operators.Union(t_, v_); IEnumerable x_ = context.Operators.Union(r_, w_); CqlValueSet y_ = this.Osteogenesis_Imperfecta(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); CqlValueSet aa_ = this.Ankylosing_Spondylitis(); - IEnumerable ab_ = context.Operators.RetrieveByValueSet(aa_, default); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); IEnumerable ac_ = context.Operators.Union(z_, ab_); IEnumerable ad_ = context.Operators.Union(x_, ac_); CqlValueSet ae_ = this.Psoriatic_Arthritis(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); CqlValueSet ag_ = this.Ehlers_Danlos_Syndrome(); - IEnumerable ah_ = context.Operators.RetrieveByValueSet(ag_, default); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); IEnumerable ai_ = context.Operators.Union(af_, ah_); IEnumerable aj_ = context.Operators.Union(ad_, ai_); CqlValueSet ak_ = this.Cushings_Syndrome(); - IEnumerable al_ = context.Operators.RetrieveByValueSet(ak_, default); + IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default)); CqlValueSet am_ = this.Hyperparathyroidism(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); IEnumerable ao_ = context.Operators.Union(al_, an_); IEnumerable ap_ = context.Operators.Union(aj_, ao_); CqlValueSet aq_ = this.Marfans_Syndrome(); - IEnumerable ar_ = context.Operators.RetrieveByValueSet(aq_, default); + IEnumerable ar_ = context.Operators.Retrieve(new RetrieveParameters(default, aq_, default)); CqlValueSet as_ = this.Lupus(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); IEnumerable au_ = context.Operators.Union(ar_, at_); IEnumerable av_ = context.Operators.Union(ap_, au_); CqlValueSet aw_ = this.Multiple_Myeloma(); - IEnumerable ax_ = context.Operators.RetrieveByValueSet(aw_, default); + IEnumerable ax_ = context.Operators.Retrieve(new RetrieveParameters(default, aw_, default)); CqlValueSet ay_ = this.Premature_Menopause(); - IEnumerable az_ = context.Operators.RetrieveByValueSet(ay_, default); + IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default)); IEnumerable ba_ = context.Operators.Union(ax_, az_); IEnumerable bb_ = context.Operators.Union(av_, ba_); CqlValueSet bc_ = this.Eating_Disorders(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); CqlValueSet be_ = this.Amenorrhea(); - IEnumerable bf_ = context.Operators.RetrieveByValueSet(be_, default); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default)); IEnumerable bg_ = context.Operators.Union(bd_, bf_); IEnumerable bh_ = context.Operators.Union(bb_, bg_); IEnumerable bi_ = this.DiagnosisInPatientHistory(bh_); bool? bj_ = context.Operators.Exists(bi_); bool? bk_ = context.Operators.Or(a_, bj_); CqlValueSet bl_ = this.Chemotherapy(); - IEnumerable bm_ = context.Operators.RetrieveByValueSet(bl_, default); + IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bl_, default)); IEnumerable bn_ = this.ProcedureInPatientHistory(bm_); bool? bo_ = context.Operators.Exists(bn_); bool? bp_ = context.Operators.Or(bk_, bo_); @@ -1456,7 +1457,7 @@ CqlConcept ao_(CodeableConcept @this) private IEnumerable DXA_Scan_Order_During_Measurement_Period_Value() { CqlValueSet a_ = this.DXA__Dual_energy_Xray_Absorptiometry__Scan(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest DXA) { @@ -1501,7 +1502,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ { CqlCode a_ = this.Major_osteoporotic_fracture_10_year_probability__Likelihood__Fracture_Risk_Assessment(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation FRAX) { @@ -1515,7 +1516,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable f_ = context.Operators.Where(d_, e_); CqlCode g_ = this.Osteoporosis_Risk_Assessment_Instrument(); IEnumerable h_ = context.Operators.ToList(g_); - IEnumerable i_ = context.Operators.RetrieveByCodes(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_)); IEnumerable j_ = Status_1_6_000.Final_Survey_Observation(i_); bool? k_(Observation ORAI) { @@ -1529,7 +1530,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable m_ = context.Operators.Union(f_, l_); CqlCode n_ = this.Osteoporosis_Index_of_Risk_panel(); IEnumerable o_ = context.Operators.ToList(n_); - IEnumerable p_ = context.Operators.RetrieveByCodes(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_)); IEnumerable q_ = Status_1_6_000.Final_Survey_Observation(p_); bool? r_(Observation OSIRIS) { @@ -1543,7 +1544,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable s_ = context.Operators.Where(q_, r_); CqlCode t_ = this.Osteoporosis_Self_Assessment_Tool(); IEnumerable u_ = context.Operators.ToList(t_); - IEnumerable v_ = context.Operators.RetrieveByCodes(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_)); IEnumerable w_ = Status_1_6_000.Final_Survey_Observation(v_); bool? x_(Observation OST) { diff --git a/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs index 705867dec..b8988fe4d 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -355,7 +356,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -412,8 +413,8 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable c_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable c_ = context.Operators.Retrieve(default); bool? d_(Encounter E) { List bg_ = E?.Type; @@ -439,37 +440,37 @@ CqlConcept bh_(CodeableConcept @this) }; IEnumerable e_ = context.Operators.Where(c_, d_); IEnumerable f_ = context.Operators.Union(b_, e_); - IEnumerable h_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet i_ = this.Home_Healthcare_Services(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(f_, k_); CqlValueSet m_ = this.Initial_Hospital_Observation_Care(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); CqlValueSet o_ = this.Medical_Disability_Exam(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Observation(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); CqlValueSet u_ = this.Office_Visit(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); IEnumerable w_ = context.Operators.Union(t_, v_); IEnumerable x_ = context.Operators.Union(r_, w_); CqlValueSet y_ = this.Telephone_Visits(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); CqlValueSet aa_ = this.Online_Assessments(); - IEnumerable ab_ = context.Operators.RetrieveByValueSet(aa_, default); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); IEnumerable ac_ = context.Operators.Union(z_, ab_); IEnumerable ad_ = context.Operators.Union(x_, ac_); CqlValueSet ae_ = this.Outpatient_Consultation(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); CqlValueSet ag_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable ah_ = context.Operators.RetrieveByValueSet(ag_, default); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); IEnumerable ai_ = context.Operators.Union(af_, ah_); IEnumerable aj_ = context.Operators.Union(ad_, ai_); CqlValueSet ak_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable al_ = context.Operators.RetrieveByValueSet(ak_, default); + IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default)); bool? an_(Encounter E) { List bq_ = E?.Type; @@ -497,15 +498,15 @@ CqlConcept br_(CodeableConcept @this) IEnumerable ap_ = context.Operators.Union(al_, ao_); IEnumerable aq_ = context.Operators.Union(aj_, ap_); CqlValueSet ar_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable as_ = context.Operators.RetrieveByValueSet(ar_, default); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); CqlValueSet at_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable au_ = context.Operators.RetrieveByValueSet(at_, default); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, at_, default)); IEnumerable av_ = context.Operators.Union(as_, au_); IEnumerable aw_ = context.Operators.Union(aq_, av_); CqlValueSet ax_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ax_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ax_, default)); CqlValueSet az_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ba_ = context.Operators.RetrieveByValueSet(az_, default); + IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, az_, default)); IEnumerable bb_ = context.Operators.Union(ay_, ba_); IEnumerable bc_ = context.Operators.Union(aw_, bb_); IEnumerable bd_ = Status_1_6_000.Finished_Encounter(bc_); @@ -534,8 +535,8 @@ private IEnumerable Encounter_With_Antibiotic_Ordered_Within_Three_Da IEnumerable b_(Encounter EDOrAmbulatoryVisit) { CqlValueSet d_ = this.Antibiotic_Medications_for_Pharyngitis(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Active_Medication(h_); bool? j_(MedicationRequest AntibioticOrdered) @@ -576,9 +577,9 @@ public IEnumerable Encounter_With_Antibiotic_Ordered_Within_Three_Day private IEnumerable Pharyngitis_or_Tonsillitis_Value() { CqlValueSet a_ = this.Acute_Pharyngitis(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Acute_Tonsillitis(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Condition(e_); @@ -687,16 +688,16 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable a_ = this.In_Hospice(); IEnumerable b_ = this.Encounter_With_Pharyngitis_or_Tonsillitis_With_Antibiotic(); CqlValueSet c_ = this.Antibiotic_Medications_for_Pharyngitis(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); - IEnumerable f_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable g_ = context.Operators.Union(d_, f_); IEnumerable h_ = Antibiotic_1_5_000.Has_Antibiotic_Medication_History(b_, g_); IEnumerable i_ = context.Operators.Union(a_, h_); CqlValueSet k_ = this.Competing_Conditions_for_Respiratory_Conditions(); - IEnumerable l_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); IEnumerable m_ = Antibiotic_1_5_000.Has_Competing_Diagnosis_History(b_, l_); CqlValueSet o_ = this.Comorbid_Conditions_for_Respiratory_Conditions(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = Antibiotic_1_5_000.Has_Comorbid_Condition_History(b_, p_); IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(i_, r_); @@ -711,7 +712,7 @@ public IEnumerable Denominator_Exclusions() => private IEnumerable Group_A_Streptococcus_Lab_Test_With_Result_Value() { CqlValueSet a_ = this.Group_A_Streptococcus_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation GroupAStreptococcusTest) { diff --git a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs index d8e2cd801..e9a5b8779 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -485,7 +486,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -498,7 +499,7 @@ public Patient Patient() => private IEnumerable ED_Encounter_with_Encounter_Diagnosis_of_STEMI_Value() { CqlValueSet a_ = this.ED(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EDEncounter) { Code e_ = EDEncounter?.StatusElement; @@ -554,11 +555,11 @@ public IEnumerable ED_Encounter_with_Encounter_Diagnosis_of_STEMI() = private IEnumerable ED_Encounter_with_Diagnosis_of_STEMI_Value() { CqlValueSet a_ = this.ED(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Encounter EDEncounter) { CqlValueSet e_ = this.STEMI(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Condition DxSTEMI) { CodeableConcept k_ = DxSTEMI?.ClinicalStatus; @@ -662,7 +663,7 @@ private IEnumerable Allergy_or_Intolerance_to_Thrombolytic_Medication IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Thrombolytic_medications(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(AllergyIntolerance ThrombolyticAllergy) { CodeableConcept j_ = ThrombolyticAllergy?.ClinicalStatus; @@ -702,7 +703,7 @@ private IEnumerable Adverse_Effect_to_Thrombolytic_Medications_Before IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Adverse_reaction_to_thrombolytics(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(AdverseEvent ThrombolyticAdverseEvent) { FhirDateTime j_ = ThrombolyticAdverseEvent?.RecordedDateElement; @@ -741,20 +742,20 @@ private IEnumerable Active_Exclusion_Diagnosis_at_Start_of_ED_Encount IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Active_Bleeding_Excluding_Menses_or_Bleeding_Diathesis(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); CqlValueSet f_ = this.Malignant_Intracranial_Neoplasm_Group(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Cerebral_Vascular_Lesion(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); CqlValueSet k_ = this.Dementia(); - IEnumerable l_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); CqlValueSet o_ = this.Pregnancy_ICD10_SNOMEDCT(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); CqlValueSet q_ = this.Allergy_to_thrombolytics(); - IEnumerable r_ = context.Operators.RetrieveByValueSet(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = context.Operators.Union(n_, s_); bool? u_(Condition ActiveExclusionDx) @@ -788,8 +789,8 @@ private IEnumerable Active_Oral_Anticoagulant_Medication_at_the_Start IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Oral_Anticoagulant_Medications(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest OralAnticoagulant) { @@ -834,12 +835,12 @@ private IEnumerable Exclusion_Diagnosis_During_ED_Encounter_or_Within IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Aortic_Dissection_and_Rupture(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); CqlValueSet f_ = this.Neurologic_impairment(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Cardiopulmonary_Arrest(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); bool? l_(Condition ExclusionDiagnosis) { @@ -887,7 +888,7 @@ private IEnumerable Major_Surgical_Procedure_21_Days_or_Less_Before_S IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Major_Surgical_Procedure(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure MajorSurgery) { DataType j_ = MajorSurgery?.Performed; @@ -937,9 +938,9 @@ private IEnumerable Intubation_or_Mechanical_Circulatory_Assist_Proce IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Endotracheal_Intubation(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); CqlValueSet f_ = this.Insertion_or_Replacement_of_Mechanical_Circulatory_Assist_Device(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Procedure AirwayProcedure) { @@ -996,14 +997,14 @@ private IEnumerable Active_Exclusion_Diagnosis_Within_90_Days_Before_ IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Ischemic_Stroke(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); CqlValueSet f_ = this.Closed_Head_and_Facial_Trauma(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Active_Peptic_Ulcer(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); CqlValueSet k_ = this.Cardiopulmonary_Arrest(); - IEnumerable l_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); bool? o_(Condition ExclusionCondition) @@ -1044,7 +1045,7 @@ private IEnumerable Intracranial_or_Intraspinal_Procedure_90_Days_or_ IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Intracranial_or_Intraspinal_surgery(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure CranialorSpinalSurgery) { DataType j_ = CranialorSpinalSurgery?.Performed; @@ -1176,8 +1177,8 @@ private IEnumerable Fibrinolytic_Therapy_within_30_Minutes_of_Arrival IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Fibrinolytic_Therapy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationAdministration Fibrinolytic) { @@ -1222,7 +1223,7 @@ private IEnumerable PCI_within_90_Minutes_of_Arrival_Value() IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Percutaneous_Coronary_Intervention(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure PCI) { DataType j_ = PCI?.Performed; diff --git a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs index e04117444..625862e33 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -309,7 +310,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -366,49 +367,49 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Emergency_Department_Evaluation_and_Management_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Initial_Hospital_Observation_Care(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Medical_Disability_Exam(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Observation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Office_Visit(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Outpatient_Consultation(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); CqlValueSet af_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); IEnumerable ah_ = context.Operators.Union(ae_, ag_); IEnumerable ai_ = context.Operators.Union(ac_, ah_); CqlValueSet aj_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable ak_ = context.Operators.RetrieveByValueSet(aj_, default); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); CqlValueSet al_ = this.Telephone_Visits(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = context.Operators.Union(ai_, an_); CqlValueSet ap_ = this.Online_Assessments(); - IEnumerable aq_ = context.Operators.RetrieveByValueSet(ap_, default); - IEnumerable ar_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable ar_ = context.Operators.Retrieve(default); bool? as_(Encounter E) { List az_ = E?.Type; @@ -465,7 +466,7 @@ private IEnumerable Encounter_with_Upper_Respiratory_Infection_Value( { IEnumerable a_ = this.Qualifying_Encounters(); CqlValueSet b_ = this.Upper_Respiratory_Infection(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounters, Condition URI)? e_(ValueTuple _valueTuple) { @@ -564,16 +565,16 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable a_ = this.Encounters_and_Assessments_with_Hospice_Patient(); IEnumerable b_ = this.Encounter_with_Upper_Respiratory_Infection(); CqlValueSet c_ = this.Comorbid_Conditions_for_Respiratory_Conditions(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = Antibiotic_1_5_000.Has_Comorbid_Condition_History(b_, d_); IEnumerable f_ = context.Operators.Union(a_, e_); CqlValueSet h_ = this.Antibiotic_Medications_for_Upper_Respiratory_Infection(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); - IEnumerable k_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = Antibiotic_1_5_000.Has_Antibiotic_Medication_History(b_, l_); CqlValueSet o_ = this.Competing_Conditions_for_Respiratory_Conditions(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = Antibiotic_1_5_000.Has_Competing_Diagnosis_History(b_, p_); IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(f_, r_); @@ -591,8 +592,8 @@ private IEnumerable Numerator_Value() IEnumerable c_(Encounter EncounterWithURI) { CqlValueSet h_ = this.Antibiotic_Medications_for_Upper_Respiratory_Infection(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); - IEnumerable k_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable l_ = context.Operators.Union(i_, k_); bool? m_(MedicationRequest OrderedAntibiotic) { diff --git a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs index bd5bd7768..cc3949c2e 100644 --- a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -119,7 +120,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -132,7 +133,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -200,7 +201,7 @@ public CqlInterval ToDateInterval(CqlInterval period) public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -247,7 +248,7 @@ object e_(Encounter @this) public Encounter edVisit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -613,7 +614,7 @@ object b_(Encounter.LocationComponent @this) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getLocation()` instead.")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -704,14 +705,14 @@ public CqlInterval HospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -722,7 +723,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -768,7 +769,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract((ef_ ?? ei_), ej_); - IEnumerable em_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -813,7 +814,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, (eu_ ?? ex_), true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -877,7 +878,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -923,7 +924,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract((bb_ ?? (bl_ ?? bo_)), bp_); - IEnumerable bs_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -934,7 +935,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -980,7 +981,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract((kj_ ?? km_), kn_); - IEnumerable kq_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1025,7 +1026,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, (ky_ ?? lb_), true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1088,7 +1089,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -1133,7 +1134,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, (ca_ ?? (ck_ ?? cn_)), true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -1144,7 +1145,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -1190,7 +1191,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract((qn_ ?? qq_), qr_); - IEnumerable qu_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -1235,7 +1236,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, (rc_ ?? rf_), true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -1298,7 +1299,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -1361,7 +1362,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -1372,7 +1373,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -1418,7 +1419,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract((wu_ ?? wx_), wy_); - IEnumerable xb_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -1463,7 +1464,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, (xj_ ?? xm_), true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -1527,7 +1528,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -1593,14 +1594,14 @@ public CqlInterval hospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -1611,7 +1612,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -1657,7 +1658,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract((ef_ ?? ei_), ej_); - IEnumerable em_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -1702,7 +1703,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, (eu_ ?? ex_), true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -1766,7 +1767,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -1812,7 +1813,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract((bb_ ?? (bl_ ?? bo_)), bp_); - IEnumerable bs_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -1823,7 +1824,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -1869,7 +1870,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract((kj_ ?? km_), kn_); - IEnumerable kq_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1914,7 +1915,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, (ky_ ?? lb_), true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1977,7 +1978,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -2022,7 +2023,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, (ca_ ?? (ck_ ?? cn_)), true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -2033,7 +2034,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -2079,7 +2080,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract((qn_ ?? qq_), qr_); - IEnumerable qu_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -2124,7 +2125,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, (rc_ ?? rf_), true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -2187,7 +2188,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -2250,7 +2251,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -2261,7 +2262,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -2307,7 +2308,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract((wu_ ?? wx_), wy_); - IEnumerable xb_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -2352,7 +2353,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, (xj_ ?? xm_), true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -2416,7 +2417,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -2483,7 +2484,7 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2494,7 +2495,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2540,7 +2541,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract((av_ ?? ay_), az_); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2585,7 +2586,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, (bk_ ?? bn_), true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2649,7 +2650,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -2715,7 +2716,7 @@ public CqlInterval hospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2726,7 +2727,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2772,7 +2773,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract((av_ ?? ay_), az_); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2817,7 +2818,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, (bk_ ?? bn_), true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2881,7 +2882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -3053,7 +3054,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3083,7 +3084,7 @@ public IEnumerable encounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3111,7 +3112,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getCondition()` instead")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3133,7 +3134,7 @@ public Condition GetCondition(ResourceReference reference) [CqlTag("description", "Returns the Condition resource for the given reference")] public Condition getCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3168,7 +3169,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable j_ = context.Operators.Retrieve(default); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3208,7 +3209,7 @@ public Condition principalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable j_ = context.Operators.Retrieve(default); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3236,7 +3237,7 @@ Condition d_(Encounter.DiagnosisComponent PD) [CqlTag("description", "Returns the Location resource specified by the given reference.")] public Location getLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -3278,7 +3279,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable h_ = context.Operators.Retrieve(default); bool? i_(Medication M) { Id n_ = M?.IdElement; @@ -3327,7 +3328,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable h_ = context.Operators.Retrieve(default); bool? i_(Medication M) { Id n_ = M?.IdElement; diff --git a/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs index 04232c59a..7cbefe1ae 100644 --- a/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -159,7 +160,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -172,20 +173,20 @@ public Patient Patient() => private bool? Has_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter Encounter) @@ -215,7 +216,7 @@ public Patient Patient() => private (string ID, CqlDateTime AuthorDate)? First_Referral_during_First_10_Months_of_Measurement_Period_Value() { CqlValueSet a_ = this.Referral(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(ServiceRequest ReferralOrder) { Code j_ = ReferralOrder?.StatusElement; @@ -363,7 +364,7 @@ string b_(ResourceReference Task) private bool? Referring_Clinician_Receives_Consultant_Report_to_Close_Referral_Loop_Value() { CqlValueSet a_ = this.Consultant_Report(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Task ConsultantReportObtained) { (string ID, CqlDateTime AuthorDate)? f_ = this.First_Referral_during_First_10_Months_of_Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs index a0a4fd72b..c704fd31e 100644 --- a/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -681,7 +682,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -694,7 +695,7 @@ public Patient Patient() => private IEnumerable Cataract_Surgery_Between_January_and_September_of_Measurement_Period_Value() { CqlValueSet a_ = this.Cataract_Surgery(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure CataractSurgery) { CqlInterval e_ = this.Measurement_Period(); @@ -770,168 +771,168 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable b_(Procedure CataractSurgeryPerformed) { CqlValueSet d_ = this.Acute_and_Subacute_Iridocyclitis(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); CqlValueSet f_ = this.Amblyopia(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Burn_Confined_to_Eye_and_Adnexa(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); CqlValueSet k_ = this.Cataract_Secondary_to_Ocular_Disorders(); - IEnumerable l_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); CqlValueSet o_ = this.Cataract_Congenital(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); CqlValueSet q_ = this.Cataract_Mature_or_Hypermature(); - IEnumerable r_ = context.Operators.RetrieveByValueSet(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = context.Operators.Union(n_, s_); CqlValueSet u_ = this.Cataract_Posterior_Polar(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); CqlValueSet w_ = this.Central_Corneal_Ulcer(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); IEnumerable y_ = context.Operators.Union(v_, x_); IEnumerable z_ = context.Operators.Union(t_, y_); CqlValueSet aa_ = this.Certain_Types_of_Iridocyclitis(); - IEnumerable ab_ = context.Operators.RetrieveByValueSet(aa_, default); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); CqlValueSet ac_ = this.Choroidal_Degenerations(); - IEnumerable ad_ = context.Operators.RetrieveByValueSet(ac_, default); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default)); IEnumerable ae_ = context.Operators.Union(ab_, ad_); IEnumerable af_ = context.Operators.Union(z_, ae_); CqlValueSet ag_ = this.Choroidal_Detachment(); - IEnumerable ah_ = context.Operators.RetrieveByValueSet(ag_, default); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); CqlValueSet ai_ = this.Choroidal_Hemorrhage_and_Rupture(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); IEnumerable ak_ = context.Operators.Union(ah_, aj_); IEnumerable al_ = context.Operators.Union(af_, ak_); CqlValueSet am_ = this.Chronic_Iridocyclitis(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); CqlValueSet ao_ = this.Cloudy_Cornea(); - IEnumerable ap_ = context.Operators.RetrieveByValueSet(ao_, default); + IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default)); IEnumerable aq_ = context.Operators.Union(an_, ap_); IEnumerable ar_ = context.Operators.Union(al_, aq_); CqlValueSet as_ = this.Corneal_Edema(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); CqlValueSet au_ = this.Disorders_of_Cornea_Including_Corneal_Opacity(); - IEnumerable av_ = context.Operators.RetrieveByValueSet(au_, default); + IEnumerable av_ = context.Operators.Retrieve(new RetrieveParameters(default, au_, default)); IEnumerable aw_ = context.Operators.Union(at_, av_); IEnumerable ax_ = context.Operators.Union(ar_, aw_); CqlValueSet ay_ = this.Degeneration_of_Macula_and_Posterior_Pole(); - IEnumerable az_ = context.Operators.RetrieveByValueSet(ay_, default); + IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default)); CqlValueSet ba_ = this.Degenerative_Disorders_of_Globe(); - IEnumerable bb_ = context.Operators.RetrieveByValueSet(ba_, default); + IEnumerable bb_ = context.Operators.Retrieve(new RetrieveParameters(default, ba_, default)); IEnumerable bc_ = context.Operators.Union(az_, bb_); IEnumerable bd_ = context.Operators.Union(ax_, bc_); CqlValueSet be_ = this.Diabetic_Macular_Edema(); - IEnumerable bf_ = context.Operators.RetrieveByValueSet(be_, default); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default)); CqlValueSet bg_ = this.Diabetic_Retinopathy(); - IEnumerable bh_ = context.Operators.RetrieveByValueSet(bg_, default); + IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, bg_, default)); IEnumerable bi_ = context.Operators.Union(bf_, bh_); IEnumerable bj_ = context.Operators.Union(bd_, bi_); CqlValueSet bk_ = this.Disorders_of_Optic_Chiasm(); - IEnumerable bl_ = context.Operators.RetrieveByValueSet(bk_, default); + IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, bk_, default)); CqlValueSet bm_ = this.Disorders_of_Visual_Cortex(); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(bm_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, bm_, default)); IEnumerable bo_ = context.Operators.Union(bl_, bn_); IEnumerable bp_ = context.Operators.Union(bj_, bo_); CqlValueSet bq_ = this.Disseminated_Chorioretinitis_and_Disseminated_Retinochoroiditis(); - IEnumerable br_ = context.Operators.RetrieveByValueSet(bq_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, bq_, default)); CqlValueSet bs_ = this.Focal_Chorioretinitis_and_Focal_Retinochoroiditis(); - IEnumerable bt_ = context.Operators.RetrieveByValueSet(bs_, default); + IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, bs_, default)); IEnumerable bu_ = context.Operators.Union(br_, bt_); IEnumerable bv_ = context.Operators.Union(bp_, bu_); CqlValueSet bw_ = this.Glaucoma(); - IEnumerable bx_ = context.Operators.RetrieveByValueSet(bw_, default); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); CqlValueSet by_ = this.Glaucoma_Associated_with_Congenital_Anomalies_and_Dystrophies_and_Systemic_Syndromes(); - IEnumerable bz_ = context.Operators.RetrieveByValueSet(by_, default); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, by_, default)); IEnumerable ca_ = context.Operators.Union(bx_, bz_); IEnumerable cb_ = context.Operators.Union(bv_, ca_); CqlValueSet cc_ = this.Hereditary_Choroidal_Dystrophies(); - IEnumerable cd_ = context.Operators.RetrieveByValueSet(cc_, default); + IEnumerable cd_ = context.Operators.Retrieve(new RetrieveParameters(default, cc_, default)); CqlValueSet ce_ = this.Hereditary_Corneal_Dystrophies(); - IEnumerable cf_ = context.Operators.RetrieveByValueSet(ce_, default); + IEnumerable cf_ = context.Operators.Retrieve(new RetrieveParameters(default, ce_, default)); IEnumerable cg_ = context.Operators.Union(cd_, cf_); IEnumerable ch_ = context.Operators.Union(cb_, cg_); CqlValueSet ci_ = this.Hereditary_Retinal_Dystrophies(); - IEnumerable cj_ = context.Operators.RetrieveByValueSet(ci_, default); + IEnumerable cj_ = context.Operators.Retrieve(new RetrieveParameters(default, ci_, default)); CqlValueSet ck_ = this.Hypotony_of_Eye(); - IEnumerable cl_ = context.Operators.RetrieveByValueSet(ck_, default); + IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, ck_, default)); IEnumerable cm_ = context.Operators.Union(cj_, cl_); IEnumerable cn_ = context.Operators.Union(ch_, cm_); CqlValueSet co_ = this.Injury_to_Optic_Nerve_and_Pathways(); - IEnumerable cp_ = context.Operators.RetrieveByValueSet(co_, default); + IEnumerable cp_ = context.Operators.Retrieve(new RetrieveParameters(default, co_, default)); CqlValueSet cq_ = this.Macular_Scar_of_Posterior_Polar(); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(cq_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, cq_, default)); IEnumerable cs_ = context.Operators.Union(cp_, cr_); IEnumerable ct_ = context.Operators.Union(cn_, cs_); CqlValueSet cu_ = this.Morgagnian_Cataract(); - IEnumerable cv_ = context.Operators.RetrieveByValueSet(cu_, default); + IEnumerable cv_ = context.Operators.Retrieve(new RetrieveParameters(default, cu_, default)); CqlValueSet cw_ = this.Nystagmus_and_Other_Irregular_Eye_Movements(); - IEnumerable cx_ = context.Operators.RetrieveByValueSet(cw_, default); + IEnumerable cx_ = context.Operators.Retrieve(new RetrieveParameters(default, cw_, default)); IEnumerable cy_ = context.Operators.Union(cv_, cx_); IEnumerable cz_ = context.Operators.Union(ct_, cy_); CqlValueSet da_ = this.Open_Wound_of_Eyeball(); - IEnumerable db_ = context.Operators.RetrieveByValueSet(da_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, da_, default)); CqlValueSet dc_ = this.Optic_Atrophy(); - IEnumerable dd_ = context.Operators.RetrieveByValueSet(dc_, default); + IEnumerable dd_ = context.Operators.Retrieve(new RetrieveParameters(default, dc_, default)); IEnumerable de_ = context.Operators.Union(db_, dd_); IEnumerable df_ = context.Operators.Union(cz_, de_); CqlValueSet dg_ = this.Optic_Neuritis(); - IEnumerable dh_ = context.Operators.RetrieveByValueSet(dg_, default); + IEnumerable dh_ = context.Operators.Retrieve(new RetrieveParameters(default, dg_, default)); CqlValueSet di_ = this.Other_and_Unspecified_Forms_of_Chorioretinitis_and_Retinochoroiditis(); - IEnumerable dj_ = context.Operators.RetrieveByValueSet(di_, default); + IEnumerable dj_ = context.Operators.Retrieve(new RetrieveParameters(default, di_, default)); IEnumerable dk_ = context.Operators.Union(dh_, dj_); IEnumerable dl_ = context.Operators.Union(df_, dk_); CqlValueSet dm_ = this.Other_Background_Retinopathy_and_Retinal_Vascular_Changes(); - IEnumerable dn_ = context.Operators.RetrieveByValueSet(dm_, default); + IEnumerable dn_ = context.Operators.Retrieve(new RetrieveParameters(default, dm_, default)); CqlValueSet do_ = this.Other_Disorders_of_Optic_Nerve(); - IEnumerable dp_ = context.Operators.RetrieveByValueSet(do_, default); + IEnumerable dp_ = context.Operators.Retrieve(new RetrieveParameters(default, do_, default)); IEnumerable dq_ = context.Operators.Union(dn_, dp_); IEnumerable dr_ = context.Operators.Union(dl_, dq_); CqlValueSet ds_ = this.Other_Endophthalmitis(); - IEnumerable dt_ = context.Operators.RetrieveByValueSet(ds_, default); + IEnumerable dt_ = context.Operators.Retrieve(new RetrieveParameters(default, ds_, default)); CqlValueSet du_ = this.Other_Proliferative_Retinopathy(); - IEnumerable dv_ = context.Operators.RetrieveByValueSet(du_, default); + IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); IEnumerable dw_ = context.Operators.Union(dt_, dv_); IEnumerable dx_ = context.Operators.Union(dr_, dw_); CqlValueSet dy_ = this.Pathologic_Myopia(); - IEnumerable dz_ = context.Operators.RetrieveByValueSet(dy_, default); + IEnumerable dz_ = context.Operators.Retrieve(new RetrieveParameters(default, dy_, default)); CqlValueSet ea_ = this.Posterior_Lenticonus(); - IEnumerable eb_ = context.Operators.RetrieveByValueSet(ea_, default); + IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); IEnumerable ec_ = context.Operators.Union(dz_, eb_); IEnumerable ed_ = context.Operators.Union(dx_, ec_); CqlValueSet ee_ = this.Prior_Penetrating_Keratoplasty(); - IEnumerable ef_ = context.Operators.RetrieveByValueSet(ee_, default); + IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default)); CqlValueSet eg_ = this.Purulent_Endophthalmitis(); - IEnumerable eh_ = context.Operators.RetrieveByValueSet(eg_, default); + IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); IEnumerable ei_ = context.Operators.Union(ef_, eh_); IEnumerable ej_ = context.Operators.Union(ed_, ei_); CqlValueSet ek_ = this.Retinal_Detachment_with_Retinal_Defect(); - IEnumerable el_ = context.Operators.RetrieveByValueSet(ek_, default); + IEnumerable el_ = context.Operators.Retrieve(new RetrieveParameters(default, ek_, default)); CqlValueSet em_ = this.Retinal_Vascular_Occlusion(); - IEnumerable en_ = context.Operators.RetrieveByValueSet(em_, default); + IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); IEnumerable eo_ = context.Operators.Union(el_, en_); IEnumerable ep_ = context.Operators.Union(ej_, eo_); CqlValueSet eq_ = this.Retrolental_Fibroplasias(); - IEnumerable er_ = context.Operators.RetrieveByValueSet(eq_, default); + IEnumerable er_ = context.Operators.Retrieve(new RetrieveParameters(default, eq_, default)); CqlValueSet es_ = this.Scleritis(); - IEnumerable et_ = context.Operators.RetrieveByValueSet(es_, default); + IEnumerable et_ = context.Operators.Retrieve(new RetrieveParameters(default, es_, default)); IEnumerable eu_ = context.Operators.Union(er_, et_); IEnumerable ev_ = context.Operators.Union(ep_, eu_); CqlValueSet ew_ = this.Separation_of_Retinal_Layers(); - IEnumerable ex_ = context.Operators.RetrieveByValueSet(ew_, default); + IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, ew_, default)); CqlValueSet ey_ = this.Traumatic_Cataract(); - IEnumerable ez_ = context.Operators.RetrieveByValueSet(ey_, default); + IEnumerable ez_ = context.Operators.Retrieve(new RetrieveParameters(default, ey_, default)); IEnumerable fa_ = context.Operators.Union(ex_, ez_); IEnumerable fb_ = context.Operators.Union(ev_, fa_); CqlValueSet fc_ = this.Uveitis(); - IEnumerable fd_ = context.Operators.RetrieveByValueSet(fc_, default); + IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fc_, default)); CqlValueSet fe_ = this.Vascular_Disorders_of_Iris_and_Ciliary_Body(); - IEnumerable ff_ = context.Operators.RetrieveByValueSet(fe_, default); + IEnumerable ff_ = context.Operators.Retrieve(new RetrieveParameters(default, fe_, default)); IEnumerable fg_ = context.Operators.Union(fd_, ff_); IEnumerable fh_ = context.Operators.Union(fb_, fg_); CqlValueSet fi_ = this.Visual_Field_Defects(); - IEnumerable fj_ = context.Operators.RetrieveByValueSet(fi_, default); + IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fi_, default)); IEnumerable fk_ = context.Operators.Union(fh_, fj_); bool? fl_(Condition ComorbidDiagnosis) { @@ -968,9 +969,9 @@ IEnumerable b_(Procedure CataractSurgeryPerformed) { CqlCode d_ = this.Best_corrected_visual_acuity__observable_entity_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); CqlValueSet g_ = this.Best_Corrected_Visual_Acuity_Exam_Using_Snellen_Chart(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Observation VisualAcuityExamPerformed) { diff --git a/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs index 97bc070cc..9281af41f 100644 --- a/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -189,7 +190,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -202,20 +203,20 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Telephone_Visits(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); IEnumerable r_ = Status_1_6_000.isEncounterPerformed(q_); @@ -280,7 +281,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Absence_of_Cervix_Value() { CqlValueSet a_ = this.Hysterectomy_with_No_Residual_Cervix(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure NoCervixProcedure) { @@ -296,7 +297,7 @@ private IEnumerable Absence_of_Cervix_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Congenital_or_Acquired_Absence_of_Cervix(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Condition NoCervixDiagnosis) { CqlInterval r_ = QICoreCommon_2_0_000.prevalenceInterval(NoCervixDiagnosis); @@ -336,7 +337,7 @@ public IEnumerable Absence_of_Cervix() => private IEnumerable Cervical_Cytology_Within_3_Years_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation CervicalCytology) { @@ -419,7 +420,7 @@ public IEnumerable Cervical_Cytology_Within_3_Years() => private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older_Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation HPVTest) { diff --git a/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs index ad99ab0b4..cf3d6b4d6 100644 --- a/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -245,7 +246,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -378,7 +379,7 @@ public IEnumerable Encounter_with_Singleton_Delivery() => { CqlCode a_ = this.____Pregnancies(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation Gravida) { DataType k_ = Gravida?.Value; @@ -531,7 +532,7 @@ bool bc_() { CqlCode a_ = this.____Parity(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation Parity) { object k_() @@ -684,7 +685,7 @@ bool bc_() { CqlCode a_ = this.____Births_preterm(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation PretermBirth) { object k_() @@ -837,7 +838,7 @@ bool bc_() { CqlCode a_ = this.____Births_term(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation TermBirth) { object k_() @@ -1025,7 +1026,7 @@ object d_() bool n_() { CqlValueSet q_ = this.Abnormal_Presentation(); - IEnumerable r_ = context.Operators.RetrieveByValueSet(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); bool? s_(Observation AbnormalPresentation) { object aa_() @@ -1167,7 +1168,7 @@ bool bh_() bool o_() { CqlValueSet bx_ = this.Abnormal_Presentation(); - IEnumerable by_ = context.Operators.RetrieveByValueSet(bx_, default); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); bool? bz_(Observation AbnormalPresentation) { object ch_() @@ -1309,7 +1310,7 @@ bool do_() bool p_() { CqlValueSet ee_ = this.Abnormal_Presentation(); - IEnumerable ef_ = context.Operators.RetrieveByValueSet(ee_, default); + IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default)); bool? eg_(Observation AbnormalPresentation) { object eo_() @@ -1451,7 +1452,7 @@ bool fv_() if (n_()) { CqlValueSet gl_ = this.Abnormal_Presentation(); - IEnumerable gm_ = context.Operators.RetrieveByValueSet(gl_, default); + IEnumerable gm_ = context.Operators.Retrieve(new RetrieveParameters(default, gl_, default)); bool? gn_(Observation AbnormalPresentation) { object gu_() @@ -1592,7 +1593,7 @@ bool ib_() else if (o_()) { CqlValueSet ir_ = this.Abnormal_Presentation(); - IEnumerable is_ = context.Operators.RetrieveByValueSet(ir_, default); + IEnumerable is_ = context.Operators.Retrieve(new RetrieveParameters(default, ir_, default)); bool? it_(Observation AbnormalPresentation) { object ja_() @@ -1733,7 +1734,7 @@ bool kh_() else if (p_()) { CqlValueSet kx_ = this.Abnormal_Presentation(); - IEnumerable ky_ = context.Operators.RetrieveByValueSet(kx_, default); + IEnumerable ky_ = context.Operators.Retrieve(new RetrieveParameters(default, kx_, default)); bool? kz_(Observation AbnormalPresentation) { object lg_() @@ -1990,7 +1991,7 @@ private IEnumerable Delivery_Encounter_with_Cesarean_Birth_Value() IEnumerable b_(Encounter ThirtysevenWeeksPlusEncounter) { CqlValueSet d_ = this.Cesarean_Birth(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure CSection) { CqlInterval j_ = PCMaternal_5_16_000.hospitalizationWithEDOBTriageObservation(ThirtysevenWeeksPlusEncounter); diff --git a/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs index b45f3b1dd..ab0fe29c4 100644 --- a/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -253,7 +254,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -310,26 +311,26 @@ public CqlCode SDE_Sex() => private IEnumerable Major_Depressive_Disorder_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Psych_Visit_for_Family_Psychotherapy(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Psych_Visit_Psychotherapy(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Psychoanalysis(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Group_Psychotherapy(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Telehealth_Services(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -431,7 +432,7 @@ IEnumerable b_(Encounter MDDEncounter) { CqlCode d_ = this.Suicide_risk_assessment__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Procedure SuicideRiskAssessment) { Code k_ = SuicideRiskAssessment?.StatusElement; diff --git a/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs index 170100205..911df31dd 100644 --- a/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -831,7 +832,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -844,17 +845,17 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); - IEnumerable l_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable l_ = context.Operators.Retrieve(default); bool? m_(Encounter E) { List y_ = E?.Type; @@ -880,11 +881,11 @@ CqlConcept z_(CodeableConcept @this) }; IEnumerable n_ = context.Operators.Where(l_, m_); CqlValueSet o_ = this.Online_Assessments(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(k_, q_); CqlValueSet s_ = this.Telephone_Visits(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); IEnumerable u_ = context.Operators.Union(r_, t_); IEnumerable v_ = Status_1_6_000.Finished_Encounter(u_); bool? w_(Encounter ValidEncounters) @@ -976,7 +977,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Severe_Combined_Immunodeficiency_Value() { CqlValueSet a_ = this.Severe_Combined_Immunodeficiency(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition SevereImmuneDisorder) { @@ -1001,7 +1002,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Immunodeficiency_Value() { CqlValueSet a_ = this.Disorders_of_the_Immune_System(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition ImmuneDisorder) { @@ -1026,7 +1027,7 @@ public CqlInterval First_Two_Years() => private bool? Has_HIV_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition HIV) { @@ -1051,7 +1052,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Lymphoreticular_Cancer__Multiple_Myeloma_or_Leukemia_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Lymphatic_and_Hematopoietic_Tissue(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition LymphaticMalignantNeoplasm) { @@ -1076,7 +1077,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Intussusception_Value() { CqlValueSet a_ = this.Intussusception(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition IntussusceptionDisorder) { @@ -1142,7 +1143,7 @@ public CqlInterval Vaccine_Administration_Interval___42_Days_up_to_2_Ye private IEnumerable DTaP_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.DTaP_Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization DTaPVaccination) { @@ -1170,7 +1171,7 @@ CqlDate f_(Immunization DTaPVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.DTaP_Vaccine_Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure DTaPProcedure) { @@ -1246,9 +1247,9 @@ public IEnumerable Four_DTaP_Vaccinations() => private IEnumerable DTaP_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Anaphylactic_Reaction_to_DTaP_Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Encephalitis_Due_to_Diphtheria__Tetanus_or_Pertussis_Vaccine(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Condition(e_); bool? g_(Condition DTaPConditions) @@ -1273,7 +1274,7 @@ public IEnumerable DTaP_Numerator_Inclusion_Conditions() => private IEnumerable Polio_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Inactivated_Polio_Vaccine__IPV_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization PolioVaccination) { @@ -1301,7 +1302,7 @@ CqlDate f_(Immunization PolioVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Inactivated_Polio_Vaccine__IPV__Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure PolioProcedure) { @@ -1375,7 +1376,7 @@ private IEnumerable Polio_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_human_poliovirus_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition PolioConditions) { @@ -1430,7 +1431,7 @@ public CqlInterval Date_of_First_Birthday_to_Date_of_Second_Birthday() private IEnumerable One_MMR_Vaccination_Value() { CqlValueSet a_ = this.Measles__Mumps_and_Rubella__MMR__Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization MMRVaccination) { @@ -1445,7 +1446,7 @@ private IEnumerable One_MMR_Vaccination_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Measles__Mumps_and_Rubella__MMR__Vaccine_Administered(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure MMRProcedure) { @@ -1472,7 +1473,7 @@ private IEnumerable MMR_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Measles_morbillivirus_and_Mumps_orthorubulavirus_and_Rubella_virus_antigens__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition MMRConditions) { @@ -1496,7 +1497,7 @@ public IEnumerable MMR_Numerator_Inclusion_Conditions() => private IEnumerable Measles_Indicators_Value() { CqlValueSet a_ = this.Measles(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition MeaslesDiagnosis) { @@ -1520,7 +1521,7 @@ public IEnumerable Measles_Indicators() => private IEnumerable Mumps_Indicators_Value() { CqlValueSet a_ = this.Mumps(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition MumpsDiagnosis) { @@ -1544,7 +1545,7 @@ public IEnumerable Mumps_Indicators() => private IEnumerable Rubella_Indicators_Value() { CqlValueSet a_ = this.Rubella(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition RubellaDiagnosis) { @@ -1568,7 +1569,7 @@ public IEnumerable Rubella_Indicators() => private IEnumerable Hib_3_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hib_Vaccine__3_dose_schedule_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ThreeDoseHibVaccine) { @@ -1596,7 +1597,7 @@ CqlDate f_(Immunization ThreeDoseHibVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hib_Vaccine__3_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure ThreeDoseHibProcedure) { @@ -1635,7 +1636,7 @@ public IEnumerable Hib_3_Dose_Immunizations_or_Procedures() => private IEnumerable Hib_4_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hib_Vaccine__4_dose_schedule_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HibVaccine) { @@ -1663,7 +1664,7 @@ CqlDate f_(Immunization HibVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hib_Vaccine__4_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure HibProcedure) { @@ -1786,7 +1787,7 @@ private IEnumerable Hib_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_due_to_Haemophilus_influenzae_type_b_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition HibReaction) { @@ -1810,7 +1811,7 @@ public IEnumerable Hib_Numerator_Inclusion_Conditions() => private IEnumerable Hepatitis_B_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hepatitis_B_Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HepatitisBVaccination) { @@ -1838,7 +1839,7 @@ CqlDate f_(Immunization HepatitisBVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hepatitis_B_Vaccine_Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure HepatitisBProcedure) { @@ -1912,7 +1913,7 @@ private IEnumerable NewBorn_Vaccine_Requirement_Value() { CqlCode a_ = this.Introduction_of_Serum__Toxoid_and_Vaccine_into_Muscle__Percutaneous_Approach(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Completed_Procedure(c_); bool? e_(Procedure NewBornVaccine) { @@ -2000,9 +2001,9 @@ private IEnumerable Hepatitis_B_Numerator_Inclusion_Conditions_Value( { CqlCode a_ = this.Anaphylaxis_due_to_Hepatitis_B_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlValueSet d_ = this.Hepatitis_B(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition HepBConditions) @@ -2027,7 +2028,7 @@ public IEnumerable Hepatitis_B_Numerator_Inclusion_Conditions() => private IEnumerable One_Chicken_Pox_Vaccination_Value() { CqlValueSet a_ = this.Varicella_Zoster_Vaccine__VZV_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ChickenPoxVaccination) { @@ -2042,7 +2043,7 @@ private IEnumerable One_Chicken_Pox_Vaccination_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Varicella_Zoster_Vaccine__VZV__Administered(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure ChickenPoxProcedure) { @@ -2068,10 +2069,10 @@ public IEnumerable One_Chicken_Pox_Vaccination() => private IEnumerable Varicella_Zoster_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Varicella_Zoster(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlCode c_ = this.Anaphylaxis_caused_by_vaccine_containing_Human_alphaherpesvirus_3_antigen__disorder_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.RetrieveByCodes(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); IEnumerable f_ = context.Operators.Union(b_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition VaricellaZoster) @@ -2096,7 +2097,7 @@ public IEnumerable Varicella_Zoster_Numerator_Inclusion_Conditions() private IEnumerable Pneumococcal_Conjugate_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Pneumococcal_Conjugate_Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization PneumococcalVaccination) { @@ -2124,7 +2125,7 @@ CqlDate f_(Immunization PneumococcalVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Pneumococcal_Conjugate_Vaccine_Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure PneumococcalProcedure) { @@ -2201,7 +2202,7 @@ private IEnumerable Pneumococcal_Conjugate_Numerator_Inclusion_Condit { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Streptococcus_pneumoniae_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition PneumococcalReaction) { @@ -2225,7 +2226,7 @@ public IEnumerable Pneumococcal_Conjugate_Numerator_Inclusion_Conditi private IEnumerable One_Hepatitis_A_Vaccinations_Value() { CqlValueSet a_ = this.Hepatitis_A_Vaccine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HepatitisAVaccination) { @@ -2240,7 +2241,7 @@ private IEnumerable One_Hepatitis_A_Vaccinations_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Hepatitis_A_Vaccine_Administered(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure HepatitisAProcedure) { @@ -2266,10 +2267,10 @@ public IEnumerable One_Hepatitis_A_Vaccinations() => private IEnumerable Hepatitis_A_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Hepatitis_A(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlCode c_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Hepatitis_A_virus_antigen__disorder_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.RetrieveByCodes(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); IEnumerable f_ = context.Operators.Union(b_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition HepatitisADiagnosis) @@ -2295,7 +2296,7 @@ private IEnumerable Rotavirus_2_Dose_Immunizations_or_Procedures_Value( { CqlCode a_ = this.rotavirus__live__monovalent_vaccine(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Completed_Immunization(c_); bool? e_(Immunization TwoDoseRotavirusVaccine) { @@ -2323,7 +2324,7 @@ CqlDate g_(Immunization TwoDoseRotavirusVaccine) }; IEnumerable h_ = context.Operators.Select(f_, g_); CqlValueSet i_ = this.Rotavirus_Vaccine__2_dose_schedule__Administered(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = Status_1_6_000.Completed_Procedure(j_); bool? l_(Procedure TwoDoseRotavirusProcedure) { @@ -2362,7 +2363,7 @@ public IEnumerable Rotavirus_2_Dose_Immunizations_or_Procedures() => private IEnumerable Rotavirus_3_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Rotavirus_Vaccine__3_dose_schedule_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ThreeDoseRotavirusVaccine) { @@ -2390,7 +2391,7 @@ CqlDate f_(Immunization ThreeDoseRotavirusVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Rotavirus_Vaccine__3_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure ThreeDoseRotavirusAdministered) { @@ -2513,7 +2514,7 @@ private IEnumerable Rotavirus_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_due_to_rotavirus_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition RotavirusConditions) { @@ -2557,7 +2558,7 @@ public CqlInterval Vaccine_Administration_Interval___180_Days_up_to_2_Y private IEnumerable Influenza_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Child_Influenza_Immunization_Administered(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization InfluenzaVaccine) { @@ -2585,7 +2586,7 @@ CqlDate f_(Immunization InfluenzaVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Child_Influenza_Vaccine_Administered(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure InfluenzaAdministration) { @@ -2661,7 +2662,7 @@ public IEnumerable Two_Influenza_Vaccinations() => private IEnumerable LAIV_Vaccinations_Value() { CqlValueSet a_ = this.Influenza_Virus_LAIV_Immunization(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization LAIVVaccine) { @@ -2690,7 +2691,7 @@ CqlDate f_(Immunization LAIVVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Influenza_Virus_LAIV_Procedure(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure InfluenzaAdministration) { @@ -2746,7 +2747,7 @@ private IEnumerable Influenza_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Influenza_virus_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition InfluenzaConditions) { diff --git a/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs index b25c5fd30..bda640cca 100644 --- a/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -209,7 +210,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -222,7 +223,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Clinical_Oral_Evaluation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter ValidEncounter) { @@ -290,7 +291,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Dental_Caries(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition DentalCaries) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(DentalCaries); diff --git a/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs index 3bf673c03..5a1cf8ec9 100644 --- a/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -389,7 +390,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -446,26 +447,26 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Home_Healthcare_Services(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Online_Assessments(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); IEnumerable x_ = Status_1_6_000.Finished_Encounter(w_); @@ -492,7 +493,7 @@ public IEnumerable Qualifying_Encounters() => { CqlCode a_ = this.Have_you_ever_had_vaginal_intercourse__PhenX_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation SexualActivityAssessment) { @@ -545,12 +546,12 @@ bool s_() private bool? Has_Diagnoses_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Diagnoses_Used_to_Indicate_Sexual_Activity(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.HIV(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Complications_of_Pregnancy__Childbirth_and_the_Puerperium(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition SexualActivityDiagnosis) { @@ -573,8 +574,8 @@ bool s_() private bool? Has_Active_Contraceptive_Medications_Value() { CqlValueSet a_ = this.Contraceptive_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Medication(e_); bool? g_(MedicationRequest ActiveContraceptives) @@ -605,8 +606,8 @@ bool s_() private bool? Has_Ordered_Contraceptive_Medications_Value() { CqlValueSet a_ = this.Contraceptive_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest OrderedContraceptives) @@ -632,12 +633,12 @@ bool s_() private bool? Has_Laboratory_Tests_Identifying_Sexual_Activity_But_Not_Pregnancy_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Lab_Tests_During_Pregnancy(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Lab_Tests_for_Sexually_Transmitted_Infections(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(h_); bool? j_(ServiceRequest LabOrders) @@ -663,7 +664,7 @@ bool s_() private bool? Has_Laboratory_Tests_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Pregnancy_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest PregnancyTest) { @@ -690,7 +691,7 @@ bool s_() private bool? Has_Diagnostic_Studies_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Diagnostic_Studies_During_Pregnancy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest SexualActivityDiagnostics) { @@ -715,7 +716,7 @@ bool s_() private bool? Has_Procedures_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Procedures_Used_to_Indicate_Sexual_Activity(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ProceduresForSexualActivity) { @@ -793,12 +794,12 @@ bool s_() private bool? Has_Pregnancy_Test_Exclusion_Value() { CqlValueSet a_ = this.Pregnancy_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); IEnumerable d_(ServiceRequest PregnancyTest) { CqlValueSet m_ = this.XRay_Study(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); IEnumerable o_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(n_); bool? p_(ServiceRequest XrayOrder) { @@ -838,13 +839,13 @@ ServiceRequest r_(ServiceRequest XrayOrder) => return s_; }; IEnumerable e_ = context.Operators.SelectMany(c_, d_); - IEnumerable g_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable h_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(g_); IEnumerable i_(ServiceRequest PregnancyTestOrder) { CqlValueSet av_ = this.Isotretinoin(); - IEnumerable aw_ = context.Operators.RetrieveByValueSet(av_, default); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(av_, default); + IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); IEnumerable az_ = context.Operators.Union(aw_, ay_); IEnumerable ba_ = Status_1_6_000.Active_or_Completed_Medication_Request(az_); bool? bb_(MedicationRequest AccutaneOrder) @@ -932,7 +933,7 @@ ServiceRequest bd_(MedicationRequest AccutaneOrder) => private bool? Numerator_Value() { CqlValueSet a_ = this.Chlamydia_Screening(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation ChlamydiaTest) { diff --git a/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs index a58899fe7..5313f00e9 100644 --- a/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -175,7 +176,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -266,7 +267,7 @@ public CqlCode SDE_Sex() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition ColorectalCancer) { @@ -290,7 +291,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure Colectomy) { @@ -339,7 +340,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation FecalOccultResult) { @@ -417,7 +418,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Stool_DNA_with_FIT_Test_Performed_Value() { CqlValueSet a_ = this.sDNA_FIT_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation sDNATest) { @@ -500,7 +501,7 @@ public IEnumerable Stool_DNA_with_FIT_Test_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure FlexibleSigmoidoscopy) { @@ -530,7 +531,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Final_Observation(b_); bool? d_(Observation Colonography) { @@ -560,7 +561,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure Colonoscopy) { diff --git a/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs b/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs index 0b1e66de0..5175a9fc0 100644 --- a/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -540,7 +541,7 @@ public string ErrorLevel() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs index b107b14f3..d4c821d34 100644 --- a/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -313,7 +314,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -370,18 +371,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -418,7 +419,7 @@ private IEnumerable Diabetic_Retinopathy_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Diabetic_Retinopathy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Condition DiabeticRetinopathy) { CqlInterval j_ = QICoreCommon_2_0_000.prevalenceInterval(DiabeticRetinopathy); @@ -488,7 +489,7 @@ public IEnumerable Diabetic_Retinopathy_Encounter() => private IEnumerable Macular_Exam_Performed_Value() { CqlValueSet a_ = this.Macular_Exam(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation MacularExam) { IEnumerable g_ = this.Diabetic_Retinopathy_Encounter(); @@ -556,9 +557,9 @@ public IEnumerable Macular_Exam_Performed() => private IEnumerable Level_of_Severity_of_Retinopathy_Findings_Communicated_Value() { - CqlValueSet a_ = this.Level_of_Severity_of_Retinopathy_Findings(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication LevelOfSeverityCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -605,9 +606,9 @@ public IEnumerable Level_of_Severity_of_Retinopathy_Findings_Comm private IEnumerable Macular_Edema_Absence_Communicated_Value() { - CqlValueSet a_ = this.Macular_edema_absent__situation_(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_edema_absent__situation_(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication MacularEdemaAbsentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -654,9 +655,9 @@ public IEnumerable Macular_Edema_Absence_Communicated() => private IEnumerable Macular_Edema_Presence_Communicated_Value() { - CqlValueSet a_ = this.Macular_Edema_Findings_Present(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_Edema_Findings_Present(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication MacularEdemaPresentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -721,10 +722,10 @@ public IEnumerable Macular_Edema_Presence_Communicated() => private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Level_of_Severity_of_Retinopathy_Value() { - CqlValueSet a_ = this.Level_of_Severity_of_Retinopathy_Findings(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication LevelOfSeverityNotCommunicated) { @@ -790,10 +791,10 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Absence_of_Macular_Edema_Value() { - CqlValueSet a_ = this.Macular_edema_absent__situation_(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_edema_absent__situation_(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication MacularEdemaAbsentNotCommunicated) { @@ -859,10 +860,10 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Presence_of_Macular_Edema_Value() { - CqlValueSet a_ = this.Macular_Edema_Findings_Present(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_Edema_Findings_Present(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication MacularEdemaPresentNotCommunicated) { diff --git a/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs index be1f013ce..2df9ae056 100644 --- a/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -249,7 +250,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -262,30 +263,30 @@ public Patient Patient() => private IEnumerable Encounter_to_Assess_Cognition_Value() { CqlValueSet a_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Nursing_Facility_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Psych_Visit_Psychotherapy(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Behavioral_Neuropsych_Assessment(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Occupational_Therapy_Evaluation(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Office_Visit(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Outpatient_Consultation(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable z_ = context.Operators.Union(w_, y_); return z_; @@ -301,7 +302,7 @@ private IEnumerable Dementia_Encounter_During_Measurement_Period_Valu IEnumerable b_(Encounter EncounterAssessCognition) { CqlValueSet d_ = this.Dementia_and_Mental_Degenerations(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Condition Dementia) { CqlInterval j_ = this.Measurement_Period(); @@ -354,7 +355,7 @@ private IEnumerable Qualifying_Encounter_During_Measurement_Period_Va { IEnumerable a_ = this.Encounter_to_Assess_Cognition(); CqlValueSet b_ = this.Patient_Provider_Interaction(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable d_ = context.Operators.Union(a_, c_); bool? e_(Encounter ValidEncounter) { @@ -409,9 +410,9 @@ public IEnumerable Qualifying_Encounter_During_Measurement_Period() = private IEnumerable Assessment_of_Cognition_Using_Standardized_Tools_or_Alternate_Methods_Value() { CqlValueSet a_ = this.Standardized_Tools_Score_for_Assessment_of_Cognition(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Cognitive_Assessment(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation CognitiveAssessment) { @@ -490,9 +491,9 @@ public IEnumerable Assessment_of_Cognition_Using_Standardized_Tools private IEnumerable Patient_Reason_for_Not_Performing_Assessment_of_Cognition_Using_Standardized_Tools_or_Alternate_Methods_Value() { CqlValueSet a_ = this.Standardized_Tools_Score_for_Assessment_of_Cognition(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Cognitive_Assessment(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation NoCognitiveAssessment) { diff --git a/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs index c8be4cb32..d4e8fbe58 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -233,7 +234,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -246,24 +247,24 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Ophthalmological_Services(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.isEncounterPerformed(t_); bool? v_(Encounter ValidEncounters) @@ -300,7 +301,7 @@ public IEnumerable Qualifying_Encounters() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.And(j_, l_); CqlValueSet n_ = this.Diabetes(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); bool? p_(Condition Diabetes) { CqlInterval t_ = QICoreCommon_2_0_000.prevalenceInterval(Diabetes); @@ -351,7 +352,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Diabetic_Retinopathy_Overlapping_Measurement_Period_Value() { CqlValueSet a_ = this.Diabetic_Retinopathy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Retinopathy) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(Retinopathy); @@ -373,7 +374,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Retinal_Exam_in_Measurement_Period_Value() { CqlValueSet a_ = this.Retinal_or_Dilated_Eye_Exam(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation RetinalExam) { @@ -397,7 +398,7 @@ public IEnumerable Retinal_Exam_in_Measurement_Period() => private IEnumerable Retinal_Exam_in_Measurement_Period_or_Year_Prior_Value() { CqlValueSet a_ = this.Retinal_or_Dilated_Eye_Exam(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation RetinalExam) { diff --git a/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs index bd297b385..e425f3aa2 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -117,7 +118,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -187,7 +188,7 @@ public CqlCode SDE_Sex() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.And(j_, l_); CqlValueSet n_ = this.Diabetes(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); bool? p_(Condition Diabetes) { CqlInterval t_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Diabetes); @@ -238,7 +239,7 @@ public CqlCode SDE_Sex() => private Observation Most_Recent_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation RecentHbA1c) { @@ -353,7 +354,7 @@ public Observation Most_Recent_HbA1c() => private bool? Has_No_Record_Of_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation NoHbA1c) { diff --git a/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs b/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs index 5cec61f9f..b9c4eefc6 100644 --- a/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -133,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -219,8 +220,8 @@ private IEnumerable Numerator_Value() IEnumerable b_(Encounter IschemicStrokeEncounter) { CqlValueSet d_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest DischargeAntithrombotic) { @@ -251,8 +252,8 @@ public IEnumerable Numerator() => private IEnumerable Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest Antithrombotic) { @@ -300,8 +301,8 @@ public IEnumerable Antithrombotic_Therapy_at_Discharge() => private IEnumerable Reason_for_Not_Giving_Antithrombotic_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest NoAntithromboticDischarge) { @@ -388,8 +389,8 @@ public IEnumerable Encounter_with_Documented_Reason_for_No_Antithromb private IEnumerable Pharmacological_Contraindications_for_Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Pharmacological_Contraindications_For_Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest Pharmacological) { diff --git a/Demo/Measures.CMS/CSharp/FHIRHelpers-4.3.000.g.cs b/Demo/Measures.CMS/CSharp/FHIRHelpers-4.3.000.g.cs index dc06370ec..a1281f535 100644 --- a/Demo/Measures.CMS/CSharp/FHIRHelpers-4.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FHIRHelpers-4.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs index 00a7a796a..bc55c191d 100644 --- a/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -243,7 +244,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -300,48 +301,48 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Ophthalmological_Services(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Discharge_Services_Nursing_Facility(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Nursing_Facility_Visit(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Audiology_Visit(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); CqlValueSet af_ = this.Telephone_Visits(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); IEnumerable ah_ = context.Operators.Union(ae_, ag_); IEnumerable ai_ = context.Operators.Union(ac_, ah_); CqlValueSet aj_ = this.Online_Assessments(); - IEnumerable ak_ = context.Operators.RetrieveByValueSet(aj_, default); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); CqlValueSet al_ = this.Physical_Therapy_Evaluation(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = context.Operators.Union(ai_, an_); CqlValueSet ap_ = this.Occupational_Therapy_Evaluation(); - IEnumerable aq_ = context.Operators.RetrieveByValueSet(ap_, default); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); IEnumerable ar_ = context.Operators.Union(ao_, aq_); IEnumerable as_ = Status_1_6_000.Finished_Encounter(ar_); bool? at_(Encounter ValidEncounter) @@ -410,7 +411,7 @@ public IEnumerable Qualifying_Encounter() => private bool? Numerator_Value() { CqlValueSet a_ = this.Falls_Screening(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation FallsScreening) { diff --git a/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs index b134d2ca0..e16d4074a 100644 --- a/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -409,7 +410,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -468,44 +469,44 @@ public CqlInterval Intake_Period() => private IEnumerable<(CqlDate startDate, nint _)?> ADHD_Medication_Prescribed_During_Intake_Period_and_Not_Previously_on_ADHD_Medication_Value() { CqlValueSet a_ = this.Atomoxetine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Clonidine(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Dexmethylphenidate(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); - IEnumerable o_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Dextroamphetamine(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); - IEnumerable u_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Lisdexamfetamine(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlCode ad_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable ae_ = context.Operators.ToList(ad_); - IEnumerable af_ = context.Operators.RetrieveByCodes(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ae_)); IEnumerable ah_ = context.Operators.ToList(ad_); - IEnumerable ai_ = context.Operators.RetrieveByCodes(ah_, default); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_)); IEnumerable aj_ = context.Operators.Union(af_, ai_); IEnumerable ak_ = context.Operators.Union(ac_, aj_); CqlValueSet al_ = this.Methylphenidate(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); - IEnumerable ao_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable ao_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable ap_ = context.Operators.Union(am_, ao_); IEnumerable aq_ = context.Operators.Union(ak_, ap_); CqlValueSet ar_ = this.Guanfacine(); - IEnumerable as_ = context.Operators.RetrieveByValueSet(ar_, default); - IEnumerable au_ = context.Operators.RetrieveByValueSet(ar_, default); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); IEnumerable av_ = context.Operators.Union(as_, au_); IEnumerable aw_ = context.Operators.Union(aq_, av_); bool? ax_(MedicationRequest ADHDMedications) @@ -519,37 +520,37 @@ public CqlInterval Intake_Period() => return dj_; }; IEnumerable ay_ = context.Operators.Where(aw_, ax_); - IEnumerable ba_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable bd_ = context.Operators.Union(ba_, bc_); - IEnumerable bf_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable bh_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable bi_ = context.Operators.Union(bf_, bh_); IEnumerable bj_ = context.Operators.Union(bd_, bi_); - IEnumerable bl_ = context.Operators.RetrieveByValueSet(l_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable bo_ = context.Operators.Union(bl_, bn_); IEnumerable bp_ = context.Operators.Union(bj_, bo_); - IEnumerable br_ = context.Operators.RetrieveByValueSet(r_, default); - IEnumerable bt_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable bu_ = context.Operators.Union(br_, bt_); IEnumerable bv_ = context.Operators.Union(bp_, bu_); - IEnumerable bx_ = context.Operators.RetrieveByValueSet(x_, default); - IEnumerable bz_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable ca_ = context.Operators.Union(bx_, bz_); IEnumerable cb_ = context.Operators.Union(bv_, ca_); IEnumerable cd_ = context.Operators.ToList(ad_); - IEnumerable ce_ = context.Operators.RetrieveByCodes(cd_, default); + IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cd_)); IEnumerable cg_ = context.Operators.ToList(ad_); - IEnumerable ch_ = context.Operators.RetrieveByCodes(cg_, default); + IEnumerable ch_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cg_)); IEnumerable ci_ = context.Operators.Union(ce_, ch_); IEnumerable cj_ = context.Operators.Union(cb_, ci_); - IEnumerable cl_ = context.Operators.RetrieveByValueSet(al_, default); - IEnumerable cn_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable cn_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable co_ = context.Operators.Union(cl_, cn_); IEnumerable cp_ = context.Operators.Union(cj_, co_); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(ar_, default); - IEnumerable ct_ = context.Operators.RetrieveByValueSet(ar_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable ct_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); IEnumerable cu_ = context.Operators.Union(cr_, ct_); IEnumerable cv_ = context.Operators.Union(cp_, cu_); bool? cw_(MedicationRequest ADHDMedications) @@ -566,44 +567,44 @@ public CqlInterval Intake_Period() => IEnumerable cy_(MedicationRequest ADHDMedicationOrder) { CqlValueSet dp_ = this.Atomoxetine(); - IEnumerable dq_ = context.Operators.RetrieveByValueSet(dp_, default); - IEnumerable ds_ = context.Operators.RetrieveByValueSet(dp_, default); + IEnumerable dq_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default)); + IEnumerable ds_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default)); IEnumerable dt_ = context.Operators.Union(dq_, ds_); CqlValueSet du_ = this.Clonidine(); - IEnumerable dv_ = context.Operators.RetrieveByValueSet(du_, default); - IEnumerable dx_ = context.Operators.RetrieveByValueSet(du_, default); + IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); IEnumerable dy_ = context.Operators.Union(dv_, dx_); IEnumerable dz_ = context.Operators.Union(dt_, dy_); CqlValueSet ea_ = this.Dexmethylphenidate(); - IEnumerable eb_ = context.Operators.RetrieveByValueSet(ea_, default); - IEnumerable ed_ = context.Operators.RetrieveByValueSet(ea_, default); + IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); + IEnumerable ed_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); IEnumerable ee_ = context.Operators.Union(eb_, ed_); IEnumerable ef_ = context.Operators.Union(dz_, ee_); CqlValueSet eg_ = this.Dextroamphetamine(); - IEnumerable eh_ = context.Operators.RetrieveByValueSet(eg_, default); - IEnumerable ej_ = context.Operators.RetrieveByValueSet(eg_, default); + IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); + IEnumerable ej_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); IEnumerable ek_ = context.Operators.Union(eh_, ej_); IEnumerable el_ = context.Operators.Union(ef_, ek_); CqlValueSet em_ = this.Lisdexamfetamine(); - IEnumerable en_ = context.Operators.RetrieveByValueSet(em_, default); - IEnumerable ep_ = context.Operators.RetrieveByValueSet(em_, default); + IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); + IEnumerable ep_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); IEnumerable eq_ = context.Operators.Union(en_, ep_); IEnumerable er_ = context.Operators.Union(el_, eq_); CqlCode es_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable et_ = context.Operators.ToList(es_); - IEnumerable eu_ = context.Operators.RetrieveByCodes(et_, default); + IEnumerable eu_ = context.Operators.Retrieve(new RetrieveParameters(default, default, et_)); IEnumerable ew_ = context.Operators.ToList(es_); - IEnumerable ex_ = context.Operators.RetrieveByCodes(ew_, default); + IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ew_)); IEnumerable ey_ = context.Operators.Union(eu_, ex_); IEnumerable ez_ = context.Operators.Union(er_, ey_); CqlValueSet fa_ = this.Methylphenidate(); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(fa_, default); - IEnumerable fd_ = context.Operators.RetrieveByValueSet(fa_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); + IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); IEnumerable fe_ = context.Operators.Union(fb_, fd_); IEnumerable ff_ = context.Operators.Union(ez_, fe_); CqlValueSet fg_ = this.Guanfacine(); - IEnumerable fh_ = context.Operators.RetrieveByValueSet(fg_, default); - IEnumerable fj_ = context.Operators.RetrieveByValueSet(fg_, default); + IEnumerable fh_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default)); + IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default)); IEnumerable fk_ = context.Operators.Union(fh_, fj_); IEnumerable fl_ = context.Operators.Union(ff_, fk_); bool? fm_(MedicationRequest ActiveADHDMedication) @@ -697,14 +698,14 @@ public CqlDate IPSD() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(Encounter ValidEncounters) @@ -757,7 +758,7 @@ public IEnumerable PrincipalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable i_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable i_ = context.Operators.Retrieve(default); bool? j_(Condition C) { Id m_ = C?.IdElement; @@ -783,7 +784,7 @@ Condition d_(Encounter.DiagnosisComponent PD) private IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter InpatientStay) { IEnumerable e_ = this.PrincipalDiagnosis(InpatientStay); @@ -889,7 +890,7 @@ public IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_In private IEnumerable Narcolepsy_Exclusion_Value() { CqlValueSet a_ = this.Narcolepsy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Narcolepsy) { CqlInterval e_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Narcolepsy); @@ -926,20 +927,20 @@ public IEnumerable Narcolepsy_Exclusion() => private IEnumerable Qualifying_Numerator_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Initial_Hospital_Observation_Care(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Behavioral_Health_Follow_up_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Psychotherapy_and_Pharmacologic_Management(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); bool? p_(Encounter PsychPharmManagement) { List ao_ = PsychPharmManagement?.Location; @@ -969,25 +970,25 @@ CqlConcept av_(CodeableConcept @this) IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(k_, r_); CqlValueSet t_ = this.Outpatient_Consultation(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); CqlValueSet v_ = this.Home_Healthcare_Services(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); CqlValueSet z_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); CqlValueSet ab_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(ab_, default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); IEnumerable ad_ = context.Operators.Union(aa_, ac_); IEnumerable ae_ = context.Operators.Union(y_, ad_); CqlValueSet af_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); CqlValueSet ah_ = this.Psych_Visit_Psychotherapy(); - IEnumerable ai_ = context.Operators.RetrieveByValueSet(ah_, default); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); IEnumerable aj_ = context.Operators.Union(ag_, ai_); IEnumerable ak_ = context.Operators.Union(ae_, aj_); CqlValueSet al_ = this.Telephone_Visits(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable an_ = context.Operators.Union(ak_, am_); return an_; @@ -1040,8 +1041,8 @@ public IEnumerable Encounter_During_Initiation_Phase() => private IEnumerable> ADHD_Medications_Taken_on_IPSD_or_During_Continuation_and_Maintenance_Phase_Value() { CqlValueSet a_ = this.Atomoxetine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); (CqlInterval period, CqlDate periodStart)? f_(MedicationRequest AtomoxetineMed) { @@ -1076,8 +1077,8 @@ CqlInterval l_((CqlInterval period, CqlDate periodStart)? @thi IEnumerable> m_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(k_, l_); IEnumerable> n_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(m_); CqlValueSet o_ = this.Clonidine(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); - IEnumerable r_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable s_ = context.Operators.Union(p_, r_); (CqlInterval period, CqlDate periodStart)? t_(MedicationRequest ClonidineMed) { @@ -1113,8 +1114,8 @@ CqlInterval z_((CqlInterval period, CqlDate periodStart)? @thi IEnumerable> ab_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(aa_); IEnumerable> ac_ = context.Operators.Union>(n_, ab_); CqlValueSet ad_ = this.Dexmethylphenidate(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); IEnumerable ah_ = context.Operators.Union(ae_, ag_); (CqlInterval period, CqlDate periodStart)? ai_(MedicationRequest DexmethylphenidateMed) { @@ -1149,8 +1150,8 @@ CqlInterval ao_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> ap_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(an_, ao_); IEnumerable> aq_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(ap_); CqlValueSet ar_ = this.Dextroamphetamine(); - IEnumerable as_ = context.Operators.RetrieveByValueSet(ar_, default); - IEnumerable au_ = context.Operators.RetrieveByValueSet(ar_, default); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); IEnumerable av_ = context.Operators.Union(as_, au_); (CqlInterval period, CqlDate periodStart)? aw_(MedicationRequest DextroamphetamineMed) { @@ -1187,8 +1188,8 @@ CqlInterval bc_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> bf_ = context.Operators.Union>(aq_, be_); IEnumerable> bg_ = context.Operators.Union>(ac_, bf_); CqlValueSet bh_ = this.Lisdexamfetamine(); - IEnumerable bi_ = context.Operators.RetrieveByValueSet(bh_, default); - IEnumerable bk_ = context.Operators.RetrieveByValueSet(bh_, default); + IEnumerable bi_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default)); + IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default)); IEnumerable bl_ = context.Operators.Union(bi_, bk_); (CqlInterval period, CqlDate periodStart)? bm_(MedicationRequest LisdexamfetamineMed) { @@ -1223,8 +1224,8 @@ CqlInterval bs_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> bt_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(br_, bs_); IEnumerable> bu_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(bt_); CqlValueSet bv_ = this.Methylphenidate(); - IEnumerable bw_ = context.Operators.RetrieveByValueSet(bv_, default); - IEnumerable by_ = context.Operators.RetrieveByValueSet(bv_, default); + IEnumerable bw_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default)); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default)); IEnumerable bz_ = context.Operators.Union(bw_, by_); (CqlInterval period, CqlDate periodStart)? ca_(MedicationRequest MethylphenidateMed) { @@ -1261,8 +1262,8 @@ CqlInterval cg_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> cj_ = context.Operators.Union>(bu_, ci_); IEnumerable> ck_ = context.Operators.Union>(bg_, cj_); CqlValueSet cl_ = this.Guanfacine(); - IEnumerable cm_ = context.Operators.RetrieveByValueSet(cl_, default); - IEnumerable co_ = context.Operators.RetrieveByValueSet(cl_, default); + IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); + IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); IEnumerable cp_ = context.Operators.Union(cm_, co_); (CqlInterval period, CqlDate periodStart)? cq_(MedicationRequest GuanfacineMed) { @@ -1298,9 +1299,9 @@ CqlInterval cw_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> cy_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(cx_); CqlCode cz_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable da_ = context.Operators.ToList(cz_); - IEnumerable db_ = context.Operators.RetrieveByCodes(da_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, default, da_)); IEnumerable dd_ = context.Operators.ToList(cz_); - IEnumerable de_ = context.Operators.RetrieveByCodes(dd_, default); + IEnumerable de_ = context.Operators.Retrieve(new RetrieveParameters(default, default, dd_)); IEnumerable df_ = context.Operators.Union(db_, de_); (CqlInterval period, CqlDate periodStart)? dg_(MedicationRequest MethamphetamineMed) { @@ -1511,7 +1512,7 @@ public IEnumerable Encounter_31_to_300_Days_into_Continuation_and_Maint private IEnumerable Online_Assessment_31_to_300_Days_into_Continuation_and_Maintenance_Phase_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter OnlineAssessment) { Period g_ = OnlineAssessment?.Period; diff --git a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs index 9cdb6ab38..c071c6c87 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -547,7 +548,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -620,11 +621,11 @@ public CqlDateTime November_1_Year_Prior_to_the_Measurement_Period() => private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Outpatient_Consultation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Office_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Encounter E) { List t_ = E?.Type; @@ -650,11 +651,11 @@ CqlConcept u_(CodeableConcept @this) }; IEnumerable h_ = context.Operators.Where(f_, g_); CqlValueSet i_ = this.Telephone_Visits(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Online_Assessments(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); IEnumerable o_ = context.Operators.Union(l_, n_); IEnumerable p_ = Status_1_6_000.isEncounterPerformed(o_); bool? q_(Encounter ValidEncounters) @@ -715,7 +716,7 @@ public CqlDateTime October_31_Year_Prior_to_the_Measurement_Period() => private IEnumerable Total_Hip_Arthroplasty_Procedure_Value() { CqlValueSet a_ = this.Primary_THA_Procedure(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure THAProcedure) { @@ -778,7 +779,7 @@ public IEnumerable Total_Hip_Arthroplasty_Procedure() => { CqlCode a_ = this.Severe_cognitive_impairment__finding_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Condition Dementia) { CqlInterval g_ = QICoreCommon_2_0_000.prevalenceInterval(Dementia); @@ -803,7 +804,7 @@ public IEnumerable Total_Hip_Arthroplasty_Procedure() => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Lower_Body_Fractures_Excluding_Ankle_and_Foot(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Condition LowerBodyFracture) { CqlInterval k_ = QICoreCommon_2_0_000.prevalenceInterval(LowerBodyFracture); @@ -847,7 +848,7 @@ Procedure i_(Condition LowerBodyFracture) => private bool? Has_Partial_Hip_Arthroplasty_Procedure_Value() { CqlValueSet a_ = this.Partial_Arthroplasty_of_Hip(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); IEnumerable d_(Procedure PartialTHAProcedure) { @@ -887,7 +888,7 @@ Procedure j_(Procedure THAProcedure) => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Removal__Revision_and_Supplement_Procedures_of_the_Lower_Body_and_Spine(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); IEnumerable g_ = Status_1_6_000.isProcedurePerformed(f_); bool? h_(Procedure RevisionTHAProcedure) { @@ -921,7 +922,7 @@ Procedure j_(Procedure RevisionTHAProcedure) => private bool? Has_Malignant_Neoplasm_of_Lower_and_Unspecified_Limbs_Value() { CqlValueSet a_ = this.Malignant_Neoplasms_of_Lower_and_Unspecified_Limbs(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition MalignantNeoplasm) { IEnumerable f_ = this.Total_Hip_Arthroplasty_Procedure(); @@ -955,7 +956,7 @@ Condition i_(Procedure THAProcedure) => private bool? Has_Mechanical_Complication_Value() { CqlValueSet a_ = this.Mechanical_Complications_Excluding_Upper_Body(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition MechanicalComplications) { IEnumerable f_ = this.Total_Hip_Arthroplasty_Procedure(); @@ -992,7 +993,7 @@ Condition i_(Procedure THAProcedure) => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Primary_THA_Procedure(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); IEnumerable g_ = Status_1_6_000.isProcedurePerformed(f_); bool? h_(Procedure ElectiveTHAProcedure) { @@ -1105,23 +1106,23 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() { CqlCode a_ = this.Quality_of_life_score__HOOS_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.isAssessmentPerformed(c_); CqlCode e_ = this.Sport_recreation_score__HOOS_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.isAssessmentPerformed(g_); CqlCode i_ = this.Activities_of_daily_living_score__HOOS_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); IEnumerable l_ = Status_1_6_000.isAssessmentPerformed(k_); CqlCode m_ = this.Symptoms_score__HOOS_(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.RetrieveByCodes(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); IEnumerable p_ = Status_1_6_000.isAssessmentPerformed(o_); CqlCode q_ = this.Pain_score__HOOS_(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.RetrieveByCodes(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); IEnumerable t_ = Status_1_6_000.isAssessmentPerformed(s_); IEnumerable> u_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_); (Observation HOOSLifeQuality, Observation HOOSSport, Observation HOOSActivityScore, Observation HOOSSymptoms, Observation HOOSPain)? v_(ValueTuple _valueTuple) @@ -1336,7 +1337,7 @@ private IEnumerable Date_HOOSJr_Total_Assessment_Completed_Value() { CqlCode a_ = this.Total_interval_score__HOOSJR_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation HOOSJr) { DataType h_ = HOOSJr?.Value; @@ -1453,10 +1454,10 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_10_Global_Mental_Health__GMH__score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.PROMIS_10_Global_Physical_Health__GPH__score_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation PROMIS10MentalScore, Observation PROMIS10PhysicalScore)? h_(ValueTuple _valueTuple) { @@ -1607,10 +1608,10 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.VR_12_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? h_(ValueTuple _valueTuple) { @@ -1761,10 +1762,10 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.VR_12_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? h_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs index be0a9c800..2aca0a67d 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -493,7 +494,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -550,12 +551,12 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Online_Assessments(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Finished_Encounter(h_); bool? j_(Encounter ValidEncounter) @@ -628,7 +629,7 @@ public IEnumerable Two_Outpatient_Encounters_during_Measurement_Perio int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); CqlValueSet j_ = this.Heart_Failure(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); bool? l_(Condition HeartFailure) { CqlInterval s_ = QICoreCommon_2_0_000.ToPrevalenceInterval(HeartFailure); @@ -667,7 +668,7 @@ public IEnumerable Two_Outpatient_Encounters_during_Measurement_Perio bool? a_ = Hospice_6_9_000.Has_Hospice_Services(); CqlCode b_ = this.Severe_cognitive_impairment__finding_(); IEnumerable c_ = context.Operators.ToList(b_); - IEnumerable d_ = context.Operators.RetrieveByCodes(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, c_)); bool? e_(Condition Dementia) { CqlInterval i_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Dementia); @@ -691,11 +692,11 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_10_Global_Mental_Health__GMH__score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.PROMIS_10_Global_Physical_Health__GPH__score_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation PROMIS10MentalScore, Observation PROMIS10PhysicalScore)? j_(ValueTuple _valueTuple) @@ -829,31 +830,31 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_29_Sleep_disturbance_score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.PROMIS_29_Satisfaction_with_participation_in_social_roles_score_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); CqlCode i_ = this.PROMIS_29_Physical_function_score_T_score(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); IEnumerable l_ = Status_1_6_000.Final_Survey_Observation(k_); CqlCode m_ = this.PROMIS_29_Pain_interference_score_T_score(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.RetrieveByCodes(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); IEnumerable p_ = Status_1_6_000.Final_Survey_Observation(o_); CqlCode q_ = this.PROMIS_29_Fatigue_score_T_score(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.RetrieveByCodes(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); IEnumerable t_ = Status_1_6_000.Final_Survey_Observation(s_); CqlCode u_ = this.PROMIS_29_Depression_score_T_score(); IEnumerable v_ = context.Operators.ToList(u_); - IEnumerable w_ = context.Operators.RetrieveByCodes(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_)); IEnumerable x_ = Status_1_6_000.Final_Survey_Observation(w_); CqlCode y_ = this.PROMIS_29_Anxiety_score_T_score(); IEnumerable z_ = context.Operators.ToList(y_); - IEnumerable aa_ = context.Operators.RetrieveByCodes(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, default, z_)); IEnumerable ab_ = Status_1_6_000.Final_Survey_Observation(aa_); IEnumerable> ac_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_, x_, ab_); (Observation Promis29Sleep, Observation Promis29SocialRoles, Observation Promis29Physical, Observation Promis29Pain, Observation Promis29Fatigue, Observation Promis29Depression, Observation Promis29Anxiety)? ad_(ValueTuple _valueTuple) @@ -1092,11 +1093,11 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_12_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1230,11 +1231,11 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_12_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1368,11 +1369,11 @@ private IEnumerable Date_VR36_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_36_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_36_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR36MentalAssessment, Observation VR36PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1506,11 +1507,11 @@ private IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_36_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_36_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR36MentalAssessment, Observation VR36PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1644,11 +1645,11 @@ private IEnumerable Date_MLHFQ_Total_Assessment_Completed_Value() { CqlCode a_ = this.Physical_score__MLHFQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Emotional_score__MLHFQ_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation MLHFQPhysical, Observation MLHFQEmotional)? j_(ValueTuple _valueTuple) @@ -1782,11 +1783,11 @@ private IEnumerable Date_KCCQ12_Total_Assessment_Completed_Value() { CqlCode a_ = this.Kansas_City_Cardiomyopathy_Questionnaire___12_item__KCCQ_12_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Overall_summary_score__KCCQ_12_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation KCCQ12Item, Observation KCCQ12Summary)? j_(ValueTuple _valueTuple) @@ -1920,27 +1921,27 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() { CqlCode a_ = this.Quality_of_life_score__KCCQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Symptom_stability_score__KCCQ_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); CqlCode i_ = this.Self_efficacy_score__KCCQ_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); IEnumerable l_ = Status_1_6_000.Final_Survey_Observation(k_); CqlCode m_ = this.Total_symptom_score__KCCQ_(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.RetrieveByCodes(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); IEnumerable p_ = Status_1_6_000.Final_Survey_Observation(o_); CqlCode q_ = this.Physical_limitation_score__KCCQ_(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.RetrieveByCodes(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); IEnumerable t_ = Status_1_6_000.Final_Survey_Observation(s_); CqlCode u_ = this.Social_limitation_score__KCCQ_(); IEnumerable v_ = context.Operators.ToList(u_); - IEnumerable w_ = context.Operators.RetrieveByCodes(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_)); IEnumerable x_ = Status_1_6_000.Final_Survey_Observation(w_); IEnumerable> y_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_, x_); (Observation KCCQLifeQuality, Observation KCCQSymptomStability, Observation KCCQSelfEfficacy, Observation KCCQSymptoms, Observation KCCQPhysicalLimits, Observation KCCQSocialLimits)? z_(ValueTuple _valueTuple) @@ -2158,7 +2159,7 @@ private IEnumerable Date_KCCQ_Total_Assessment_Completed_Value() { CqlCode a_ = this.Overall_summary_score__KCCQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation KCCQSummaryScore) { diff --git a/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs index 9e9283e55..714866be9 100644 --- a/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -301,7 +302,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -358,7 +359,7 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EncounterInpatient) { Period e_ = EncounterInpatient?.Period; @@ -426,7 +427,7 @@ private IEnumerable Encounter_with_Hospital_Dietitian_Referral_Value( { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Hospital_Dietitian_Referral(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Procedure HospitalDietitianReferral)? e_(ValueTuple _valueTuple) { @@ -476,7 +477,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_Value( { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -561,7 +562,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_Not_at { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -643,7 +644,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_at_Ris { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -724,7 +725,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_and_Identifie { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -788,7 +789,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_Status_Modera { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -848,7 +849,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_Not_or_Mildly { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -904,7 +905,7 @@ private IEnumerable Encounter_with_Malnutrition_Diagnosis_Value() { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Diagnosis(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Condition MalnutritionDiagnosis)? e_(ValueTuple _valueTuple) { @@ -943,7 +944,7 @@ private IEnumerable Encounter_with_Nutrition_Care_Plan_Value() { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Care_Plan(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Procedure NutritionCarePlan)? e_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs index 187601461..ef2fb49d9 100644 --- a/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -271,7 +272,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -341,8 +342,8 @@ public Patient Patient() => private bool? Has_Beta_Blocker_Therapy_for_LVSD_Ordered_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_for_LVSD(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest BetaBlockerOrdered) { @@ -384,8 +385,8 @@ public Patient Patient() => private bool? Is_Currently_Taking_Beta_Blocker_Therapy_for_LVSD_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_for_LVSD(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest ActiveBetaBlocker) { @@ -418,7 +419,7 @@ public Patient Patient() => private bool? Has_Consecutive_Heart_Rates_Less_than_50_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); IEnumerable> c_ = context.Operators.CrossJoin(a_, b_); (Observation HeartRate, Encounter ModerateOrSevereLVSDHFOutpatientEncounter)? d_(ValueTuple _valueTuple) @@ -451,7 +452,7 @@ public Patient Patient() => CqlQuantity z_ = context.Operators.Quantity(50m, "/min"); bool? aa_ = context.Operators.Less(y_, z_); bool? ab_ = context.Operators.And(w_, aa_); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable ac_ = context.Operators.Retrieve(default); bool? ad_(Observation MostRecentPriorHeartRate) { Period an_ = tuple_fufpmqdratbglhghdwfuubanf?.ModerateOrSevereLVSDHFOutpatientEncounter?.Period; @@ -504,7 +505,7 @@ Observation h_((Observation HeartRate, Encounter ModerateOrSevereLVSDHFOutpatien private bool? Has_Medical_or_Patient_Reason_for_Not_Ordering_Beta_Blocker_for_LVSD_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_(MedicationRequest NoBetaBlockerOrdered) { IEnumerable g_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -569,7 +570,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Arrhythmia_Diagnosis_Value() { CqlValueSet a_ = this.Arrhythmia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Arrhythmia) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Arrhythmia); @@ -597,7 +598,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Hypotension_Diagnosis_Value() { CqlValueSet a_ = this.Hypotension(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Hypotension) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Hypotension); @@ -625,7 +626,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Asthma_Diagnosis_Value() { CqlValueSet a_ = this.Asthma(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Asthma) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Asthma); @@ -653,9 +654,9 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Diagnosis_of_Allergy_or_Intolerance_to_Beta_Blocker_Therapy_Value() { CqlValueSet a_ = this.Allergy_to_Beta_Blocker_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Intolerance_to_Beta_Blocker_Therapy(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Condition BetaBlockerAllergyOrIntoleranceDiagnosis) { @@ -684,7 +685,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Bradycardia_Diagnosis_Value() { CqlValueSet a_ = this.Bradycardia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Bradycardia) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Bradycardia); @@ -712,10 +713,10 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Allergy_or_Intolerance_to_Beta_Blocker_Therapy_Ingredient_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_Ingredient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlCode c_ = this.Substance_with_beta_adrenergic_receptor_antagonist_mechanism_of_action__substance_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.RetrieveByCodes(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); IEnumerable f_ = context.Operators.Union(b_, e_); bool? g_(AllergyIntolerance BetaBlockerAllergyIntolerance) { @@ -744,7 +745,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Atrioventricular_Block_Diagnosis_Value() { CqlValueSet a_ = this.Atrioventricular_Block(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition AtrioventricularBlock) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(AtrioventricularBlock); @@ -772,7 +773,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Diagnosis_of_Cardiac_Pacer_in_Situ_Value() { CqlValueSet a_ = this.Cardiac_Pacer_in_Situ(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition CardiacPacerDiagnosis) { bool? f_ = AHAOverall_2_6_000.overlapsAfterHeartFailureOutpatientEncounter((CardiacPacerDiagnosis as object)); @@ -800,7 +801,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Cardiac_Pacer_Device_Implanted_Value() { CqlValueSet a_ = this.Cardiac_Pacer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Procedure ImplantedCardiacPacer) { IEnumerable h_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); diff --git a/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs index 428c45893..3a9e695c6 100644 --- a/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -233,7 +234,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -518,7 +519,7 @@ public CqlCode SDE_Sex() => private bool? Has_Active_HIV_Diagnosis_Starts_On_or_Before_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition HIVDx) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(HIVDx); @@ -548,36 +549,36 @@ public CqlCode SDE_Sex() => private bool? Has_Qualifying_Encounter_During_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); IEnumerable af_ = context.Operators.Union(ac_, ae_); bool? ag_(Encounter QualifyingEncounter) { @@ -630,41 +631,41 @@ public CqlCode SDE_Sex() => private IEnumerable Encounter_During_Measurement_Period_With_HIV_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); IEnumerable af_ = context.Operators.Union(ac_, ae_); IEnumerable ag_(Encounter ValidEncounter) { CqlValueSet ai_ = this.HIV(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(Condition HIVDiagnosis) { CqlInterval ao_ = this.Measurement_Period(); @@ -721,7 +722,7 @@ public IEnumerable Encounter_During_Measurement_Period_With_HIV() => private bool? Has_HIV_Viral_Load_Test_During_Measurement_Period_Value() { CqlValueSet a_ = this.HIV_Viral_Load(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation ViralLoadTest) { CqlInterval f_ = this.Measurement_Period(); @@ -748,7 +749,7 @@ public IEnumerable Encounter_During_Measurement_Period_With_HIV() => IEnumerable b_(Encounter EncounterWithHIV) { CqlValueSet e_ = this.HIV_Viral_Load(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Observation ViralLoadTest) { CqlInterval k_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs index c383c216f..1ddbacf34 100644 --- a/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -269,7 +270,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -282,7 +283,7 @@ public Patient Patient() => private bool? Has_Active_HIV_Diagnosis_Before_or_in_First_90_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition HIVDx) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(HIVDx); @@ -308,36 +309,36 @@ public Patient Patient() => private bool? Has_Qualifying_Encounter_During_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); IEnumerable af_ = context.Operators.Union(ac_, ae_); bool? ag_(Encounter QualifyingEncounter) { @@ -434,7 +435,7 @@ public CqlCode SDE_Sex() => private Observation Most_Recent_Viral_Load_Test_During_Measurement_Period_Value() { CqlValueSet a_ = this.HIV_Viral_Load(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation ViralLoad) { object h_() diff --git a/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs b/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs index 5950faf1c..458751556 100644 --- a/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -169,7 +170,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -182,7 +183,7 @@ public Patient Patient() => private bool? Has_Hospice_Services_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter InpatientEncounter) { @@ -211,7 +212,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Hospice_Encounter(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable i_ = Status_1_6_000.isEncounterPerformed(h_); bool? j_(Encounter HospiceEncounter) { @@ -228,7 +229,7 @@ public Patient Patient() => bool? m_ = context.Operators.Or(f_, l_); CqlCode n_ = this.Hospice_care__Minimum_Data_Set_(); IEnumerable o_ = context.Operators.ToList(n_); - IEnumerable p_ = context.Operators.RetrieveByCodes(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_)); IEnumerable q_ = Status_1_6_000.isAssessmentPerformed(p_); bool? r_(Observation HospiceAssessment) { @@ -250,7 +251,7 @@ public Patient Patient() => bool? t_ = context.Operators.Exists(s_); bool? u_ = context.Operators.Or(m_, t_); CqlValueSet v_ = this.Hospice_Care_Ambulatory(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable x_ = Status_1_6_000.isInterventionOrder(w_); bool? y_(ServiceRequest HospiceOrder) { @@ -265,7 +266,7 @@ public Patient Patient() => IEnumerable z_ = context.Operators.Where(x_, y_); bool? aa_ = context.Operators.Exists(z_); bool? ab_ = context.Operators.Or(u_, aa_); - IEnumerable ad_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable ae_ = Status_1_6_000.isInterventionPerformed(ad_); bool? af_(Procedure HospicePerformed) { @@ -281,7 +282,7 @@ public Patient Patient() => bool? ah_ = context.Operators.Exists(ag_); bool? ai_ = context.Operators.Or(ab_, ah_); CqlValueSet aj_ = this.Hospice_Diagnosis(); - IEnumerable ak_ = context.Operators.RetrieveByValueSet(aj_, default); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); bool? al_(Condition HospiceCareDiagnosis) { CqlInterval cj_ = QICoreCommon_2_0_000.prevalenceInterval(HospiceCareDiagnosis); diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs index 0d8262ce7..1d0dbd980 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -193,7 +194,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -206,7 +207,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -244,8 +245,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Opioid_Administration_Value() { CqlValueSet a_ = this.Opioids__All(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration Opioids) { @@ -358,8 +359,8 @@ public IEnumerable Denominator() => private IEnumerable Opioid_Antagonist_Administration_Value() { CqlValueSet a_ = this.Opioid_Antagonist(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration AntagonistGiven) { diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs index ebf49be36..e94bdeff4 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -229,7 +230,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -242,7 +243,7 @@ public Patient Patient() => private IEnumerable Encounter_with_Age_18_and_Older_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -361,7 +362,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -485,7 +486,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -653,7 +654,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -797,7 +798,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs index 3542fed4e..2f55442c8 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -149,7 +150,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -162,7 +163,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -200,8 +201,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Hypoglycemic_Medication_Administration_Value() { CqlValueSet a_ = this.Hypoglycemics_Severe_Hypoglycemia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration HypoMedication) { @@ -286,7 +287,7 @@ private IEnumerable Glucose_Test_with_Result_Less_Than_40_Value() IEnumerable a_ = this.Denominator(); IEnumerable b_ = this.Hypoglycemic_Medication_Administration(); CqlValueSet c_ = this.Glucose_Lab_Test_Mass_Per_Volume(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable> e_ = context.Operators.CrossJoin(a_, b_, d_); (Encounter QualifyingEncounter, MedicationAdministration HypoglycemicMedication, Observation GlucoseTest)? f_(ValueTuple _valueTuple) { @@ -558,7 +559,7 @@ private IEnumerable Low_Glucose_Test_Followed_By_Glucose_Test_Resul IEnumerable a_ = this.Denominator(); IEnumerable b_ = this.Glucose_Test_with_Result_Less_Than_40(); CqlValueSet c_ = this.Glucose_Lab_Test_Mass_Per_Volume(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable> e_ = context.Operators.CrossJoin(a_, b_, d_); (Encounter QualifyingEncounter, Observation LowGlucoseTest, Observation FollowupGlucoseTest)? f_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs index 9c777b94c..0eb46ae10 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -267,7 +268,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -280,13 +281,13 @@ public Patient Patient() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Encounter InpatientEncounter) { CqlValueSet e_ = this.Medicare_FFS_payer(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); CqlValueSet g_ = this.Medicare_Advantage_payer(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Coverage MedicarePayer) { @@ -352,7 +353,7 @@ public IEnumerable Initial_Population() => { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation temperature) { DataType x_ = temperature?.Effective; @@ -466,7 +467,7 @@ object q_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -581,7 +582,7 @@ object q_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation O2Saturation) { object r_() @@ -734,7 +735,7 @@ object o_() bool cc_() { CqlValueSet cf_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable cg_ = context.Operators.RetrieveByValueSet(cf_, default); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); bool? ch_(Observation O2Saturation) { object cp_() @@ -889,7 +890,7 @@ bool ek_() bool cd_() { CqlValueSet fa_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(fa_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); bool? fc_(Observation O2Saturation) { object fk_() @@ -1044,7 +1045,7 @@ bool hf_() bool ce_() { CqlValueSet hv_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable hw_ = context.Operators.RetrieveByValueSet(hv_, default); + IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default)); bool? hx_(Observation O2Saturation) { object if_() @@ -1199,7 +1200,7 @@ bool ka_() if (cc_()) { CqlValueSet kq_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable kr_ = context.Operators.RetrieveByValueSet(kq_, default); + IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default)); bool? ks_(Observation O2Saturation) { object kz_() @@ -1353,7 +1354,7 @@ bool mu_() else if (cd_()) { CqlValueSet nk_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable nl_ = context.Operators.RetrieveByValueSet(nk_, default); + IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default)); bool? nm_(Observation O2Saturation) { object nt_() @@ -1507,7 +1508,7 @@ bool po_() else if (ce_()) { CqlValueSet qe_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qg_(Observation O2Saturation) { object qn_() @@ -1679,7 +1680,7 @@ bool si_() private IEnumerable Blood_Pressure_Reading_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Observation BloodPressure) { Code d_ = BloodPressure?.StatusElement; @@ -1722,7 +1723,7 @@ public IEnumerable Encounter_with_First_Systolic_Blood_Pressure() => Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Bicarbonate_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation BicarbonateLab) { Instant z_ = BicarbonateLab?.IssuedElement; @@ -1770,7 +1771,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation BicarbonateLab) { Instant bd_ = BicarbonateLab?.IssuedElement; @@ -1840,7 +1841,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Creatinine_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation CreatinineLab) { Instant z_ = CreatinineLab?.IssuedElement; @@ -1888,7 +1889,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation CreatinineLab) { Instant bd_ = CreatinineLab?.IssuedElement; @@ -1958,7 +1959,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation HematocritLab) { Instant z_ = HematocritLab?.IssuedElement; @@ -2006,7 +2007,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation HematocritLab) { Instant bd_ = HematocritLab?.IssuedElement; @@ -2076,7 +2077,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Platelet_count_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation PlateletLab) { Instant z_ = PlateletLab?.IssuedElement; @@ -2124,7 +2125,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation PlateletLab) { Instant bd_ = PlateletLab?.IssuedElement; @@ -2194,7 +2195,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Sodium_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation SodiumLab) { Instant z_ = SodiumLab?.IssuedElement; @@ -2242,7 +2243,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation SodiumLab) { Instant bd_ = SodiumLab?.IssuedElement; @@ -2312,7 +2313,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation WhiteBloodCellLab) { Instant z_ = WhiteBloodCellLab?.IssuedElement; @@ -2360,7 +2361,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation WhiteBloodCellLab) { Instant bd_ = WhiteBloodCellLab?.IssuedElement; diff --git a/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs index 66ef8d2d8..4b0e0dd4b 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -283,7 +284,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -296,13 +297,13 @@ public Patient Patient() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Encounter InpatientEncounter) { CqlValueSet e_ = this.Medicare_FFS_payer(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); CqlValueSet g_ = this.Medicare_Advantage_payer(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Coverage MedicarePayer) { @@ -367,7 +368,7 @@ public IEnumerable Initial_Population() => { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation temperature) { DataType x_ = temperature?.Effective; @@ -481,7 +482,7 @@ object q_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -596,7 +597,7 @@ object q_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation O2Saturation) { object r_() @@ -749,7 +750,7 @@ object o_() bool cc_() { CqlValueSet cf_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable cg_ = context.Operators.RetrieveByValueSet(cf_, default); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); bool? ch_(Observation O2Saturation) { object cp_() @@ -904,7 +905,7 @@ bool ek_() bool cd_() { CqlValueSet fa_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(fa_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); bool? fc_(Observation O2Saturation) { object fk_() @@ -1059,7 +1060,7 @@ bool hf_() bool ce_() { CqlValueSet hv_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable hw_ = context.Operators.RetrieveByValueSet(hv_, default); + IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default)); bool? hx_(Observation O2Saturation) { object if_() @@ -1214,7 +1215,7 @@ bool ka_() if (cc_()) { CqlValueSet kq_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable kr_ = context.Operators.RetrieveByValueSet(kq_, default); + IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default)); bool? ks_(Observation O2Saturation) { object kz_() @@ -1368,7 +1369,7 @@ bool mu_() else if (cd_()) { CqlValueSet nk_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable nl_ = context.Operators.RetrieveByValueSet(nk_, default); + IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default)); bool? nm_(Observation O2Saturation) { object nt_() @@ -1522,7 +1523,7 @@ bool po_() else if (ce_()) { CqlValueSet qe_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); bool? qg_(Observation O2Saturation) { object qn_() @@ -1699,7 +1700,7 @@ bool si_() { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation RespRate) { DataType x_ = RespRate?.Effective; @@ -1808,7 +1809,7 @@ object q_(Observation @this) private IEnumerable Blood_Pressure_Reading_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Observation BloodPressure) { Code d_ = BloodPressure?.StatusElement; @@ -1859,7 +1860,7 @@ public IEnumerable Encounter_with_First_Systolic_Blood_Pressure() => Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Bicarbonate_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation bicarbonatelab) { Instant z_ = bicarbonatelab?.IssuedElement; @@ -1907,7 +1908,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation bicarbonatelab) { Instant bd_ = bicarbonatelab?.IssuedElement; @@ -1977,7 +1978,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Creatinine_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation CreatinineLab) { Instant z_ = CreatinineLab?.IssuedElement; @@ -2025,7 +2026,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation CreatinineLab) { Instant bd_ = CreatinineLab?.IssuedElement; @@ -2095,7 +2096,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Glucose_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation GlucoseLab) { Instant z_ = GlucoseLab?.IssuedElement; @@ -2143,7 +2144,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation GlucoseLab) { Instant bd_ = GlucoseLab?.IssuedElement; @@ -2213,7 +2214,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation HematocritLab) { Instant z_ = HematocritLab?.IssuedElement; @@ -2261,7 +2262,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation HematocritLab) { Instant bd_ = HematocritLab?.IssuedElement; @@ -2331,7 +2332,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Potassium_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation PotassiumLab) { Instant z_ = PotassiumLab?.IssuedElement; @@ -2379,7 +2380,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation PotassiumLab) { Instant bd_ = PotassiumLab?.IssuedElement; @@ -2449,7 +2450,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Sodium_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation SodiumLab) { Instant z_ = SodiumLab?.IssuedElement; @@ -2497,7 +2498,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation SodiumLab) { Instant bd_ = SodiumLab?.IssuedElement; @@ -2567,7 +2568,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation WhiteBloodCellLab) { Instant z_ = WhiteBloodCellLab?.IssuedElement; @@ -2615,7 +2616,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation WhiteBloodCellLab) { Instant bd_ = WhiteBloodCellLab?.IssuedElement; @@ -2684,7 +2685,7 @@ object s_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation WeightExam) { DataType x_ = WeightExam?.Effective; diff --git a/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs index c7885ed62..258a7d0a0 100644 --- a/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -365,7 +366,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -418,7 +419,7 @@ public Patient Patient() => private IEnumerable Bladder_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Bladder_Cancer_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition BladderCancer) { CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(BladderCancer); @@ -444,7 +445,7 @@ private Procedure First_Bladder_Cancer_Staging_Procedure_Value() { CqlCode a_ = this.Tumor_staging__tumor_staging_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_(Procedure BladderCancerStaging) { IEnumerable k_ = this.Bladder_Cancer_Diagnosis(); @@ -623,7 +624,7 @@ Procedure b_(ResourceReference StagingReference) { CqlCode a_ = this.Stage_group_pathology_Cancer(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation StagingObservation) { IEnumerable g_ = this.getStagingProcedure(StagingObservation); @@ -676,7 +677,7 @@ Procedure b_(ResourceReference StagingReference) private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter ValidEncounter) { CqlInterval f_ = this.Measurement_Period(); @@ -737,8 +738,8 @@ Procedure b_(ResourceReference StagingReference) private IEnumerable BCG_Not_Available_Within_6_Months_After_Bladder_Cancer_Staging_Value() { CqlValueSet a_ = this.BCG_Bacillus_Calmette_Guerin_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationAdministration BCGNotGiven) { @@ -859,8 +860,8 @@ public IEnumerable BCG_Not_Available_Within_6_Months_A private MedicationAdministration First_BCG_Administered_Value() { CqlValueSet a_ = this.BCG_Bacillus_Calmette_Guerin_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationAdministration BCG) { @@ -1000,7 +1001,7 @@ public CqlCode SDE_Sex() => private IEnumerable Acute_Tuberculosis_Diagnosis_Value() { CqlValueSet a_ = this.Active_Tuberculosis_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition ActiveTuberculosis) { Procedure g_ = this.First_Bladder_Cancer_Staging_Procedure(); @@ -1043,8 +1044,8 @@ public IEnumerable Acute_Tuberculosis_Diagnosis() => private IEnumerable Immunosuppressive_Drugs_Value() { CqlValueSet a_ = this.Immunosuppressive_Drugs_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationRequest ImmunosuppressiveDrugs) { @@ -1084,7 +1085,7 @@ public IEnumerable Immunosuppressive_Drugs() => private IEnumerable Cystectomy_Done_Value() { CqlValueSet a_ = this.Cystectomy_for_Urology_Care(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Procedure Cystectomy) { Procedure g_ = this.First_Bladder_Cancer_Staging_Procedure(); @@ -1145,12 +1146,12 @@ public IEnumerable Cystectomy_Done() => private bool? Has_Excluding__HIV__Immunocompromised_Conditions_or_Mixed_Histology_Before_Staging_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Immunocompromised_Conditions(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Mixed_histology_urothelial_cell_carcinoma_for_Urology_Care(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_(Condition ExclusionDiagnosis) { @@ -1197,8 +1198,8 @@ Condition r_(Procedure FirstBladderCancerStaging) => private bool? Has_Excluding_Chemotherapy_or_Radiotherapy_Procedure_Before_Staging_Value() { CqlValueSet a_ = this.Chemotherapy_Agents_for_Advanced_Cancer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationRequest ExclusionMed) { @@ -1264,7 +1265,7 @@ MedicationRequest w_(Procedure FirstBladderCancerStaging) => IEnumerable i_ = context.Operators.Where(g_, h_); CqlCode j_ = this.Combined_radiotherapy__procedure_(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.RetrieveByCodes(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); IEnumerable m_(Procedure ExclusionProcedure) { Procedure bi_ = this.First_Bladder_Cancer_Staging_Procedure(); diff --git a/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs index efd191248..8a27aa175 100644 --- a/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -331,7 +332,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -344,7 +345,7 @@ public Patient Patient() => private bool? Has_Active_Diabetes_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Diabetes(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Diabetes) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Diabetes); @@ -372,24 +373,24 @@ public Patient Patient() => private bool? Has_Outpatient_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Office_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Outpatient_Consultation(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable t_ = context.Operators.Union(q_, s_); bool? u_(Encounter ValidEncounter) { @@ -453,9 +454,9 @@ public Patient Patient() => private IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Chronic_Kidney_Disease__Stage_5(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.End_Stage_Renal_Disease(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Condition CKDOrESRD) { @@ -499,7 +500,7 @@ public IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measure private bool? Has_Kidney_Panel_Performed_During_Measurement_Period_Value() { CqlValueSet a_ = this.Estimated_Glomerular_Filtration_Rate(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation eGFRTest) { CqlInterval l_ = this.Measurement_Period(); @@ -528,7 +529,7 @@ public IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measure IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Urine_Albumin_Creatinine_Ratio(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation uACRTest) { CqlInterval ab_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs index 2af1f8f56..0fd622506 100644 --- a/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -163,7 +164,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -176,7 +177,7 @@ public Patient Patient() => private IEnumerable Chemotherapy_Within_31_Days_Prior_and_During_Measurement_Period_Value() { CqlValueSet a_ = this.Chemotherapy_Administration(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ChemoAdministration) { @@ -205,11 +206,11 @@ public IEnumerable Chemotherapy_Within_31_Days_Prior_and_During_Measu private IEnumerable Face_to_Face_or_Telehealth_Encounter_with_Ongoing_Chemotherapy_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Finished_Encounter(b_); IEnumerable d_ = this.Chemotherapy_Within_31_Days_Prior_and_During_Measurement_Period(); CqlValueSet f_ = this.Cancer(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable> h_ = context.Operators.CrossJoin(c_, d_, d_, g_); (Encounter FaceToFaceOrTelehealthEncounter, Procedure ChemoBeforeEncounter, Procedure ChemoAfterEncounter, Condition Cancer)? i_(ValueTuple _valueTuple) { @@ -310,12 +311,12 @@ public IEnumerable Denominator_1() => private IEnumerable Radiation_Treatment_Management_During_Measurement_Period_with_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Radiation_Treatment_Management(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Finished_Encounter(b_); IEnumerable d_(Encounter RadiationTreatmentManagement) { CqlValueSet f_ = this.Cancer(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Condition Cancer) { bool? l_ = QICoreCommon_2_0_000.isActive(Cancer); @@ -375,7 +376,7 @@ private IEnumerable Numerator_1_Value() IEnumerable b_(Encounter FaceToFaceOrTelehealthEncounterWithChemo) { CqlValueSet d_ = this.Standardized_Pain_Assessment_Tool(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Observation PainAssessed) { Period j_ = FaceToFaceOrTelehealthEncounterWithChemo?.Period; @@ -418,7 +419,7 @@ private IEnumerable Numerator_2_Value() IEnumerable b_(Encounter RadiationManagementEncounter) { CqlValueSet d_ = this.Standardized_Pain_Assessment_Tool(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Observation PainAssessed) { bool? j_() diff --git a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs index 239e11598..8380e0077 100644 --- a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -149,7 +150,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -196,14 +197,14 @@ public CqlInterval hospitalizationWithEDOBTriageObservation(Encount CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.ED_Visit_and_OB_Triage(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastEDOBTriage) { Period af_ = LastEDOBTriage?.Period; CqlInterval ag_ = FHIRHelpers_4_3_000.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(Encounter LastObs) { Period cg_ = LastObs?.Period; @@ -249,7 +250,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? az_(Encounter LastObs) { Period dg_ = LastObs?.Period; @@ -294,7 +295,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? bo_(Encounter LastObs) { Period eg_ = LastObs?.Period; @@ -362,7 +363,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Period fj_ = LastObs?.Period; @@ -424,7 +425,7 @@ private IEnumerable Delivery_Encounter_with_Age_Range_Value() IEnumerable b_(Encounter EncounterWithAge) { CqlValueSet d_ = this.Delivery_Procedures(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure DeliveryProcedure) { Code j_ = DeliveryProcedure?.StatusElement; @@ -462,7 +463,7 @@ public CqlDateTime lastTimeOfDelivery(Encounter TheEncounter) { CqlCode a_ = this.Date_and_time_of_obstetric_delivery(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation TimeOfDelivery) { DataType k_ = TimeOfDelivery?.Value; @@ -613,7 +614,7 @@ public CqlDateTime lastEstimatedDeliveryDate(Encounter TheEncounter) { CqlCode a_ = this.Delivery_date_Estimated(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation EstimatedDateOfDelivery) { DataType k_ = EstimatedDateOfDelivery?.Value; @@ -798,7 +799,7 @@ bool bc_() public CqlQuantity lastEstimatedGestationalAge(Encounter TheEncounter) { CqlValueSet a_ = this.Estimated_Gestational_Age_at_Delivery(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation EstimatedGestationalAge) { object j_() diff --git a/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs index 4558373d6..e09402c68 100644 --- a/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -379,7 +380,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -392,7 +393,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_to_Screen_for_Blood_Pressure(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter ValidEncounter) { CqlInterval e_ = this.Measurement_Period(); @@ -464,7 +465,7 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable b_(Encounter QualifyingEncounter) { CqlValueSet d_ = this.Diagnosis_of_Hypertension(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Condition Hypertension) { bool? j_ = QICoreCommon_2_0_000.isProblemListItem(Hypertension); @@ -523,7 +524,7 @@ private IEnumerable Encounter_with_Normal_Blood_Pressure_Reading_Valu IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Observation BloodPressure) { DataType ak_ = BloodPressure?.Effective; @@ -661,7 +662,7 @@ private IEnumerable Encounter_with_Elevated_Blood_Pressure_Reading_SB IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Observation BloodPressure) { DataType ak_ = BloodPressure?.Effective; @@ -799,10 +800,10 @@ private IEnumerable Follow_up_with_Rescreen_in_2_to_6_Months_Val { CqlCode a_ = this.Follow_up_2_3_months__finding_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.Follow_up_4_6_months__finding_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable g_ = context.Operators.Union(c_, f_); bool? h_(ServiceRequest FollowUp) { @@ -825,18 +826,18 @@ public IEnumerable Follow_up_with_Rescreen_in_2_to_6_Months() => private IEnumerable NonPharmacological_Interventions_Value() { CqlValueSet a_ = this.Lifestyle_Recommendation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Weight_Reduction_Recommended(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Dietary_Recommendations(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Recommendation_to_Increase_Physical_Activity(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Referral_or_Counseling_for_Alcohol_Consumption(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(ServiceRequest NonPharmaInterventions) { @@ -859,7 +860,7 @@ public IEnumerable NonPharmacological_Interventions() => private IEnumerable Referral_to_Alternate_or_Primary_Healthcare_Professional_for_Hypertensive_Reading_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(ServiceRequest Referral) { List e_ = Referral?.ReasonCode; @@ -969,7 +970,7 @@ private IEnumerable Encounter_with_Hypertensive_Reading_Within_Year_P IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Observation BloodPressure) { DataType bk_ = BloodPressure?.Effective; @@ -1261,7 +1262,7 @@ private IEnumerable Encounter_with_First_Hypertensive_Reading_SBP_Gre IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation BloodPressure) { DataType bm_ = BloodPressure?.Effective; @@ -1473,7 +1474,7 @@ public IEnumerable Encounter_with_First_Hypertensive_Reading_SBP_Grea private IEnumerable First_Hypertensive_Reading_Interventions_or_Referral_to_Alternate_Professional_Value() { CqlValueSet a_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(ServiceRequest FourWeekRescreen) { IEnumerable g_ = this.NonPharmacological_Interventions(); @@ -1550,7 +1551,7 @@ private IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_13 IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Observation BloodPressure) { DataType bs_ = BloodPressure?.Effective; @@ -1810,13 +1811,13 @@ private IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Valu { CqlCode a_ = this._12_lead_EKG_panel(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.EKG_study(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable g_ = context.Operators.Union(c_, f_); CqlValueSet h_ = this.Laboratory_Tests_for_Hypertension(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); bool? k_(ServiceRequest EKGLab) { @@ -1950,7 +1951,7 @@ private IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_Gr IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Observation BloodPressure) { DataType bn_ = BloodPressure?.Effective; @@ -2203,7 +2204,7 @@ public IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_Gre private IEnumerable Second_Hypertensive_Reading_SBP_Greater_than_or_Equal_to_140_OR_DBP_Greater_than_or_Equal_to_90_Interventions_Value() { CqlValueSet a_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(ServiceRequest WeeksRescreen) { IEnumerable i_ = this.Laboratory_Test_or_ECG_for_Hypertension(); @@ -2261,8 +2262,8 @@ ServiceRequest aj_(ServiceRequest HTNInterventions) => IEnumerable g_(ServiceRequest WeeksRescreen) { CqlValueSet ap_ = this.Pharmacologic_Therapy_for_Hypertension(); - IEnumerable aq_ = context.Operators.RetrieveByValueSet(ap_, default); - IEnumerable as_ = context.Operators.RetrieveByValueSet(ap_, default); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); IEnumerable at_ = context.Operators.Union(aq_, as_); bool? au_(MedicationRequest Medications) { @@ -2374,10 +2375,10 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Systolic_blood_pressure(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); CqlCode g_ = this.Diastolic_blood_pressure(); IEnumerable h_ = context.Operators.ToList(g_); - IEnumerable i_ = context.Operators.RetrieveByCodes(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_)); IEnumerable j_ = context.Operators.Union(f_, i_); bool? k_(Observation NoBPScreen) { @@ -2462,27 +2463,27 @@ public IEnumerable Encounter_with_Medical_Reason_for_Not_Obtaining_or private IEnumerable NonPharmacological_Intervention_Not_Ordered_Value() { CqlValueSet a_ = this.Lifestyle_Recommendation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Weight_Reduction_Recommended(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Dietary_Recommendations(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); - IEnumerable o_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Recommendation_to_Increase_Physical_Activity(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); - IEnumerable u_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Referral_or_Counseling_for_Alcohol_Consumption(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); bool? ad_(ServiceRequest NonPharmIntervention) @@ -2531,14 +2532,14 @@ private IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Not_ { CqlCode a_ = this._12_lead_EKG_panel(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); CqlCode d_ = this.EKG_study(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.RetrieveByCodes(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); IEnumerable g_ = context.Operators.Union(c_, f_); CqlValueSet h_ = this.Laboratory_Tests_for_Hypertension(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); - IEnumerable k_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = context.Operators.Union(g_, l_); bool? n_(ServiceRequest LabECGNotDone) @@ -2581,15 +2582,15 @@ public IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Not_O private IEnumerable Second_Hypertensive_Reading_SBP_130_to_139_OR_DBP_80_to_89_Interventions_Declined_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlCode f_ = this.Follow_up_2_3_months__finding_(); IEnumerable g_ = context.Operators.ToList(f_); - IEnumerable h_ = context.Operators.RetrieveByCodes(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_)); CqlCode i_ = this.Follow_up_4_6_months__finding_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); IEnumerable l_ = context.Operators.Union(h_, k_); IEnumerable m_ = context.Operators.Union(e_, l_); bool? n_(ServiceRequest SecondHTNDeclinedReferralAndFollowUp) @@ -2641,12 +2642,12 @@ public IEnumerable Second_Hypertensive_Reading_SBP_130_to_139_OR private IEnumerable Second_Hypertensive_Reading_SBP_Greater_than_or_Equal_to_140_OR_DBP_Greater_than_or_Equal_to_90_Interventions_Declined_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(ServiceRequest SecondHTN140Over90ReferralFollowUpNotDone) @@ -2684,8 +2685,8 @@ object ab_(Extension @this) }; IEnumerable m_ = context.Operators.Where(k_, l_); CqlValueSet n_ = this.Pharmacologic_Therapy_for_Hypertension(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); - IEnumerable q_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable r_ = context.Operators.Union(o_, q_); bool? s_(MedicationRequest MedicationRequestNotOrdered) { @@ -2716,15 +2717,15 @@ private IEnumerable Encounter_with_Order_for_Hypertension_Follow_Up_D IEnumerable b_(Encounter ElevatedBPEncounter) { CqlValueSet x_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); CqlCode ac_ = this.Follow_up_2_3_months__finding_(); IEnumerable ad_ = context.Operators.ToList(ac_); - IEnumerable ae_ = context.Operators.RetrieveByCodes(ad_, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ad_)); CqlCode af_ = this.Follow_up_4_6_months__finding_(); IEnumerable ag_ = context.Operators.ToList(af_); - IEnumerable ah_ = context.Operators.RetrieveByCodes(ag_, default); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ag_)); IEnumerable ai_ = context.Operators.Union(ae_, ah_); IEnumerable aj_ = context.Operators.Union(ab_, ai_); bool? ak_(ServiceRequest ElevatedBPDeclinedInterventions) @@ -2800,12 +2801,12 @@ Encounter bp_(ServiceRequest NotOrdered) => IEnumerable i_(Encounter FirstHTNEncounter) { CqlValueSet bw_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable bx_ = context.Operators.RetrieveByValueSet(bw_, default); - IEnumerable bz_ = context.Operators.RetrieveByValueSet(bw_, default); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); IEnumerable ca_ = context.Operators.Union(bx_, bz_); CqlValueSet cb_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable cc_ = context.Operators.RetrieveByValueSet(cb_, default); - IEnumerable ce_ = context.Operators.RetrieveByValueSet(cb_, default); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default)); + IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default)); IEnumerable cf_ = context.Operators.Union(cc_, ce_); IEnumerable cg_ = context.Operators.Union(ca_, cf_); bool? ch_(ServiceRequest FirstHTNDeclinedInterventions) diff --git a/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs index 40689cedb..fad3edf82 100644 --- a/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -221,7 +222,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -278,18 +279,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Nursing_Facility_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -326,7 +327,7 @@ private IEnumerable Primary_Open_Angle_Glaucoma_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Primary_Open_Angle_Glaucoma(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Condition PrimaryOpenAngleGlaucoma) { CqlInterval j_ = QICoreCommon_2_0_000.prevalenceInterval(PrimaryOpenAngleGlaucoma); @@ -407,8 +408,8 @@ public IEnumerable Primary_Open_Angle_Glaucoma_Encounter() => private IEnumerable Medical_Reason_for_Not_Performing_Cup_to_Disc_Ratio_Value() { CqlValueSet a_ = this.Cup_to_Disc_Ratio(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation CupToDiscExamNotPerformed) { @@ -472,8 +473,8 @@ public IEnumerable Medical_Reason_for_Not_Performing_Cup_to_Disc_Ra private IEnumerable Medical_Reason_for_Not_Performing_Optic_Disc_Exam_Value() { CqlValueSet a_ = this.Optic_Disc_Exam_for_Structural_Abnormalities(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation OpticDiscExamNotPerformed) { @@ -552,7 +553,7 @@ public IEnumerable Medical_Reason_for_Not_Performing_Optic_Disc_Exa private IEnumerable Cup_to_Disc_Ratio_Performed_with_Result_Value() { CqlValueSet a_ = this.Cup_to_Disc_Ratio(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation CupToDiscExamPerformed) { IEnumerable g_ = this.Primary_Open_Angle_Glaucoma_Encounter(); @@ -606,7 +607,7 @@ public IEnumerable Cup_to_Disc_Ratio_Performed_with_Result() => private IEnumerable Optic_Disc_Exam_Performed_with_Result_Value() { CqlValueSet a_ = this.Optic_Disc_Exam_for_Structural_Abnormalities(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation OpticDiscExamPerformed) { IEnumerable g_ = this.Primary_Open_Angle_Glaucoma_Encounter(); diff --git a/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs b/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs index b1a274d8b..91e7b6648 100644 --- a/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -112,7 +113,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -126,7 +127,7 @@ public Patient Patient() => { CqlCode a_ = this.Functional_Assessment_of_Chronic_Illness_Therapy___Palliative_Care_Questionnaire__FACIT_Pal_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = Status_1_6_000.isAssessmentPerformed(c_); bool? e_(Observation PalliativeAssessment) { @@ -141,7 +142,7 @@ public Patient Patient() => IEnumerable f_ = context.Operators.Where(d_, e_); bool? g_ = context.Operators.Exists(f_); CqlValueSet h_ = this.Palliative_Care_Diagnosis(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); bool? j_(Condition PalliativeDiagnosis) { CqlInterval ag_ = QICoreCommon_2_0_000.prevalenceInterval(PalliativeDiagnosis); @@ -154,7 +155,7 @@ public Patient Patient() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.Or(g_, l_); CqlValueSet n_ = this.Palliative_Care_Encounter(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = Status_1_6_000.isEncounterPerformed(o_); bool? q_(Encounter PalliativeEncounter) { @@ -170,7 +171,7 @@ public Patient Patient() => bool? s_ = context.Operators.Exists(r_); bool? t_ = context.Operators.Or(m_, s_); CqlValueSet u_ = this.Palliative_Care_Intervention(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); IEnumerable w_ = Status_1_6_000.isInterventionPerformed(v_); bool? x_(Procedure PalliativeIntervention) { diff --git a/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs index e9fa9b467..d670bcd44 100644 --- a/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -423,7 +424,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -436,8 +437,8 @@ public Patient Patient() => private IEnumerable Qualifying_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Home_Healthcare_Services(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable c_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable c_ = context.Operators.Retrieve(default); bool? d_(Encounter E) { List ar_ = E?.Type; @@ -488,35 +489,35 @@ CqlConcept bc_(CodeableConcept @this) }; IEnumerable i_ = context.Operators.Where(c_, h_); CqlValueSet j_ = this.Occupational_Therapy_Evaluation(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = context.Operators.Union(f_, l_); CqlValueSet n_ = this.Office_Visit(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); CqlValueSet p_ = this.Ophthalmological_Services(); - IEnumerable q_ = context.Operators.RetrieveByValueSet(p_, default); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); IEnumerable r_ = context.Operators.Union(o_, q_); IEnumerable s_ = context.Operators.Union(m_, r_); CqlValueSet t_ = this.Physical_Therapy_Evaluation(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); CqlValueSet v_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); CqlValueSet z_ = this.Psych_Visit_Psychotherapy(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); CqlValueSet ab_ = this.Psychoanalysis(); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(ab_, default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); IEnumerable ad_ = context.Operators.Union(aa_, ac_); IEnumerable ae_ = context.Operators.Union(y_, ad_); CqlValueSet af_ = this.Speech_and_Hearing_Evaluation(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); CqlValueSet ah_ = this.Telephone_Visits(); - IEnumerable ai_ = context.Operators.RetrieveByValueSet(ah_, default); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); IEnumerable aj_ = context.Operators.Union(ag_, ai_); IEnumerable ak_ = context.Operators.Union(ae_, aj_); CqlValueSet al_ = this.Online_Assessments(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = Status_1_6_000.isEncounterPerformed(an_); bool? ap_(Encounter OfficeBasedEncounter) @@ -541,13 +542,13 @@ public IEnumerable Qualifying_Visit_During_Measurement_Period() => private IEnumerable Preventive_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable h_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable h_ = context.Operators.Retrieve(default); bool? i_(Encounter E) { List ac_ = E?.Type; @@ -575,7 +576,7 @@ CqlConcept ad_(CodeableConcept @this) IEnumerable k_ = context.Operators.Union(g_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); bool? p_(Encounter E) { List am_ = E?.Type; @@ -603,9 +604,9 @@ CqlConcept an_(CodeableConcept @this) IEnumerable r_ = context.Operators.Union(n_, q_); IEnumerable s_ = context.Operators.Union(l_, r_); CqlValueSet t_ = this.Nutrition_Services(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); CqlValueSet v_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); IEnumerable z_ = Status_1_6_000.isEncounterPerformed(y_); @@ -668,7 +669,7 @@ public IEnumerable Preventive_Visit_During_Measurement_Period() => private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_User_Value() { CqlValueSet a_ = this.Tobacco_Use_Screening(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation TobaccoUseScreening) { @@ -742,7 +743,7 @@ public Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_User() => private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_Non_User_Value() { CqlValueSet a_ = this.Tobacco_Use_Screening(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation TobaccoUseScreening) { @@ -806,7 +807,7 @@ public Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_Non_User( private IEnumerable Tobacco_Cessation_Counseling_Given_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Counseling(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isInterventionPerformed(b_); bool? d_(Procedure TobaccoCessationCounseling) { @@ -826,7 +827,7 @@ private IEnumerable Tobacco_Cessation_Counseling_Given_Value() IEnumerable e_ = context.Operators.Where(c_, d_); CqlCode f_ = this.Tobacco_abuse_counseling(); IEnumerable g_ = context.Operators.ToList(f_); - IEnumerable h_ = context.Operators.RetrieveByCodes(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_)); bool? i_(Condition TobaccoCounseling) { CqlInterval w_ = QICoreCommon_2_0_000.prevalenceInterval(TobaccoCounseling); @@ -854,8 +855,8 @@ public IEnumerable Tobacco_Cessation_Counseling_Given() => private IEnumerable Tobacco_Cessation_Pharmacotherapy_Ordered_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Pharmacotherapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationOrder(e_); bool? g_(MedicationRequest CessationPharmacotherapyOrdered) @@ -884,8 +885,8 @@ public IEnumerable Tobacco_Cessation_Pharmacotherapy_Ordered( private IEnumerable Active_Pharmacotherapy_for_Tobacco_Cessation_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Pharmacotherapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationActive(e_); bool? g_(MedicationRequest TakingCessationPharmacotherapy) diff --git a/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs b/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs index 9cc8424c3..fea9da922 100644 --- a/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs +++ b/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -147,7 +148,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -160,7 +161,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Clinical_Oral_Evaluation(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter ValidEncounter) { @@ -228,7 +229,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Fluoride_Varnish_Application_for_Children(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure FluorideApplication) { diff --git a/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs index aac170bb5..c341d112b 100644 --- a/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -251,7 +252,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -308,7 +309,7 @@ public CqlCode SDE_Sex() => private IEnumerable Prostate_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Prostate_Cancer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ProstateCancer) { CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(ProstateCancer); @@ -335,7 +336,7 @@ public IEnumerable Prostate_Cancer_Diagnosis() => private bool? Has_Diagnosis_of_Pain_related_to_Prostate_Cancer_Value() { CqlValueSet a_ = this.Pain_Warranting_Further_Investigation_for_Prostate_Cancer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition ProstateCancerPain) { IEnumerable f_ = this.Prostate_Cancer_Diagnosis(); @@ -375,7 +376,7 @@ Condition i_(Condition ActiveProstateCancer) => private bool? Has_Salvage_Therapy_Performed_after_Prostate_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Salvage_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Procedure SalvageTherapy) { IEnumerable f_ = this.Prostate_Cancer_Diagnosis(); @@ -416,7 +417,7 @@ Procedure i_(Condition ActiveProstateCancer) => private IEnumerable Bone_Scan_Study_Performed_Value() { CqlValueSet a_ = this.Bone_Scan(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation BoneScan) { IEnumerable e_ = this.Prostate_Cancer_Diagnosis(); @@ -489,7 +490,7 @@ public IEnumerable Bone_Scan_Study_Performed() => private Procedure First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period_Value() { CqlValueSet a_ = this.Prostate_Cancer_Treatment(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure ProstateCancerTreatment) { DataType h_ = ProstateCancerTreatment?.Performed; @@ -542,7 +543,7 @@ public Procedure First_Prostate_Cancer_Treatment_during_day_of_Measurement_Perio { CqlCode a_ = this.Gleason_score_in_Specimen_Qualitative(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_(Observation GleasonScore) { Procedure m_ = this.First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period(); @@ -618,7 +619,7 @@ private Observation Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a_Va { CqlCode a_ = this.Tumor_staging__tumor_staging_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_(Observation ProstateCancerStaging) { Procedure m_ = this.First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period(); @@ -723,7 +724,7 @@ public Observation Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a() = private bool? Most_Recent_PSA_Test_Result_is_Low_Value() { CqlValueSet a_ = this.Prostate_Specific_Antigen_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation PSATest) { Observation l_ = this.Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a(); diff --git a/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs b/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs index def15c262..bebf3ba89 100644 --- a/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -829,7 +830,7 @@ public CqlCode[] USCoreConditionCategoryExtensionCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs index c23060191..c071d2856 100644 --- a/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -669,7 +670,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -867,7 +868,7 @@ object v_(Extension @this) IEnumerable f_ = context.Operators.Where((IEnumerable)d_, e_); bool? g_ = context.Operators.Exists(f_); CqlValueSet h_ = this.Severe_Maternal_Morbidity_Procedures(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); bool? j_(Procedure EncounterSMMProcedures) { Code ah_ = EncounterSMMProcedures?.StatusElement; @@ -927,7 +928,7 @@ private IEnumerable Delivery_Encounters_with_Blood_Transfusion_Value( IEnumerable b_(Encounter TwentyWeeksPlusEncounter) { CqlValueSet d_ = this.Blood_Transfusion(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Procedure BloodTransfusion) { Code j_ = BloodTransfusion?.StatusElement; @@ -1015,7 +1016,7 @@ private IEnumerable Delivery_Encounters_with_COVID_and_Respiratory_Co IEnumerable j_ = context.Operators.Where(d_, i_); bool? k_ = context.Operators.Exists(j_); CqlValueSet l_ = this.Respiratory_Support_Procedures_Related_to_COVID_19(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); bool? n_(Procedure COVIDRespiratoryProcedure) { Code aa_ = COVIDRespiratoryProcedure?.StatusElement; @@ -1777,7 +1778,7 @@ public IEnumerable Risk_Variable_Preterm_Birth() => Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation Hematocrit) { Instant z_ = Hematocrit?.IssuedElement; @@ -1821,7 +1822,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation Hematocrit) { Instant ax_ = Hematocrit?.IssuedElement; @@ -1887,7 +1888,7 @@ object s_(Observation @this) Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation WBC) { Instant z_ = WBC?.IssuedElement; @@ -1931,7 +1932,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? q_(Observation WBC) { Instant ax_ = WBC?.IssuedElement; @@ -1996,7 +1997,7 @@ object s_(Observation @this) { Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -2094,7 +2095,7 @@ object q_(Observation @this) { Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Observation BP) { DataType aa_ = BP?.Effective; diff --git a/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs b/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs index b549077e4..80866e18d 100644 --- a/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -117,7 +118,7 @@ public CqlCode[] ConditionClinicalStatusCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs b/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs index 616a1c068..0a7038155 100644 --- a/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs +++ b/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -87,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -224,7 +225,7 @@ DataType ag_(Extension @this) private IEnumerable<(CqlConcept code, CqlInterval period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer_Type(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); (CqlConcept code, CqlInterval period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs b/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs index d65c5d6a2..440c8f4ef 100644 --- a/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs +++ b/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -162,7 +163,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -175,7 +176,7 @@ public Patient Patient() => private IEnumerable Non_Elective_Inpatient_Encounter_Value() { CqlValueSet a_ = this.Nonelective_Inpatient_Encounter(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter NonElectiveEncounter) { Period e_ = NonElectiveEncounter?.Period; @@ -316,7 +317,7 @@ public IEnumerable Ischemic_Stroke_Encounters_with_Discharge_Disposit private IEnumerable Intervention_Comfort_Measures_Value() { CqlValueSet a_ = this.Comfort_Measures(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(ServiceRequest SR) { Code j_ = SR?.StatusElement; @@ -351,7 +352,7 @@ private IEnumerable Intervention_Comfort_Measures_Value() return aa_; }; IEnumerable d_ = context.Operators.Where(b_, c_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? g_(Procedure InterventionPerformed) { Code ab_ = InterventionPerformed?.StatusElement; diff --git a/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs index b5b8fd54b..87e1a6ebb 100644 --- a/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -263,7 +264,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -291,7 +292,7 @@ public Patient Patient() => private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter ValidEncounter) { CqlInterval f_ = this.Measurement_Period(); @@ -366,7 +367,7 @@ private Condition Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_S { CqlCode a_ = this.Benign_prostatic_hyperplasia_with_lower_urinary_tract_symptoms(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Condition NewBPHDiagnosis) { CqlInterval i_ = QICoreCommon_2_0_000.prevalenceInterval(NewBPHDiagnosis); @@ -419,7 +420,7 @@ public Condition Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_St { CqlCode a_ = this.International_Prostate_Symptom_Score__IPSS_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation IPSSAssessment) { Code h_ = IPSSAssessment?.StatusElement; @@ -514,7 +515,7 @@ bool y_() { CqlCode a_ = this.American_Urological_Association_Symptom_Index__AUASI_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation AUASIAssessment) { List h_ = AUASIAssessment?.Category; @@ -613,7 +614,7 @@ bool au_() object af_ = FHIRHelpers_4_3_000.ToValue(ae_); CqlCode ag_ = this.If_you_were_to_spend_the_rest_of_your_life_with_your_urinary_condition_just_the_way_it_is_now__how_would_you_feel_about_that__IPSS_(); IEnumerable ah_ = context.Operators.ToList(ag_); - IEnumerable ai_ = context.Operators.RetrieveByCodes(ah_, default); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_)); bool? aj_(Observation QOLAssessment) { object bk_() @@ -978,7 +979,7 @@ object d_((CqlDateTime effectiveDatetime, int? valueInteger)? @this) private IEnumerable Urinary_Retention_Diagnosis_Starts_Within_1_Year_After_Initial_BPH_Diagnosis_Value() { CqlValueSet a_ = this.Urinary_retention(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition UrinaryRetention) { Condition g_ = this.Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_Start_of_Measurement_Period(); @@ -1034,7 +1035,7 @@ private Condition Initial_BPH_Diagnosis_Starts_During_or_Within_30_Days_After_En IEnumerable c_(Condition InitialBPHDiagnosis) { CqlValueSet f_ = this.Hospital_Services_for_urology_care(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Encounter InHospitalServices) { CqlInterval l_ = QICoreCommon_2_0_000.prevalenceInterval(InitialBPHDiagnosis); @@ -1076,7 +1077,7 @@ public Condition Initial_BPH_Diagnosis_Starts_During_or_Within_30_Days_After_End private IEnumerable Morbid_Obesity_Diagnosis_On_or_Before_Follow_Up_USS_Assessment_Value() { CqlValueSet a_ = this.Morbid_Obesity(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Condition MorbidObesity) { (CqlDateTime effectiveDatetime, int? valueInteger)? e_ = this.Urinary_Symptom_Score_6_to_12_Months_After_Initial_BPH_Diagnosis(); @@ -1115,7 +1116,7 @@ public IEnumerable Morbid_Obesity_Diagnosis_On_or_Before_Follow_Up_US private bool? Has_BMI_Exam_Result_Greater_Than_or_Equal_To_40_During_Measurement_Period_and_On_or_Before_Follow_Up_USS_Assessment_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_(Observation BMIExam) { (CqlDateTime effectiveDatetime, int? valueInteger)? g_ = this.Urinary_Symptom_Score_6_to_12_Months_After_Initial_BPH_Diagnosis(); diff --git a/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs index f7b617bef..8b854d42f 100644 --- a/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -723,7 +724,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -736,37 +737,37 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Ophthalmologic_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Discharge_Services_Nursing_Facility(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Annual_Wellness_Visit(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Home_Healthcare_Services(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Online_Assessments(); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ad_, default); - IEnumerable af_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable af_ = context.Operators.Retrieve(default); bool? ag_(Encounter E) { List am_ = E?.Type; @@ -938,96 +939,96 @@ MedicationRequest d_(MedicationRequest OrderMedication1) => private IEnumerable Same_High_Risk_Medications_Ordered_on_Different_Days_Value() { CqlValueSet a_ = this.Anticholinergics__first_generation_antihistamines(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); CqlValueSet g_ = this.Anticholinergics__anti_Parkinson_agents(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); - IEnumerable j_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = this.More_Than_One_Order(k_); IEnumerable m_ = context.Operators.Union(f_, l_); CqlValueSet n_ = this.Antispasmodics(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); - IEnumerable q_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable r_ = context.Operators.Union(o_, q_); IEnumerable s_ = this.More_Than_One_Order(r_); CqlValueSet t_ = this.Antithrombotic(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); - IEnumerable w_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = this.More_Than_One_Order(x_); IEnumerable z_ = context.Operators.Union(s_, y_); IEnumerable aa_ = context.Operators.Union(m_, z_); CqlValueSet ab_ = this.Cardiovascular__alpha_agonists__central(); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(ab_, default); - IEnumerable ae_ = context.Operators.RetrieveByValueSet(ab_, default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); IEnumerable af_ = context.Operators.Union(ac_, ae_); IEnumerable ag_ = this.More_Than_One_Order(af_); CqlValueSet ah_ = this.Cardiovascular__other(); - IEnumerable ai_ = context.Operators.RetrieveByValueSet(ah_, default); - IEnumerable ak_ = context.Operators.RetrieveByValueSet(ah_, default); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); IEnumerable al_ = context.Operators.Union(ai_, ak_); IEnumerable am_ = this.More_Than_One_Order(al_); IEnumerable an_ = context.Operators.Union(ag_, am_); IEnumerable ao_ = context.Operators.Union(aa_, an_); CqlValueSet ap_ = this.Central_nervous_system__antidepressants(); - IEnumerable aq_ = context.Operators.RetrieveByValueSet(ap_, default); - IEnumerable as_ = context.Operators.RetrieveByValueSet(ap_, default); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); IEnumerable at_ = context.Operators.Union(aq_, as_); IEnumerable au_ = this.More_Than_One_Order(at_); CqlValueSet av_ = this.Central_nervous_system__barbiturates(); - IEnumerable aw_ = context.Operators.RetrieveByValueSet(av_, default); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(av_, default); + IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); IEnumerable az_ = context.Operators.Union(aw_, ay_); IEnumerable ba_ = this.More_Than_One_Order(az_); IEnumerable bb_ = context.Operators.Union(au_, ba_); IEnumerable bc_ = context.Operators.Union(ao_, bb_); CqlValueSet bd_ = this.Central_nervous_system__vasodilators(); - IEnumerable be_ = context.Operators.RetrieveByValueSet(bd_, default); - IEnumerable bg_ = context.Operators.RetrieveByValueSet(bd_, default); + IEnumerable be_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default)); + IEnumerable bg_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default)); IEnumerable bh_ = context.Operators.Union(be_, bg_); IEnumerable bi_ = this.More_Than_One_Order(bh_); CqlValueSet bj_ = this.Central_nervous_system__other(); - IEnumerable bk_ = context.Operators.RetrieveByValueSet(bj_, default); - IEnumerable bm_ = context.Operators.RetrieveByValueSet(bj_, default); + IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default)); + IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default)); IEnumerable bn_ = context.Operators.Union(bk_, bm_); IEnumerable bo_ = this.More_Than_One_Order(bn_); IEnumerable bp_ = context.Operators.Union(bi_, bo_); IEnumerable bq_ = context.Operators.Union(bc_, bp_); CqlValueSet br_ = this.Endocrine_system__estrogens_with_or_without_progestins(); - IEnumerable bs_ = context.Operators.RetrieveByValueSet(br_, default); - IEnumerable bu_ = context.Operators.RetrieveByValueSet(br_, default); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default)); + IEnumerable bu_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default)); IEnumerable bv_ = context.Operators.Union(bs_, bu_); IEnumerable bw_ = this.More_Than_One_Order(bv_); CqlValueSet bx_ = this.Endocrine_system__sulfonylureas__long_duration(); - IEnumerable by_ = context.Operators.RetrieveByValueSet(bx_, default); - IEnumerable ca_ = context.Operators.RetrieveByValueSet(bx_, default); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); + IEnumerable ca_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); IEnumerable cb_ = context.Operators.Union(by_, ca_); IEnumerable cc_ = this.More_Than_One_Order(cb_); IEnumerable cd_ = context.Operators.Union(bw_, cc_); IEnumerable ce_ = context.Operators.Union(bq_, cd_); CqlValueSet cf_ = this.Endocrine_system__other(); - IEnumerable cg_ = context.Operators.RetrieveByValueSet(cf_, default); - IEnumerable ci_ = context.Operators.RetrieveByValueSet(cf_, default); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); + IEnumerable ci_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); IEnumerable cj_ = context.Operators.Union(cg_, ci_); IEnumerable ck_ = this.More_Than_One_Order(cj_); CqlValueSet cl_ = this.Nonbenzodiazepine_hypnotics(); - IEnumerable cm_ = context.Operators.RetrieveByValueSet(cl_, default); - IEnumerable co_ = context.Operators.RetrieveByValueSet(cl_, default); + IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); + IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); IEnumerable cp_ = context.Operators.Union(cm_, co_); IEnumerable cq_ = this.More_Than_One_Order(cp_); IEnumerable cr_ = context.Operators.Union(ck_, cq_); IEnumerable cs_ = context.Operators.Union(ce_, cr_); CqlValueSet ct_ = this.Pain_medications__skeletal_muscle_relaxants(); - IEnumerable cu_ = context.Operators.RetrieveByValueSet(ct_, default); - IEnumerable cw_ = context.Operators.RetrieveByValueSet(ct_, default); + IEnumerable cu_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default)); + IEnumerable cw_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default)); IEnumerable cx_ = context.Operators.Union(cu_, cw_); IEnumerable cy_ = this.More_Than_One_Order(cx_); CqlValueSet cz_ = this.Pain_medications__other(); - IEnumerable da_ = context.Operators.RetrieveByValueSet(cz_, default); - IEnumerable dc_ = context.Operators.RetrieveByValueSet(cz_, default); + IEnumerable da_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default)); + IEnumerable dc_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default)); IEnumerable dd_ = context.Operators.Union(da_, dc_); IEnumerable de_ = this.More_Than_One_Order(dd_); IEnumerable df_ = context.Operators.Union(cy_, de_); @@ -1118,8 +1119,8 @@ public IEnumerable Same_High_Risk_Medications_Ordered_on_Diff private bool? Two_High_Risk_Medications_with_Prolonged_Duration_Value() { CqlValueSet a_ = this.Anti_Infectives__other(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); decimal? g_(MedicationRequest AntiInfectives) @@ -1468,8 +1469,8 @@ bool f_() private bool? High_Risk_Medications_with_Average_Daily_Dose_Criteria_Value() { CqlValueSet a_ = this.Reserpine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest ReserpineOrdered) { @@ -1483,8 +1484,8 @@ bool f_() IEnumerable h_ = this.More_Than_One_Order(g_); bool? i_ = context.Operators.Exists(h_); CqlValueSet j_ = this.Digoxin(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); - IEnumerable m_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(MedicationRequest DigoxinOrdered) { @@ -1499,8 +1500,8 @@ bool f_() bool? r_ = context.Operators.Exists(q_); bool? s_ = context.Operators.Or(i_, r_); CqlValueSet t_ = this.Doxepin(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); - IEnumerable w_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable x_ = context.Operators.Union(u_, w_); bool? y_(MedicationRequest DoxepinOrdered) { @@ -1541,8 +1542,8 @@ bool f_() private bool? More_than_One_Antipsychotic_Order_Value() { CqlValueSet a_ = this.Antipsychotic(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); bool? g_ = context.Operators.Exists(f_); @@ -1557,8 +1558,8 @@ bool f_() private CqlDateTime Antipsychotic_Index_Prescription_Start_Date_Value() { CqlValueSet a_ = this.Antipsychotic(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest AntipsychoticMedication) @@ -1592,8 +1593,8 @@ public CqlDateTime Antipsychotic_Index_Prescription_Start_Date() => private bool? More_than_One_Benzodiazepine_Order_Value() { CqlValueSet a_ = this.Benzodiazepine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); bool? g_ = context.Operators.Exists(f_); @@ -1608,8 +1609,8 @@ public CqlDateTime Antipsychotic_Index_Prescription_Start_Date() => private CqlDateTime Benzodiazepine_Index_Prescription_Start_Date_Value() { CqlValueSet a_ = this.Benzodiazepine(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest BenzodiazepineMedication) @@ -1644,9 +1645,9 @@ public CqlDateTime Benzodiazepine_Index_Prescription_Start_Date() => { bool? a_ = this.More_than_One_Antipsychotic_Order(); CqlValueSet b_ = this.Schizophrenia(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); CqlValueSet d_ = this.Bipolar_Disorder(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = context.Operators.Union(c_, e_); bool? g_(Condition AntipsychoticTreatedDiagnoses) { @@ -1667,18 +1668,18 @@ public CqlDateTime Benzodiazepine_Index_Prescription_Start_Date() => bool? k_ = context.Operators.And(a_, j_); bool? l_ = this.More_than_One_Benzodiazepine_Order(); CqlValueSet m_ = this.Seizure_Disorder(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); CqlValueSet o_ = this.REM_Sleep_Behavior_Disorder(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); IEnumerable q_ = context.Operators.Union(n_, p_); CqlValueSet r_ = this.Benzodiazepine_Withdrawal(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Alcohol_Withdrawal(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Generalized_Anxiety_Disorder(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable z_ = context.Operators.Union(w_, y_); bool? aa_(Condition BenzodiazepineTreatedDiagnoses) { diff --git a/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs b/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs index b9409478d..9df86a6bc 100644 --- a/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -90,7 +91,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs index 33ad8a6fb..a4314fae9 100644 --- a/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -419,7 +420,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -476,24 +477,24 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services___Group_Counseling(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Home_Healthcare_Services(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.Finished_Encounter(t_); bool? v_(Encounter ValidEncounters) @@ -552,7 +553,7 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Pregnancy_Diagnosis_Which_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Pregnancy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition Pregnancy) { @@ -587,7 +588,7 @@ public IEnumerable Pregnancy_Diagnosis_Which_Overlaps_Measurement_Per private IEnumerable BMI_Percentile_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_ = Status_1_6_000.BMI(a_); bool? c_(Observation BMIPercentile) { @@ -614,7 +615,7 @@ public IEnumerable BMI_Percentile_in_Measurement_Period() => private IEnumerable Height_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_ = Status_1_6_000.BodyHeight(a_); bool? c_(Observation Height) { @@ -641,7 +642,7 @@ public IEnumerable Height_in_Measurement_Period() => private IEnumerable Weight_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); IEnumerable b_ = Status_1_6_000.BodyWeight(a_); bool? c_(Observation Weight) { @@ -687,7 +688,7 @@ public IEnumerable Weight_in_Measurement_Period() => private bool? Numerator_2_Value() { CqlValueSet a_ = this.Counseling_for_Nutrition(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure NutritionCounseling) { @@ -712,7 +713,7 @@ public IEnumerable Weight_in_Measurement_Period() => private bool? Numerator_3_Value() { CqlValueSet a_ = this.Counseling_for_Physical_Activity(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ActivityCounseling) { diff --git a/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs b/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs index 2de09dc3c..f80f11d72 100644 --- a/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs +++ b/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -106,7 +107,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -119,18 +120,18 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter ValidEncounter) { diff --git a/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs b/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs index 3cb0b13fc..f51d0221a 100644 --- a/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs +++ b/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -210,7 +211,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -223,8 +224,8 @@ public Patient Patient() => private IEnumerable Dementia_Medications_In_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest DementiaMed) { @@ -259,9 +260,9 @@ public IEnumerable Dementia_Medications_In_Year_Before_or_Dur private IEnumerable> Long_Term_Care_Periods_During_Measurement_Period_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Nursing_Facility_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter LongTermFacilityEncounter) { @@ -298,14 +299,14 @@ public IEnumerable> Long_Term_Care_Periods_During_Measu private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Emergency_Department_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Nonacute_Inpatient(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(Encounter Outpatient) @@ -320,7 +321,7 @@ private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value IEnumerable n_(Encounter OutpatientEncounter) { CqlValueSet s_ = this.Advanced_Illness(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); bool? u_(Condition AdvancedIllnessDiagnosis) { IEnumerable y_ = MATGlobalCommonFunctionsFHIR4_6_1_000.EncounterDiagnosis(OutpatientEncounter); @@ -477,7 +478,7 @@ public IEnumerable> Long_Term_Care_Adjacent_Periods() = private IEnumerable Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter AcuteInpatient) { Code g_ = AcuteInpatient?.StatusElement; @@ -490,7 +491,7 @@ private IEnumerable Inpatient_Encounter_with_Advanced_Illness_Value() IEnumerable e_(Encounter InpatientEncounter) { CqlValueSet j_ = this.Advanced_Illness(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); bool? l_(Condition AdvancedIllnessDiagnosis) { IEnumerable p_ = MATGlobalCommonFunctionsFHIR4_6_1_000.EncounterDiagnosis(InpatientEncounter); @@ -531,8 +532,8 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(DeviceRequest FrailtyDeviceOrder) { @@ -558,7 +559,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => }; IEnumerable g_ = context.Operators.Where(e_, f_); bool? h_ = context.Operators.Exists(g_); - IEnumerable j_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? k_(Observation FrailtyDeviceApplied) { Code at_ = FrailtyDeviceApplied?.StatusElement; @@ -581,7 +582,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? m_ = context.Operators.Exists(l_); bool? n_ = context.Operators.Or(h_, m_); CqlValueSet o_ = this.Frailty_Diagnosis(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Condition FrailtyDiagnosis) { CqlInterval bc_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(FrailtyDiagnosis); @@ -594,7 +595,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? s_ = context.Operators.Exists(r_); bool? t_ = context.Operators.Or(n_, s_); CqlValueSet u_ = this.Frailty_Encounter(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); bool? w_(Encounter FrailtyEncounter) { Code bf_ = FrailtyEncounter?.StatusElement; @@ -612,7 +613,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? y_ = context.Operators.Exists(x_); bool? z_ = context.Operators.Or(t_, y_); CqlValueSet aa_ = this.Frailty_Symptom(); - IEnumerable ab_ = context.Operators.RetrieveByValueSet(aa_, default); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); bool? ac_(Observation FrailtySymptom) { Code bn_ = FrailtySymptom?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs index 35e6c8754..f3869e9f7 100644 --- a/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -244,7 +245,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -286,7 +287,7 @@ public CqlInterval Participation_Period() => private IEnumerable Member_Coverage_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Coverage C) { Period d_ = C?.Period; @@ -389,7 +390,7 @@ public IEnumerable Member_Coverage() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Absence_of_Right_Breast(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition RightMastectomyDiagnosis) { @@ -413,10 +414,10 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -436,7 +437,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -478,7 +479,7 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Absence_of_Left_Breast(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition LeftMastectomyDiagnosis) { @@ -502,10 +503,10 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -525,7 +526,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -567,7 +568,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition BilateralMastectomyHistory) { @@ -591,10 +592,10 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -614,7 +615,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -701,7 +702,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Numerator_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Mammogram) { DataType f_ = Mammogram?.Effective; diff --git a/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs b/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs index 16dd74cd3..02f1871e2 100644 --- a/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -231,7 +232,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -288,9 +289,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -375,9 +376,9 @@ public IEnumerable Telehealth_Services() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Right_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -417,7 +418,7 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure UnilateralMastectomyRightPerformed) { Code e_ = UnilateralMastectomyRightPerformed?.StatusElement; @@ -445,9 +446,9 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Left_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -487,7 +488,7 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure UnilateralMastectomyLeftPerformed) { Code e_ = UnilateralMastectomyLeftPerformed?.StatusElement; @@ -515,7 +516,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_bilateral_mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition BilateralMastectomyHistory) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(BilateralMastectomyHistory); @@ -538,7 +539,7 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure BilateralMastectomyPerformed) { Code e_ = BilateralMastectomyPerformed?.StatusElement; @@ -611,7 +612,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -653,7 +654,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -726,7 +727,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -769,7 +770,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs b/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs index e6a64ba3a..ab8608f76 100644 --- a/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs +++ b/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -215,7 +216,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -272,20 +273,20 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Telephone_Visits(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter ValidEncounter) @@ -351,7 +352,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Absence_of_Cervix_Value() { CqlValueSet a_ = this.Hysterectomy_with_No_Residual_Cervix(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure NoCervixProcedure) { Code j_ = NoCervixProcedure?.StatusElement; @@ -369,7 +370,7 @@ private IEnumerable Absence_of_Cervix_Value() }; IEnumerable d_ = context.Operators.Where(b_, c_); CqlValueSet e_ = this.Congenital_or_Acquired_Absence_of_Cervix(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Condition NoCervixDiagnosis) { CqlInterval t_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(NoCervixDiagnosis); @@ -409,7 +410,7 @@ public IEnumerable Absence_of_Cervix() => private IEnumerable Cervical_Cytology_Within_3_Years_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation CervicalCytology) { Code e_ = CervicalCytology?.StatusElement; @@ -464,7 +465,7 @@ public IEnumerable Cervical_Cytology_Within_3_Years() => private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older_Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation HPVTest) { Code e_ = HPVTest?.StatusElement; @@ -586,7 +587,7 @@ public CqlDateTime latest(object choice) private IEnumerable Cervical_Cytology_Within_3_Years__2__Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation CervicalCytology) { bool? e_ = this.isComplete(CervicalCytology); @@ -631,7 +632,7 @@ public CqlInterval toInterval(object choice) private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older__2__Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation HPVTest) { bool? e_ = this.isComplete(HPVTest); diff --git a/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs b/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs index d3ab00385..1037ad5e3 100644 --- a/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -469,7 +470,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -526,9 +527,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -609,7 +610,7 @@ public IEnumerable Telehealth_Services() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ColorectalCancer) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColorectalCancer); @@ -632,7 +633,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colectomy) { Code e_ = Colectomy?.StatusElement; @@ -660,7 +661,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Total_Colectomy_Condition_Value() { CqlValueSet a_ = this.Total_Colectomy_ICD9(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ColectomyDx) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColectomyDx); @@ -719,7 +720,7 @@ public IEnumerable Total_Colectomy_Condition() => private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Occult_Blood_Test_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { DataType g_ = FecalOccult?.Effective; @@ -820,7 +821,7 @@ string ak_(Code @this) private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -898,7 +899,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -976,7 +977,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffs private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { List e_ = FecalOccult?.Category; @@ -1046,7 +1047,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -1081,7 +1082,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Immunochemical_Test_DNA_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { DataType g_ = FitDNA?.Effective; @@ -1185,7 +1186,7 @@ string ao_(Code @this) private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1271,7 +1272,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed() => private IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1357,7 +1358,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { List e_ = FitDNA?.Category; @@ -1435,7 +1436,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1478,7 +1479,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable CT_Colonography_Display_Date_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { DataType g_ = Colonography?.Effective; @@ -1517,7 +1518,7 @@ public IEnumerable CT_Colonography_Display_Date() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1558,7 +1559,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable CT_Colonography_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1600,7 +1601,7 @@ public IEnumerable CT_Colonography_Performed_without_appropriate_st private IEnumerable Flexible_Sigmoidoscopy_Display_Date_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { DataType g_ = FlexibleSigmoidoscopy?.Performed; @@ -1639,7 +1640,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Display_Date() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1674,7 +1675,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1710,7 +1711,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropria private IEnumerable Colonoscopy_Display_Date_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { DataType g_ = Colonoscopy?.Performed; @@ -1749,7 +1750,7 @@ public IEnumerable Colonoscopy_Display_Date() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; @@ -1784,7 +1785,7 @@ public IEnumerable Colonoscopy_Performed() => private IEnumerable Colonoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs b/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs index 43c306421..ebc973288 100644 --- a/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs +++ b/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -340,7 +341,7 @@ public string ErrorLevel() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs b/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs index 56568a208..d99a825ac 100644 --- a/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs +++ b/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -300,7 +301,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -357,18 +358,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -398,7 +399,7 @@ private IEnumerable Diabetic_Retinopathy_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Diabetic_Retinopathy(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); bool? f_(Condition DiabeticRetinopathy) { CodeableConcept j_ = DiabeticRetinopathy?.ClinicalStatus; @@ -463,9 +464,9 @@ public Extension GetModifierExtension(DomainResource domainResource, string url) private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Level_of_Severity_of_Retinopathy_Value() { - CqlValueSet a_ = this.Level_of_Severity_of_Retinopathy_Findings(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication LevelOfSeverityNotCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -521,10 +522,10 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Absence_of_Macular_Edema_Value() { - CqlCode a_ = this.Macular_edema_absent__situation_(); - IEnumerable b_ = context.Operators.ToList(a_); - PropertyInfo c_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable d_ = context.Operators.RetrieveByCodes(b_, c_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlCode b_ = this.Macular_edema_absent__situation_(); + IEnumerable c_ = context.Operators.ToList(b_); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_)); IEnumerable e_(Communication MacularEdemaAbsentNotCommunicated) { IEnumerable i_ = this.Diabetic_Retinopathy_Encounter(); @@ -580,9 +581,9 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Medical_or_Patient_Reason_for_Not_Communicating_Presence_of_Macular_Edema_Value() { - CqlValueSet a_ = this.Macular_Edema_Findings_Present(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_Edema_Findings_Present(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication MacularEdemaPresentNotCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -678,7 +679,7 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Macular_Exam_Performed_Value() { CqlValueSet a_ = this.Macular_Exam(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_(Observation MacularExam) { IEnumerable g_ = this.Diabetic_Retinopathy_Encounter(); @@ -741,9 +742,9 @@ public IEnumerable Macular_Exam_Performed() => private IEnumerable Level_of_Severity_of_Retinopathy_Findings_Communicated_Value() { - CqlValueSet a_ = this.Level_of_Severity_of_Retinopathy_Findings(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication LevelOfSeverityCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -785,10 +786,10 @@ public IEnumerable Level_of_Severity_of_Retinopathy_Findings_Comm private IEnumerable Macular_Edema_Absence_Communicated_Value() { - CqlCode a_ = this.Macular_edema_absent__situation_(); - IEnumerable b_ = context.Operators.ToList(a_); - PropertyInfo c_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable d_ = context.Operators.RetrieveByCodes(b_, c_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlCode b_ = this.Macular_edema_absent__situation_(); + IEnumerable c_ = context.Operators.ToList(b_); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_)); IEnumerable e_(Communication MacularEdemaAbsentCommunicated) { IEnumerable i_ = this.Diabetic_Retinopathy_Encounter(); @@ -830,9 +831,9 @@ public IEnumerable Macular_Edema_Absence_Communicated() => private IEnumerable Macular_Edema_Presence_Communicated_Value() { - CqlValueSet a_ = this.Macular_Edema_Findings_Present(); - PropertyInfo b_ = typeof(Communication).GetProperty("ReasonCode"); - IEnumerable c_ = context.Operators.RetrieveByValueSet(a_, b_); + PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); + CqlValueSet b_ = this.Macular_Edema_Findings_Present(); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); IEnumerable d_(Communication MacularEdemaPresentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); diff --git a/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs b/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs index 501909cd7..f0e33ff7a 100644 --- a/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -94,7 +95,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -106,7 +107,7 @@ public Patient Patient() => private IEnumerable Jet_engine_conditions_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Condition c) { CodeableConcept d_ = c?.Code; @@ -140,7 +141,7 @@ public IEnumerable Jet_engine_conditions() => private IEnumerable Subsequent_encounters_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Condition c) { CodeableConcept d_ = c?.Code; diff --git a/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs b/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs index fb901202c..9d80c529b 100644 --- a/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs +++ b/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -236,7 +237,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -293,7 +294,7 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Telephone_Visits(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter TelehealthEncounter) { Code e_ = TelehealthEncounter?.StatusElement; @@ -334,7 +335,7 @@ public IEnumerable Telehealth_Services() => bool? n_ = context.Operators.Exists(m_); bool? o_ = context.Operators.And(j_, n_); CqlValueSet p_ = this.Diabetes(); - IEnumerable q_ = context.Operators.RetrieveByValueSet(p_, default); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); bool? r_(Condition Diabetes) { CqlInterval v_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Diabetes); @@ -368,7 +369,7 @@ public IEnumerable Telehealth_Services() => private Observation Most_Recent_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation RecentHbA1c) { Code h_ = RecentHbA1c?.StatusElement; @@ -438,7 +439,7 @@ public Observation Most_Recent_HbA1c() => private bool? Has_No_Record_Of_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation NoHbA1c) { Code g_ = NoHbA1c?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs b/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs index 5628f59fe..4eaca4516 100644 --- a/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs +++ b/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -226,7 +227,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -250,7 +251,7 @@ public IEnumerable Denominator() => private IEnumerable Antithrombotic_Not_Given_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(MedicationRequest NoAntithromboticDischarge) { FhirBoolean e_ = NoAntithromboticDischarge?.DoNotPerformElement; @@ -353,7 +354,7 @@ public IEnumerable Encounter_With_No_Antithrombotic_At_Discharge() => private IEnumerable Pharmacological_Contraindications_for_Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Pharmacological_Contraindications_For_Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(MedicationRequest Pharmacological) { FhirBoolean e_ = Pharmacological?.DoNotPerformElement; @@ -473,7 +474,7 @@ public IEnumerable Initial_Population() => private IEnumerable Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(MedicationRequest Antithrombotic) { FhirBoolean e_ = Antithrombotic?.DoNotPerformElement; diff --git a/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs b/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs index 1dbede00f..2bada9993 100644 --- a/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -231,7 +232,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -288,9 +289,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -375,9 +376,9 @@ public IEnumerable Telehealth_Services() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Right_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -417,7 +418,7 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure UnilateralMastectomyRightPerformed) { Code e_ = UnilateralMastectomyRightPerformed?.StatusElement; @@ -445,9 +446,9 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Left_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -487,7 +488,7 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure UnilateralMastectomyLeftPerformed) { Code e_ = UnilateralMastectomyLeftPerformed?.StatusElement; @@ -515,7 +516,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_bilateral_mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition BilateralMastectomyHistory) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(BilateralMastectomyHistory); @@ -538,7 +539,7 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure BilateralMastectomyPerformed) { Code e_ = BilateralMastectomyPerformed?.StatusElement; @@ -611,7 +612,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -653,7 +654,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -726,7 +727,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -769,7 +770,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs b/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs index 3154cc528..feea3063f 100644 --- a/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -469,7 +470,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -526,9 +527,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -609,7 +610,7 @@ public IEnumerable Telehealth_Services() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ColorectalCancer) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColorectalCancer); @@ -632,7 +633,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colectomy) { Code e_ = Colectomy?.StatusElement; @@ -660,7 +661,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Total_Colectomy_Condition_Value() { CqlValueSet a_ = this.Total_Colectomy_ICD9(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ColectomyDx) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColectomyDx); @@ -719,7 +720,7 @@ public IEnumerable Total_Colectomy_Condition() => private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Occult_Blood_Test_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { DataType g_ = FecalOccult?.Effective; @@ -820,7 +821,7 @@ string ak_(Code @this) private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -898,7 +899,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -976,7 +977,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffs private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { List e_ = FecalOccult?.Category; @@ -1046,7 +1047,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -1081,7 +1082,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Immunochemical_Test_DNA_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { DataType g_ = FitDNA?.Effective; @@ -1185,7 +1186,7 @@ string ao_(Code @this) private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1271,7 +1272,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed() => private IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1357,7 +1358,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { List e_ = FitDNA?.Category; @@ -1435,7 +1436,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1478,7 +1479,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable CT_Colonography_Display_Date_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { DataType g_ = Colonography?.Effective; @@ -1517,7 +1518,7 @@ public IEnumerable CT_Colonography_Display_Date() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1558,7 +1559,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable CT_Colonography_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1600,7 +1601,7 @@ public IEnumerable CT_Colonography_Performed_without_appropriate_st private IEnumerable Flexible_Sigmoidoscopy_Display_Date_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { DataType g_ = FlexibleSigmoidoscopy?.Performed; @@ -1639,7 +1640,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Display_Date() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1674,7 +1675,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1710,7 +1711,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropria private IEnumerable Colonoscopy_Display_Date_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { DataType g_ = Colonoscopy?.Performed; @@ -1749,7 +1750,7 @@ public IEnumerable Colonoscopy_Display_Date() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; @@ -1784,7 +1785,7 @@ public IEnumerable Colonoscopy_Performed() => private IEnumerable Colonoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs b/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs index f987875ca..14df5e343 100644 --- a/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs +++ b/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -488,7 +489,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -501,18 +502,18 @@ public Patient Patient() => private IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measurement_Period_Value() { CqlValueSet a_ = this.Myocardial_Infarction(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Cerebrovascular_Disease__Stroke__TIA(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Atherosclerosis_and_Peripheral_Arterial_Disease(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Ischemic_Heart_Disease_or_Other_Related_Diagnoses(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Stable_and_Unstable_Angina(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Condition ASCVDDiagnosis) { @@ -526,14 +527,14 @@ private IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measureme }; IEnumerable p_ = context.Operators.Where(n_, o_); CqlValueSet q_ = this.PCI(); - IEnumerable r_ = context.Operators.RetrieveByValueSet(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); CqlValueSet s_ = this.CABG_Surgeries(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); IEnumerable u_ = context.Operators.Union(r_, t_); CqlValueSet v_ = this.Carotid_Intervention(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); CqlValueSet x_ = this.CABG__PCI_Procedure(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); IEnumerable z_ = context.Operators.Union(w_, y_); IEnumerable aa_ = context.Operators.Union(u_, z_); bool? ab_(Procedure ASCVDProcedure) @@ -564,26 +565,26 @@ public IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measuremen private IEnumerable Qualifying_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Office_Visit(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Outpatient_Encounters_for_Preventive_Care(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Preventive_Care_Services___Other(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -655,7 +656,7 @@ public IEnumerable Qualifying_Encounter_during_Measurement_Period() = private IEnumerable LDL_Result_Greater_Than_or_Equal_To_190_Value() { CqlValueSet a_ = this.LDL_Cholesterol(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation LDL) { DataType e_ = LDL?.Value; @@ -694,7 +695,7 @@ public IEnumerable LDL_Result_Greater_Than_or_Equal_To_190() => private IEnumerable Hypercholesterolemia_Diagnosis_Value() { CqlValueSet a_ = this.Hypercholesterolemia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Hypercholesterolemia) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Hypercholesterolemia); @@ -762,7 +763,7 @@ public IEnumerable Hypercholesterolemia_Diagnosis() => private bool? Has_Diabetes_Diagnosis_Value() { CqlValueSet a_ = this.Diabetes(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition Diabetes) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Diabetes); @@ -886,7 +887,7 @@ public CqlCode SDE_Sex() => private bool? Has_Allergy_to_Statin_Value() { CqlValueSet a_ = this.Statin_Allergen(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(AllergyIntolerance StatinAllergy) { DataType f_ = StatinAllergy?.Onset; @@ -911,9 +912,9 @@ public CqlCode SDE_Sex() => private bool? Has_Order_or_Receiving_Hospice_Care_or_Palliative_Care_Value() { CqlValueSet a_ = this.Hospice_Care_Ambulatory(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Palliative_or_Hospice_Care(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(ServiceRequest PalliativeOrHospiceCareOrder) { @@ -940,8 +941,8 @@ public CqlCode SDE_Sex() => }; IEnumerable g_ = context.Operators.Where(e_, f_); bool? h_ = context.Operators.Exists(g_); - IEnumerable j_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable l_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable m_ = context.Operators.Union(j_, l_); bool? n_(Procedure PalliativeOrHospiceCarePerformed) { @@ -963,7 +964,7 @@ public CqlCode SDE_Sex() => bool? q_ = context.Operators.Or(h_, p_); CqlCode r_ = this.Encounter_for_palliative_care(); IEnumerable s_ = context.Operators.ToList(r_); - IEnumerable t_ = context.Operators.RetrieveByCodes(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, default, s_)); bool? u_(Encounter PalliativeEncounter) { Period aw_ = PalliativeEncounter?.Period; @@ -993,12 +994,12 @@ public CqlCode SDE_Sex() => private bool? Has_Hepatitis_or_Liver_Disease_Diagnosis_Value() { CqlValueSet a_ = this.Hepatitis_A(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Hepatitis_B(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Liver_Disease(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition HepatitisLiverDisease) { @@ -1021,7 +1022,7 @@ public CqlCode SDE_Sex() => private bool? Has_Statin_Associated_Muscle_Symptoms_Value() { CqlValueSet a_ = this.Statin_Associated_Muscle_Symptoms(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition StatinMuscleSymptom) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(StatinMuscleSymptom); @@ -1045,7 +1046,7 @@ public CqlCode SDE_Sex() => private bool? Has_ESRD_Diagnosis_Value() { CqlValueSet a_ = this.End_Stage_Renal_Disease(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Condition ESRD) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ESRD); @@ -1067,7 +1068,7 @@ public CqlCode SDE_Sex() => private bool? Has_Adverse_Reaction_to_Statin_Value() { CqlValueSet a_ = this.Statin_Allergen(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(AdverseEvent StatinReaction) { FhirDateTime f_ = StatinReaction?.DateElement; @@ -1111,12 +1112,12 @@ public CqlCode SDE_Sex() => private bool? Denominator_Exclusions_Value() { CqlValueSet a_ = this.Pregnancy_or_Other_Related_Diagnoses(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Breastfeeding(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Rhabdomyolysis(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition ExclusionDiagnosis) { @@ -1139,17 +1140,17 @@ public CqlCode SDE_Sex() => private IEnumerable Statin_Therapy_Ordered_during_Measurement_Period_Value() { CqlValueSet a_ = this.Low_Intensity_Statin_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Moderate_Intensity_Statin_Therapy(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.High_Intensity_Statin_Therapy(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); - IEnumerable o_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(MedicationRequest StatinOrdered) @@ -1185,17 +1186,17 @@ public IEnumerable Statin_Therapy_Ordered_during_Measurement_ private IEnumerable Prescribed_Statin_Therapy_Any_Time_during_Measurement_Period_Value() { CqlValueSet a_ = this.Low_Intensity_Statin_Therapy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Moderate_Intensity_Statin_Therapy(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.High_Intensity_Statin_Therapy(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); - IEnumerable o_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(MedicationRequest ActiveStatin) diff --git a/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs b/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs index d354b5dbe..03feb60ac 100644 --- a/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs +++ b/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -32,7 +33,7 @@ public FHIRHelpers_4_0_001(CqlContext context) } private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs b/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs index 43e3edb83..4fefb2877 100644 --- a/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs +++ b/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -110,7 +111,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -123,7 +124,7 @@ public Patient Patient() => private bool? Has_Hospice_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter DischargeHospice) { Code r_ = DischargeHospice?.StatusElement; @@ -154,7 +155,7 @@ public Patient Patient() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Hospice_care_ambulatory(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(ServiceRequest HospiceOrder) { Code ao_ = HospiceOrder?.StatusElement; @@ -179,7 +180,7 @@ public Patient Patient() => IEnumerable i_ = context.Operators.Where(g_, h_); bool? j_ = context.Operators.Exists(i_); bool? k_ = context.Operators.Or(e_, j_); - IEnumerable m_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? n_(Procedure HospicePerformed) { Code bb_ = HospicePerformed?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs b/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs index c5c7ba196..e9d21b114 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -162,7 +163,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -219,7 +220,7 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); return b_; } @@ -278,7 +279,7 @@ private IEnumerable Qualifying_Encounters_With_Existing_Diabetes_Diag IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> b_((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization) { CqlValueSet f_ = this.Diabetes(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Condition DiabetesDiagnosis) { CodeableConcept l_ = DiabetesDiagnosis?.VerificationStatus; @@ -322,8 +323,8 @@ private IEnumerable Qualifying_Encounters_With_Hypoglycemic_Medicatio { IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> a_ = this.Qualifying_Encounters_With_Hospitalization_Period(); CqlValueSet b_ = this.Hypoglycemics_Treatment_Medications(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); - IEnumerable e_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable hospitalizationPeriod)?, MedicationAdministration>> g_ = context.Operators.CrossJoin<(Encounter encounter, CqlInterval hospitalizationPeriod)?, MedicationAdministration>(a_, f_); ((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization, MedicationAdministration HypoglycemicMedication)? h_(ValueTuple<(Encounter encounter, CqlInterval hospitalizationPeriod)?, MedicationAdministration> _valueTuple) @@ -368,7 +369,7 @@ private IEnumerable Qualifying_Encounters_With_Elevated_Blood_Glucose IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> b_((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization) { CqlValueSet f_ = this.Glucose_lab_test(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Observation BloodGlucoseLab) { DataType l_ = BloodGlucoseLab?.Effective; @@ -570,7 +571,7 @@ bool m_() int? j_ = EncounterDay?.dayIndex; CqlInterval k_ = EncounterDay?.dayPeriod; CqlValueSet l_ = this.Glucose_lab_test(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); bool? n_(Observation BloodGlucoseLab1) { Code ac_ = BloodGlucoseLab1?.StatusElement; @@ -591,7 +592,7 @@ bool m_() }; IEnumerable o_ = context.Operators.Where(m_, n_); bool? p_ = context.Operators.Exists(o_); - IEnumerable r_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); bool? s_(Observation BloodGlucoseLab2) { Code ap_ = BloodGlucoseLab2?.StatusElement; @@ -612,7 +613,7 @@ bool m_() }; IEnumerable t_ = context.Operators.Where(r_, s_); bool? u_ = context.Operators.Exists(t_); - IEnumerable w_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); bool? x_(Observation BloodGlucoseLab3) { Code bc_ = BloodGlucoseLab3?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs b/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs index 939cc0f09..8d2276ed4 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -177,7 +178,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -223,7 +224,7 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -275,8 +276,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Hypoglycemic_Medication_Administration_Value() { CqlValueSet a_ = this.Hypoglycemics_Severe_Hypoglycemia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration HypoMedication) { @@ -359,7 +360,7 @@ private IEnumerable Severe_Hypoglycemic_Harm_Event_Value() bool? b_(Encounter QualifyingEncounter) { CqlValueSet d_ = this.Glucose_lab_test(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable f_(Observation BloodGlucoseLab) { IEnumerable r_ = this.Hypoglycemic_Medication_Administration(); @@ -405,7 +406,7 @@ Observation u_(MedicationAdministration HypoglycemicMeds) => return v_; }; IEnumerable g_ = context.Operators.SelectMany(e_, f_); - IEnumerable i_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable j_(Observation BloodGlucoseLab) { IEnumerable bd_ = this.Hypoglycemic_Medication_Administration(); @@ -454,7 +455,7 @@ Observation bg_(MedicationAdministration HypoglycemicMeds) => IEnumerable l_(Observation BloodGlucoseLab) { CqlValueSet cp_ = this.Glucose_lab_test(); - IEnumerable cq_ = context.Operators.RetrieveByValueSet(cp_, default); + IEnumerable cq_ = context.Operators.Retrieve(new RetrieveParameters(default, cp_, default)); bool? cr_(Observation FollowupBloodGlucoseLab) { DataType cv_ = FollowupBloodGlucoseLab?.Effective; diff --git a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs index 9f1049bf2..ebbf4451f 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -277,7 +278,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -344,9 +345,9 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -642,36 +643,36 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlValueSet i_ = this.Body_temperature(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable k_ = this.FirstPhysicalExamWithEncounterId(j_, "FirstTemperature"); CqlCode l_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable m_ = context.Operators.ToList(l_); - IEnumerable n_ = context.Operators.RetrieveByCodes(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, default, m_)); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstO2Saturation"); CqlValueSet p_ = this.Hematocrit_lab_test(); - IEnumerable q_ = context.Operators.RetrieveByValueSet(p_, default); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); IEnumerable r_ = this.FirstLabTestWithEncounterId(q_, "FirstHematocrit"); CqlValueSet s_ = this.Platelet_count_lab_test(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); IEnumerable u_ = this.FirstLabTestWithEncounterId(t_, "FirstPlateletCount"); CqlValueSet v_ = this.White_blood_cells_count_lab_test(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); IEnumerable x_ = this.FirstLabTestWithEncounterId(w_, "FirstWhiteBloodCell"); CqlValueSet y_ = this.Sodium_lab_test(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); IEnumerable aa_ = this.FirstLabTestWithEncounterId(z_, "FirstSodium"); CqlValueSet ab_ = this.Bicarbonate_lab_test(); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(ab_, default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); IEnumerable ad_ = this.FirstLabTestWithEncounterId(ac_, "FirstBicarbonate"); CqlValueSet ae_ = this.Creatinine_lab_test(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); IEnumerable ag_ = this.FirstLabTestWithEncounterId(af_, "FirstCreatinine"); IEnumerable[] ah_ = [ d_, @@ -735,14 +736,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -783,7 +784,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -823,7 +824,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -881,7 +882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; diff --git a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs index 66cd15c44..41b3b38cf 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -307,7 +308,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -370,14 +371,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -418,7 +419,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -458,7 +459,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -516,7 +517,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -580,9 +581,9 @@ object s_(Encounter @this) private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -997,46 +998,46 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlCode i_ = this.Respiratory_rate(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); IEnumerable l_ = this.FirstPhysicalExamWithEncounterId(k_, "FirstRespRate"); CqlValueSet m_ = this.Body_temperature(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstTemperature"); CqlCode p_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable q_ = context.Operators.ToList(p_); - IEnumerable r_ = context.Operators.RetrieveByCodes(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, default, q_)); IEnumerable s_ = this.FirstPhysicalExamWithEncounterId(r_, "FirstO2Saturation"); CqlValueSet t_ = this.Body_weight(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = this.FirstPhysicalExamWithEncounterIdUsingLabTiming(u_, "FirstWeight"); CqlValueSet w_ = this.Hematocrit_lab_test(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); IEnumerable y_ = this.FirstLabTestWithEncounterId(x_, "FirstHematocrit"); CqlValueSet z_ = this.White_blood_cells_count_lab_test(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); IEnumerable ab_ = this.FirstLabTestWithEncounterId(aa_, "FirstWhiteBloodCell"); CqlValueSet ac_ = this.Potassium_lab_test(); - IEnumerable ad_ = context.Operators.RetrieveByValueSet(ac_, default); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default)); IEnumerable ae_ = this.FirstLabTestWithEncounterId(ad_, "FirstPotassium"); CqlValueSet af_ = this.Sodium_lab_test(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); IEnumerable ah_ = this.FirstLabTestWithEncounterId(ag_, "FirstSodium"); CqlValueSet ai_ = this.Bicarbonate_lab_test(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); IEnumerable ak_ = this.FirstLabTestWithEncounterId(aj_, "FirstBicarbonate"); CqlValueSet al_ = this.Creatinine_lab_test(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); IEnumerable an_ = this.FirstLabTestWithEncounterId(am_, "FirstCreatinine"); CqlValueSet ao_ = this.Glucose_lab_test(); - IEnumerable ap_ = context.Operators.RetrieveByValueSet(ao_, default); + IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default)); IEnumerable aq_ = this.FirstLabTestWithEncounterId(ap_, "FirstGlucose"); IEnumerable[] ar_ = [ d_, diff --git a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs index 531b3d7f4..871e3a642 100644 --- a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs +++ b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -473,7 +474,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -496,7 +497,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -528,7 +529,7 @@ public IEnumerable Inpatient_Encounter() => public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -706,14 +707,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -754,7 +755,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -794,7 +795,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -852,7 +853,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -1326,7 +1327,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -1352,7 +1353,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlDeclaration("GetCondition")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -1460,7 +1461,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) ]; Condition f_(Encounter.DiagnosisComponent PD) { - IEnumerable m_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable m_ = context.Operators.Retrieve(default); bool? n_(Condition C) { Id q_ = C?.IdElement; @@ -1487,7 +1488,7 @@ Condition f_(Encounter.DiagnosisComponent PD) [CqlDeclaration("GetLocation")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -1591,7 +1592,7 @@ bool b_() } else { - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(default); bool? g_(Medication M) { Id k_ = M?.IdElement; diff --git a/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs index 0a08edd3d..d43e2a315 100644 --- a/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -210,7 +211,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -223,7 +224,7 @@ public Patient Patient() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation FrailtyDeviceApplied) { DataType z_ = FrailtyDeviceApplied?.Effective; @@ -236,7 +237,7 @@ public Patient Patient() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Frailty_Diagnosis(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = NCQAStatus_1_0_0.Active_Condition(g_); bool? i_(Condition FrailtyDiagnosis) { @@ -250,7 +251,7 @@ public Patient Patient() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(e_, k_); CqlValueSet m_ = this.Frailty_Encounter(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); IEnumerable o_ = NCQAStatus_1_0_0.Finished_Encounter(n_); bool? p_(Encounter FrailtyEncounter) { @@ -265,7 +266,7 @@ public Patient Patient() => bool? r_ = context.Operators.Exists(q_); bool? s_ = context.Operators.Or(l_, r_); CqlValueSet t_ = this.Frailty_Symptom(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); bool? v_(Observation FrailtySymptom) { DataType ak_ = FrailtySymptom?.Effective; @@ -289,27 +290,27 @@ public Patient Patient() => private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.ED(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Telephone_Visits(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Online_Assessments(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Nonacute_Inpatient(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); IEnumerable r_ = NCQAStatus_1_0_0.Finished_Encounter(q_); bool? s_(Encounter OutpatientEncounter) { CqlValueSet w_ = this.Advanced_Illness(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); bool? y_ = NCQAEncounter_1_0_0.Encounter_Has_Diagnosis(OutpatientEncounter, x_); Period z_ = OutpatientEncounter?.Period; CqlInterval aa_ = NCQAFHIRBase_1_0_0.Normalize_Interval((z_ as object)); @@ -349,7 +350,7 @@ public IEnumerable Outpatient_Encounters_with_Advanced_Illness() => private IEnumerable Nonacute_Inpatient_Discharge_with_Advanced_Illness_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); (IEnumerable InpatientDischarge, IEnumerable NonacuteInpatientDischarge, IEnumerable AcuteInpatientDischarge)? b_ = NCQAClaims_1_0_0.Medical_Claims_With_Nonacute_or_Acute_Inpatient_Discharge(a_); IEnumerable c_ = b_?.NonacuteInpatientDischarge; CqlValueSet d_ = this.Advanced_Illness(); @@ -470,12 +471,12 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Acute_Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Finished_Encounter(b_); bool? d_(Encounter InpatientEncounter) { CqlValueSet g_ = this.Advanced_Illness(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); bool? i_ = NCQAEncounter_1_0_0.Encounter_Has_Diagnosis(InpatientEncounter, h_); Period j_ = InpatientEncounter?.Period; CqlInterval k_ = NCQAFHIRBase_1_0_0.Normalize_Interval((j_ as object)); @@ -506,7 +507,7 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Acute_Inpatient_Discharge_with_Advanced_Illness_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); (IEnumerable InpatientDischarge, IEnumerable NonacuteInpatientDischarge, IEnumerable AcuteInpatientDischarge)? b_ = NCQAClaims_1_0_0.Medical_Claims_With_Nonacute_or_Acute_Inpatient_Discharge(a_); IEnumerable c_ = b_?.AcuteInpatientDischarge; CqlValueSet d_ = this.Advanced_Illness(); @@ -542,8 +543,8 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Dementia_Medications_In_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = NCQAStatus_1_0_0.Dispensed_Medication(e_); bool? g_(MedicationDispense DementiaMedDispensed) diff --git a/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs index d3cc6216e..b7117f7a6 100644 --- a/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs index f56758bef..670e02d3c 100644 --- a/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -3384,7 +3385,7 @@ string ao_(FhirString r) ]; (int? IdentifierCount, nint _)? e_((IEnumerable<(Claim SingleCareTeam, IEnumerable CareTeamsProvider, IEnumerable CareTeamsProviderID)?> CareTeams, nint _)? ClaimProperties) { - IEnumerable at_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable at_ = context.Operators.Retrieve(default); bool? au_(Practitioner p) { Id bb_ = p?.IdElement; @@ -3677,7 +3678,7 @@ string ar_(FhirString r) ]; (int? IdentifierCount, nint _)? e_((IEnumerable<(IEnumerable SingleItem, IEnumerable ItemLocation, IEnumerable ItemLocationID)?> ItemsLocationReferences, nint _)? ClaimProperties) { - IEnumerable aw_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable aw_ = context.Operators.Retrieve(default); bool? ax_(Location l) { Id be_ = l?.IdElement; diff --git a/Demo/Measures.Demo/CSharp/NCQAEncounter-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAEncounter-1.0.0.g.cs index 8ea5d4f7e..29392f1c2 100644 --- a/Demo/Measures.Demo/CSharp/NCQAEncounter-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAEncounter-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs index 03c72fe86..0c9e67d5b 100644 --- a/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -39,7 +40,7 @@ public NCQAFHIRBase_1_0_0(CqlContext context) private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/NCQAHealthPlanEnrollment-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAHealthPlanEnrollment-1.0.0.g.cs index f9c4cc2fd..c04099593 100644 --- a/Demo/Measures.Demo/CSharp/NCQAHealthPlanEnrollment-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAHealthPlanEnrollment-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs index dc3f2f825..8146dc0e7 100644 --- a/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -78,7 +79,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -91,7 +92,7 @@ public Patient Patient() => private bool? Hospice_Intervention_or_Encounter_Value() { CqlValueSet a_ = this.Hospice_Intervention(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); IEnumerable c_ = NCQAStatus_1_0_0.Completed_or_Ongoing_Procedure(b_); bool? d_(Procedure HospiceInt) { @@ -105,7 +106,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Hospice_Encounter(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); IEnumerable i_ = NCQAStatus_1_0_0.Finished_Encounter(h_); bool? j_(Encounter HospiceEnc) { diff --git a/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs index 1092cd407..d91c7baf8 100644 --- a/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -97,7 +98,7 @@ public CqlCode[] ICD_10() => public bool? Palliative_Care_Overlapping_Period(CqlInterval Period) { CqlValueSet a_ = this.Palliative_Care_Assessment(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Observation PalliativeAssessment) { DataType ab_ = PalliativeAssessment?.Effective; @@ -120,7 +121,7 @@ public CqlCode[] ICD_10() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Palliative_Care_Encounter(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); IEnumerable h_ = NCQAStatus_1_0_0.Finished_Encounter(g_); bool? i_(Encounter PalliativeEncounter) { @@ -145,7 +146,7 @@ public CqlCode[] ICD_10() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(e_, k_); CqlValueSet m_ = this.Palliative_Care_Intervention(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); IEnumerable o_ = NCQAStatus_1_0_0.Completed_or_Ongoing_Procedure(n_); bool? p_(Procedure PalliativeIntervention) { @@ -171,7 +172,7 @@ public CqlCode[] ICD_10() => bool? s_ = context.Operators.Or(l_, r_); CqlCode t_ = this.Encounter_for_palliative_care(); IEnumerable u_ = context.Operators.ToList(t_); - IEnumerable v_ = context.Operators.RetrieveByCodes(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_)); IEnumerable w_ = NCQAStatus_1_0_0.Active_Condition(v_); bool? x_(Condition PalliativeDiagnosis) { diff --git a/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs index 98d7ca35a..7f2da9c3a 100644 --- a/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -41,7 +42,7 @@ public NCQAStatus_1_0_0(CqlContext context) private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/NCQATerminology-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQATerminology-1.0.0.g.cs index fe3610c83..ca19e26ac 100644 --- a/Demo/Measures.Demo/CSharp/NCQATerminology-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQATerminology-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; diff --git a/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs b/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs index 05e639647..7e6b219f8 100644 --- a/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs +++ b/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -124,7 +125,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -138,7 +139,7 @@ public Patient Patient() => { CqlCode a_ = this.Functional_Assessment_of_Chronic_Illness_Therapy___Palliative_Care_Questionnaire__FACIT_Pal_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); bool? d_(Observation PalliativeAssessment) { Code s_ = PalliativeAssessment?.StatusElement; @@ -173,7 +174,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Palliative_Care_Encounter(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); bool? i_(Encounter PalliativeEncounter) { Code ak_ = PalliativeEncounter?.StatusElement; @@ -191,7 +192,7 @@ public Patient Patient() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(f_, k_); CqlValueSet m_ = this.Palliative_Care_Intervention(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); bool? o_(Procedure PalliativeIntervention) { Code as_ = PalliativeIntervention?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs b/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs index b8d81645e..da20104ce 100644 --- a/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs +++ b/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -196,7 +197,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -253,26 +254,26 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); CqlValueSet c_ = this.Preventive_Care___Established_Office_Visit__0_to_17(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Initial_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); CqlValueSet h_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); CqlValueSet n_ = this.Clinical_Oral_Evaluation(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.RetrieveByValueSet(r_, default); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); CqlValueSet t_ = this.Online_Assessments(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -419,7 +420,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Fluoride_Varnish_Application_for_Children(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Procedure FluorideApplication) { CqlInterval f_ = this.Measurement_Period(); diff --git a/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs b/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs index 6f9544922..3b6f8f6fa 100644 --- a/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -178,7 +179,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -225,12 +226,12 @@ private IEnumerable Initial_Population_Value() IEnumerable b_(Encounter InpatientEncounter) { CqlValueSet d_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); - IEnumerable g_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Schedule_IV_Benzodiazepines(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); - IEnumerable l_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); IEnumerable m_ = context.Operators.Union(j_, l_); bool? n_(MedicationRequest Medications) { @@ -346,7 +347,7 @@ private IEnumerable Numerator_Value() bool? b_(Encounter InpatientEncounter) { CqlValueSet j_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); bool? l_(MedicationRequest Opioids) { FhirDateTime r_ = Opioids?.AuthoredOnElement; @@ -374,7 +375,7 @@ object n_(MedicationRequest Opioids) IEnumerable e_(Encounter InpatientEncounter) { CqlValueSet x_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable y_ = context.Operators.RetrieveByValueSet(x_, default); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); bool? z_(MedicationRequest OpioidsDischarge) { FhirDateTime ad_ = OpioidsDischarge?.AuthoredOnElement; @@ -396,7 +397,7 @@ Encounter ab_(MedicationRequest OpioidsDischarge) => IEnumerable g_(Encounter InpatientEncounter) { CqlValueSet ai_ = this.Schedule_IV_Benzodiazepines(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); bool? ak_(MedicationRequest BenzodiazepinesDischarge) { FhirDateTime ao_ = BenzodiazepinesDischarge?.AuthoredOnElement; @@ -430,7 +431,7 @@ private IEnumerable Denominator_Exclusion_Value() bool? b_(Encounter InpatientEncounter) { CqlValueSet f_ = this.All_Primary_and_Secondary_Cancer(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); bool? h_(Condition Cancer) { CqlInterval ab_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Cancer); @@ -443,7 +444,7 @@ private IEnumerable Denominator_Exclusion_Value() IEnumerable i_ = context.Operators.Where(g_, h_); bool? j_ = context.Operators.Exists(i_); CqlValueSet k_ = this.Palliative_or_Hospice_Care(); - IEnumerable l_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); bool? m_(ServiceRequest PalliativeOrHospiceCareOrder) { FhirDateTime af_ = PalliativeOrHospiceCareOrder?.AuthoredOnElement; @@ -461,7 +462,7 @@ private IEnumerable Denominator_Exclusion_Value() IEnumerable n_ = context.Operators.Where(l_, m_); bool? o_ = context.Operators.Exists(n_); bool? p_ = context.Operators.Or(j_, o_); - IEnumerable r_ = context.Operators.RetrieveByValueSet(k_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); bool? s_(Procedure PalliativeOrHospiceCarePerformed) { DataType ao_ = PalliativeOrHospiceCarePerformed?.Performed; diff --git a/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs b/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs index 3c82bea62..1f59f4422 100644 --- a/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs +++ b/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -87,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -169,7 +170,7 @@ public IEnumerable SDE_Ethnicity() => private IEnumerable<(CodeableConcept code, Period period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); (CodeableConcept code, Period period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs b/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs index c75d58d4b..3b985c5e9 100644 --- a/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs +++ b/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -227,7 +228,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -240,7 +241,7 @@ public Patient Patient() => private IEnumerable Non_Elective_Inpatient_Encounter_Value() { CqlValueSet a_ = this.Non_Elective_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(Encounter NonElectiveEncounter) { Period e_ = NonElectiveEncounter?.Period; @@ -296,7 +297,7 @@ private IEnumerable Encounter_with_Principal_Diagnosis_and_Age_Value( IEnumerable a_ = this.All_Stroke_Encounter(); IEnumerable b_(Encounter AllStrokeEncounter) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(default); bool? e_(Patient BirthDate) { Patient i_ = this.Patient(); @@ -394,7 +395,7 @@ public IEnumerable Ischemic_Stroke_Encounters_with_Discharge_Disposit private IEnumerable Intervention_Comfort_Measures_Value() { CqlValueSet a_ = this.Comfort_Measures(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? c_(ServiceRequest P) { Code j_ = P?.IntentElement; @@ -404,7 +405,7 @@ private IEnumerable Intervention_Comfort_Measures_Value() return l_; }; IEnumerable d_ = context.Operators.Where(b_, c_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); bool? g_(Procedure InterventionPerformed) { Code m_ = InterventionPerformed?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs b/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs index da0a9ef31..24434d949 100644 --- a/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs +++ b/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -67,7 +68,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(default); Patient b_ = context.Operators.SingletonFrom(a_); return b_; From 278e343b05269bf564689bd1239eee5cd9b5a47d Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Wed, 4 Sep 2024 15:21:52 +0200 Subject: [PATCH 2/7] Actually adding the templateId to the RetrieveParameters --- Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs | 2 +- Cql/CoreTests/Fhir/DataSourceTests.cs | 11 +- .../CqlOperatorsBinder.Specific.cs | 15 +- Cql/Cql.Compiler/CqlOperatorsBinder.cs | 2 +- Cql/Cql.Compiler/ExpressionBuilderContext.cs | 24 ++- Cql/Cql.Operators/ICqlOperators.cs | 6 +- Cql/Cql.Operators/PublicAPI.Unshipped.txt | 6 +- ...ationofCurrentMedicationsFHIR-0.2.000.g.cs | 8 +- .../MultipleResourcesExample-0.0.1.g.cs | 6 +- .../CSharp/ParametersExample-0.0.1.g.cs | 2 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 2 +- .../CSharp/Status-1.6.000.g.cs | 2 +- .../SupplementalDataElements-3.4.000.g.cs | 4 +- .../CSharp/AHAOverall-2.6.000.g.cs | 40 ++-- .../CSharp/ALARACTOQRFHIR-0.1.001.g.cs | 6 +- .../AdultOutpatientEncounters-4.8.000.g.cs | 16 +- .../AdvancedIllnessandFrailty-1.8.000.g.cs | 30 +-- .../CSharp/AlaraCTFHIR-0.1.001.g.cs | 4 +- .../CSharp/AlaraCTIQRFHIR-0.1.000.g.cs | 6 +- .../CSharp/Antibiotic-1.5.000.g.cs | 2 +- ...AtrialFibrillationFlutterFHIR-0.3.000.g.cs | 16 +- ...ssantMedicationManagementFHIR-0.1.000.g.cs | 40 ++-- ...teDXAScansForWomenUnder65FHIR-0.0.000.g.cs | 110 +++++------ ...iateTestingforPharyngitisFHIR-0.1.000.g.cs | 54 +++--- ...ropriateTreatmentforSTEMIFHIR-1.0.000.g.cs | 56 +++--- ...erRespiratoryInfectionURIFHIR-0.1.000.g.cs | 48 ++--- .../CSharp/CQMCommon-2.0.000.g.cs | 132 +++++++------- ...ReceiptofSpecialistReportFHIR-0.2.000.g.cs | 18 +- ...racts2040BCVAwithin90DaysFHIR-0.1.000.g.cs | 118 ++++++------ .../CervicalCancerScreeningFHIR-0.0.001.g.cs | 22 +-- .../CSharp/CesareanBirthFHIR-0.2.000.g.cs | 24 +-- ...rMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs | 20 +- ...ildhoodImmunizationStatusFHIR-0.1.000.g.cs | 114 ++++++------ ...HaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs | 6 +- ...ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs | 58 +++--- .../ColonCancerScreeningFHIR-0.1.000.g.cs | 16 +- .../CumulativeMedicationDuration-4.0.000.g.cs | 2 +- ...PhysicianManagingDiabetesFHIR-0.1.000.g.cs | 34 ++-- ...mentiaCognitiveAssessmentFHIR-0.1.000.g.cs | 32 ++-- .../CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs | 24 +-- ...lobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs | 8 +- ...edonAntithromboticTherapyFHIR-0.9.000.g.cs | 18 +- ...creeningForFutureFallRiskFHIR-0.1.000.g.cs | 34 ++-- ...escribedADHDMedicationADDFHIR-0.1.000.g.cs | 172 +++++++++--------- ...entforTotalHipReplacementFHIR-0.0.008.g.cs | 52 +++--- ...ssessmentsforHeartFailureFHIR-0.1.000.g.cs | 68 +++---- ...obalMalnutritionCompositeFHIR-0.1.000.g.cs | 22 +-- ...BetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs | 38 ++-- .../CSharp/HIVRetentionFHIR-0.1.000.g.cs | 54 +++--- .../HIVViralSuppressionFHIR-0.1.000.g.cs | 28 +-- Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs | 14 +- ...pioidRelatedAdverseEventsFHIR-0.1.000.g.cs | 12 +- ...ospitalHarmPressureInjuryFHIR-0.1.000.g.cs | 12 +- ...talHarmSevereHypoglycemiaFHIR-0.1.000.g.cs | 12 +- ...bridHospitalWideMortalityFHIR-0.0.001.g.cs | 52 +++--- ...idHospitalWideReadmissionFHIR-0.0.001.g.cs | 60 +++--- ...tteGuerinForBladderCancerFHIR-1.3.000.g.cs | 38 ++-- .../KidneyHealthEvaluationFHIR-0.1.000.g.cs | 26 +-- ...gyPainIntensityQuantifiedFHIR-0.1.000.g.cs | 16 +- .../CSharp/PCMaternal-5.16.000.g.cs | 20 +- .../PCSBPScreeningFollowUpFHIR-0.2.000.g.cs | 116 ++++++------ .../POAGOpticNerveEvaluationFHIR-0.1.000.g.cs | 26 +-- .../CSharp/PalliativeCare-1.9.000.g.cs | 10 +- ...gAndCessationInterventionFHIR-0.0.001.g.cs | 56 +++--- ...entionasOfferedbyDentistsFHIR-0.0.002.g.cs | 6 +- ...aAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs | 18 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 2 +- ...ereObstetricComplicationsFHIR-0.1.000.g.cs | 20 +- Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs | 2 +- .../SupplementalDataElements-3.4.000.g.cs | 4 +- .../CSharp/TJCOverall-8.11.000.g.cs | 8 +- ...enignProstaticHyperplasiaFHIR-1.3.000.g.cs | 20 +- ...skMedicationsintheElderlyFHIR-0.1.000.g.cs | 136 +++++++------- Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs | 2 +- ...forChildrenandAdolescentsFHIR-0.1.000.g.cs | 28 +-- ...dultOutpatientEncountersFHIR4-2.2.000.g.cs | 12 +- ...andFrailtyExclusionECQMFHIR4-5.17.000.g.cs | 36 ++-- .../CSharp/BCSEHEDISMY2022-1.0.0.g.cs | 30 +-- .../BreastCancerScreeningsFHIR-0.0.009.g.cs | 30 +-- .../CervicalCancerScreeningFHIR-0.0.005.g.cs | 26 +-- ...olorectalCancerScreeningsFHIR-0.0.003.g.cs | 50 ++--- ...lativeMedicationDurationFHIR4-1.0.000.g.cs | 2 +- ...PhysicianManagingDiabetesFHIR-0.0.004.g.cs | 28 +-- .../CSharp/DevDays-2023.0.0.g.cs | 6 +- ...lobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs | 10 +- ...edonAntithromboticTherapyFHIR-0.0.010.g.cs | 8 +- .../CSharp/Exam125FHIR-0.0.009.g.cs | 30 +-- .../CSharp/Exam130FHIR-0.0.003.g.cs | 50 ++--- .../Measures.Demo/CSharp/FHIR347-0.1.021.g.cs | 96 +++++----- .../CSharp/FHIRHelpers-4.0.001.g.cs | 2 +- .../CSharp/HospiceFHIR4-2.3.000.g.cs | 8 +- ...miainHospitalizedPatientsFHIR-0.0.006.g.cs | 18 +- ...talHarmSevereHypoglycemiaFHIR-0.0.012.g.cs | 14 +- .../CSharp/HybridHWMFHIR-0.102.005.g.cs | 36 ++-- .../CSharp/HybridHWRFHIR-1.3.005.g.cs | 42 ++--- ...MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs | 26 +-- .../NCQAAdvancedIllnessandFrailty-1.0.0.g.cs | 36 ++-- .../CSharp/NCQAClaims-1.0.0.g.cs | 4 +- .../CSharp/NCQAFHIRBase-1.0.0.g.cs | 2 +- .../CSharp/NCQAHospice-1.0.0.g.cs | 6 +- .../CSharp/NCQAPalliativeCare-1.0.0.g.cs | 8 +- .../CSharp/NCQAStatus-1.0.0.g.cs | 2 +- .../CSharp/PalliativeCareFHIR-0.6.000.g.cs | 8 +- ...edbyPCPsincludingDentistsFHIR-0.0.008.g.cs | 20 +- ...oidsConcurrentPrescribingFHIR-0.0.012.g.cs | 22 +-- ...SupplementalDataElementsFHIR4-2.0.000.g.cs | 4 +- .../CSharp/TJCOverallFHIR-1.8.000.g.cs | 10 +- .../CSharp/VTEFHIR4-4.8.000.g.cs | 2 +- 108 files changed, 1525 insertions(+), 1507 deletions(-) diff --git a/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs b/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs index 72e64473c..61e0960ff 100644 --- a/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs +++ b/Cql/CoreTests/CSharp/TestRetrieve-1.0.1.g.cs @@ -192,7 +192,7 @@ public object MeasurementPeriod() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Cql/CoreTests/Fhir/DataSourceTests.cs b/Cql/CoreTests/Fhir/DataSourceTests.cs index abe5f80ec..53bf2638c 100644 --- a/Cql/CoreTests/Fhir/DataSourceTests.cs +++ b/Cql/CoreTests/Fhir/DataSourceTests.cs @@ -23,7 +23,7 @@ public void FiltersOnResourceType() results.Should().AllBeOfType(); } - private static RetrieveParameters Pars(params CqlCode[] codes) => new(null, null, codes); + private static RetrieveParameters Pars(params CqlCode[] codes) => new(null, null, codes, null); [TestMethod] public void FiltersOnDefaultProp() @@ -50,17 +50,18 @@ public void FiltersOnSpecificProp() { var dr = buildDataSource(); var model = new FhirTypeResolver(ModelInfo.ModelInspector); - var genderProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient"), "gender"); + var genderProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient")!, "gender"); genderProp.Should().NotBeNull(); var results = dr.Retrieve(new RetrieveParameters(genderProp, null, - [new CqlCode("male", "http://hl7.org/fhir/administrative-gender")])); + [new CqlCode("male", "http://hl7.org/fhir/administrative-gender")], null)); results.Should().HaveCount(1); results.Should().AllBeOfType().And.AllSatisfy(p => p.Gender.Should().Be(AdministrativeGender.Male)); - var activeProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient"), "active"); + var activeProp = model.GetProperty(model.ResolveType("{http://hl7.org/fhir}Patient")!, "active"); Assert.ThrowsException(() => - dr.Retrieve(new RetrieveParameters(activeProp, null, new[] { new CqlCode("male", "http://hl7.org/fhir/administrative-gender") })).ToList()); + dr.Retrieve(new RetrieveParameters(activeProp, null, + [new CqlCode("male", "http://hl7.org/fhir/administrative-gender")], null)).ToList()); } private BundleDataSource buildDataSource() diff --git a/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs b/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs index 4a41aeb60..c733de109 100644 --- a/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs +++ b/Cql/Cql.Compiler/CqlOperatorsBinder.Specific.cs @@ -180,7 +180,8 @@ private Expression BindConvert( private MethodCallExpression Retrieve( Expression typeExpression, Expression valueSetOrCodes, - Expression codePropertyExpression) + Expression codePropertyExpression, + Expression templateId) { if (typeExpression is not ConstantExpression ce || ce.Type != typeof(Type)) throw new ArgumentException("First parameter to Retrieve is expected to be a constant Type", nameof(typeExpression)); @@ -199,7 +200,7 @@ private MethodCallExpression Retrieve( codePropertyExpression = Expression.Call(typeOf, method, Expression.Constant(propName)); } - return Retrieve(type, valueSetOrCodes, codePropertyExpression); + return Retrieve(type, valueSetOrCodes, codePropertyExpression, templateId); } @@ -207,7 +208,8 @@ private MethodCallExpression Retrieve( protected MethodCallExpression Retrieve( Type resourceType, Expression codes, - Expression codeProperty) + Expression codeProperty, + Expression templateId) { var forType = typeof(ICqlOperators).GetMethod(nameof(ICqlOperators.Retrieve))!.MakeGenericMethod(resourceType); Expression codeExpression = NullExpression.ForType>(); @@ -238,9 +240,12 @@ protected MethodCallExpression Retrieve( throw new ArgumentException($"Retrieve statements can only accept terminology expressions whose type is {nameof(CqlValueSet)} or {nameof(IEnumerable)}. The expression provided has a type of {codes.Type.FullName}", nameof(codes)); var constructor = typeof(RetrieveParameters).GetConstructors(BindingFlags.Public | BindingFlags.Instance).Single(); - var hasFilters = !codeProperty.IsNullConstant() || !codeExpression.IsNullConstant() || !valuesetExpression.IsNullConstant(); + var hasFilters = !codeProperty.IsNullConstant() || !codeExpression.IsNullConstant() + || !valuesetExpression.IsNullConstant() + || !templateId.IsNullConstant(); + Expression createParameters = hasFilters - ? Expression.New(constructor, codeProperty, valuesetExpression, codeExpression) + ? Expression.New(constructor, codeProperty, valuesetExpression, codeExpression, templateId) : NullExpression.ForType(); var call = BindToDirectMethod(forType, createParameters); diff --git a/Cql/Cql.Compiler/CqlOperatorsBinder.cs b/Cql/Cql.Compiler/CqlOperatorsBinder.cs index 8e7abce36..5b43a1f83 100644 --- a/Cql/Cql.Compiler/CqlOperatorsBinder.cs +++ b/Cql/Cql.Compiler/CqlOperatorsBinder.cs @@ -84,7 +84,7 @@ public virtual Expression BindToMethod( "LateBoundProperty" => LateBoundProperty(args[0], args[1], args[2]), "ListUnion" => Union(args[0], args[1]), "ResolveValueSet" => ResolveValueSet(args[0]), - "Retrieve" => Retrieve(args[0], args[1], args[2]), + "Retrieve" => Retrieve(args[0], args[1], args[2], args[3]), "Select" => Select(args[0], args[1]), "SelectMany" => SelectMany(source: args[0], collectionSelectorLambda: args[1]), "SelectManyResults" => SelectManyResults(source: args[0], collectionSelectorLambda: args[1], resultSelectorLambda: args[2]), diff --git a/Cql/Cql.Compiler/ExpressionBuilderContext.cs b/Cql/Cql.Compiler/ExpressionBuilderContext.cs index 7cabe39f1..902c51c27 100644 --- a/Cql/Cql.Compiler/ExpressionBuilderContext.cs +++ b/Cql/Cql.Compiler/ExpressionBuilderContext.cs @@ -145,7 +145,8 @@ internal Expression TranslateArg(TArg? arg) => { Expression expression => expression, Element element => TranslateElement(element), - var obj => Expression.Constant(obj), + null => NullExpression.ForType(), + _ => Expression.Constant(arg), }; private Expression TranslateElement(Element element) => @@ -938,23 +939,28 @@ private Expression Retrieve(Retrieve retrieve) codeProperty = NullExpression.ForType(); } + var templateId = TranslateArg(retrieve.templateId); + var sourceElementTypeExpr = Expression.Constant(sourceElementType, typeof(Type)); + Expression values = NullExpression.ForType(); + if (retrieve.codes != null) { if (retrieve.codes is ValueSetRef valueSetRef) { if (string.IsNullOrWhiteSpace(valueSetRef.name)) throw this.NewExpressionBuildingException($"The ValueSetRef at {valueSetRef.locator} is missing a name."); - var valueSet = InvokeDefinitionThroughRuntimeContext(valueSetRef.name!, valueSetRef.libraryName, typeof(CqlValueSet)); - return BindCqlOperator(CqlOperator.Retrieve, Expression.Constant(sourceElementType, typeof(Type)), valueSet, codeProperty); - } - // In this construct, instead of querying a value set, we're testing resources - // against a list of codes, e.g., as defined by the code from or codesystem construct - var codes = TranslateArg(retrieve.codes); - return BindCqlOperator(CqlOperator.Retrieve, Expression.Constant(sourceElementType, typeof(Type)), codes, codeProperty); + values = InvokeDefinitionThroughRuntimeContext(valueSetRef.name!, valueSetRef.libraryName, typeof(CqlValueSet)); + } + else + { + // In this construct, instead of querying a value set, we're testing resources + // against a list of codes, e.g., as defined by the code from or codesystem construct + values = TranslateArg(retrieve.codes); + } } - return BindCqlOperator(CqlOperator.Retrieve, Expression.Constant(sourceElementType, typeof(Type)), NullExpression.ForType(), codeProperty); + return BindCqlOperator(CqlOperator.Retrieve, sourceElementTypeExpr, values, codeProperty, templateId); } protected Expression Property(Property op) diff --git a/Cql/Cql.Operators/ICqlOperators.cs b/Cql/Cql.Operators/ICqlOperators.cs index 5673ab400..356dfbad7 100644 --- a/Cql/Cql.Operators/ICqlOperators.cs +++ b/Cql/Cql.Operators/ICqlOperators.cs @@ -575,5 +575,9 @@ public interface ICqlOperators #endregion } - public record RetrieveParameters(PropertyInfo? CodeProperty, CqlValueSet? ValueSet, IEnumerable? Codes); + public record RetrieveParameters( + PropertyInfo? CodeProperty, + CqlValueSet? ValueSet, + IEnumerable? Codes, + string? TemplateId); } \ No newline at end of file diff --git a/Cql/Cql.Operators/PublicAPI.Unshipped.txt b/Cql/Cql.Operators/PublicAPI.Unshipped.txt index 872fb16ef..266e8b923 100644 --- a/Cql/Cql.Operators/PublicAPI.Unshipped.txt +++ b/Cql/Cql.Operators/PublicAPI.Unshipped.txt @@ -513,9 +513,11 @@ Hl7.Cql.Operators.RetrieveParameters.CodeProperty.get -> System.Reflection.Prope Hl7.Cql.Operators.RetrieveParameters.CodeProperty.init -> void Hl7.Cql.Operators.RetrieveParameters.Codes.get -> System.Collections.Generic.IEnumerable? Hl7.Cql.Operators.RetrieveParameters.Codes.init -> void -Hl7.Cql.Operators.RetrieveParameters.Deconstruct(out System.Reflection.PropertyInfo? CodeProperty, out Hl7.Cql.Primitives.CqlValueSet? ValueSet, out System.Collections.Generic.IEnumerable? Codes) -> void +Hl7.Cql.Operators.RetrieveParameters.Deconstruct(out System.Reflection.PropertyInfo? CodeProperty, out Hl7.Cql.Primitives.CqlValueSet? ValueSet, out System.Collections.Generic.IEnumerable? Codes, out string? TemplateId) -> void Hl7.Cql.Operators.RetrieveParameters.RetrieveParameters(Hl7.Cql.Operators.RetrieveParameters! original) -> void -Hl7.Cql.Operators.RetrieveParameters.RetrieveParameters(System.Reflection.PropertyInfo? CodeProperty, Hl7.Cql.Primitives.CqlValueSet? ValueSet, System.Collections.Generic.IEnumerable? Codes) -> void +Hl7.Cql.Operators.RetrieveParameters.RetrieveParameters(System.Reflection.PropertyInfo? CodeProperty, Hl7.Cql.Primitives.CqlValueSet? ValueSet, System.Collections.Generic.IEnumerable? Codes, string? TemplateId) -> void +Hl7.Cql.Operators.RetrieveParameters.TemplateId.get -> string? +Hl7.Cql.Operators.RetrieveParameters.TemplateId.init -> void Hl7.Cql.Operators.RetrieveParameters.ValueSet.get -> Hl7.Cql.Primitives.CqlValueSet? Hl7.Cql.Operators.RetrieveParameters.ValueSet.init -> void override Hl7.Cql.Operators.RetrieveParameters.Equals(object? obj) -> bool diff --git a/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs b/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs index b897b7ab9..d88730332 100644 --- a/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs @@ -122,7 +122,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -179,7 +179,7 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_during_day_of_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_to_Document_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter ValidEncounter) { Code e_ = ValidEncounter?.StatusElement; @@ -232,7 +232,7 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Documentation_of_current_medications__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? g_(Procedure MedicationsDocumented) { DataType k_ = MedicationsDocumented?.Performed; @@ -273,7 +273,7 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Documentation_of_current_medications__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedurenotdone")); bool? g_(Procedure MedicationsNotDocumented) { bool? k_(Extension @this) diff --git a/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs b/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs index 034889ebf..aac0399fd 100644 --- a/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs +++ b/Demo/Measures.Authoring/CSharp/MultipleResourcesExample-0.0.1.g.cs @@ -88,7 +88,7 @@ public CqlCode[] LOINC() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -102,7 +102,7 @@ private IEnumerable Smoking_status_observation_Value() { CqlCode a_ = this.Tobacco_Smoking_Status(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? d_(Observation O) { Code f_ = O?.StatusElement; @@ -127,7 +127,7 @@ public IEnumerable Smoking_status_observation() => private IEnumerable Lung_cancer_diagnosis_Value() { CqlValueSet a_ = this.Lung_Cancer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition C) { CodeableConcept e_ = C?.ClinicalStatus; diff --git a/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs b/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs index 5620f769e..29d28ffbc 100644 --- a/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs +++ b/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs @@ -73,7 +73,7 @@ public CqlValueSet Marital_Status() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs b/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs index bebf3ba89..206d58f9f 100644 --- a/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs @@ -830,7 +830,7 @@ public CqlCode[] USCoreConditionCategoryExtensionCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs b/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs index 80866e18d..9934daa26 100644 --- a/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/Status-1.6.000.g.cs @@ -118,7 +118,7 @@ public CqlCode[] ConditionClinicalStatusCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs b/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs index 0a7038155..8112b0cf7 100644 --- a/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/SupplementalDataElements-3.4.000.g.cs @@ -88,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -225,7 +225,7 @@ DataType ag_(Extension @this) private IEnumerable<(CqlConcept code, CqlInterval period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer_Type(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); (CqlConcept code, CqlInterval period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs index c014759b3..13e323261 100644 --- a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs @@ -264,7 +264,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -328,23 +328,23 @@ public Patient Patient() => private IEnumerable Heart_Failure_Outpatient_Encounter_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); IEnumerable o_(Encounter QualifyingEncounter) { CqlValueSet s_ = this.Heart_Failure(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? u_(Condition HeartFailure) { CqlInterval y_ = QICoreCommon_2_0_000.prevalenceInterval(HeartFailure); @@ -387,7 +387,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter() => private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() { CqlValueSet a_ = this.Ejection_Fraction(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation EjectionFraction) { DataType n_ = EjectionFraction?.Value; @@ -410,11 +410,11 @@ private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() }; IEnumerable d_ = context.Operators.Where(b_, c_); CqlValueSet e_ = this.Moderate_or_Severe_LVSD(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable g_ = context.Operators.Union((d_ as IEnumerable), (f_ as IEnumerable)); CqlCode h_ = this.Left_ventricular_systolic_dysfunction__disorder_(); IEnumerable i_ = context.Operators.ToList(h_); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, i_)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, i_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition LVSDDiagnosis) { CodeableConcept y_ = LVSDDiagnosis?.Severity; @@ -473,7 +473,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter_with_History_of private bool? Has_Heart_Transplant_Complications_Value() { CqlValueSet a_ = this.Heart_Transplant_Complications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition HeartTransplantComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -518,7 +518,7 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Placement(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure LVADOutpatient) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -565,7 +565,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Complications_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Complications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition LVADComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -610,20 +610,20 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private IEnumerable Qualifying_Outpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Patient_Provider_Interaction(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter ValidEncounter) @@ -696,7 +696,7 @@ Encounter u_(Encounter Encounter2) => private bool? Has_Heart_Transplant_Value() { CqlValueSet a_ = this.Heart_Transplant(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure HeartTransplant) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); diff --git a/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs b/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs index 57b7c33e0..cc7a74759 100644 --- a/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs @@ -134,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -148,7 +148,7 @@ private IEnumerable Qualified_Scan_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation CTScan) { CqlInterval f_ = this.Measurement_Period(); @@ -183,7 +183,7 @@ private IEnumerable Initial_Population_Value() IEnumerable c_(Observation CTScan) { CqlValueSet f_ = this.Encounter_Inpatient(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? h_(Encounter InpatientEncounter) { CqlInterval l_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs b/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs index d0cff9713..362632799 100644 --- a/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs @@ -129,7 +129,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -142,24 +142,24 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.isEncounterPerformed(t_); bool? v_(Encounter ValidEncounter) diff --git a/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs b/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs index c9f7a8927..0cdefad73 100644 --- a/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs @@ -245,7 +245,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -258,8 +258,8 @@ public Patient Patient() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-devicerequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-devicerequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isDeviceOrder(e_); bool? g_(DeviceRequest FrailtyDeviceOrder) @@ -280,7 +280,7 @@ public Patient Patient() => bool? i_ = context.Operators.Exists(h_); CqlCode j_ = this.Medical_equipment_used(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable m_ = Status_1_6_000.isAssessmentPerformed(l_); bool? n_(Observation EquipmentUsed) { @@ -302,7 +302,7 @@ public Patient Patient() => bool? p_ = context.Operators.Exists(o_); bool? q_ = context.Operators.Or(i_, p_); CqlValueSet r_ = this.Frailty_Diagnosis(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? t_(Condition FrailtyDiagnosis) { CqlInterval bf_ = QICoreCommon_2_0_000.prevalenceInterval(FrailtyDiagnosis); @@ -315,7 +315,7 @@ public Patient Patient() => bool? v_ = context.Operators.Exists(u_); bool? w_ = context.Operators.Or(q_, v_); CqlValueSet x_ = this.Frailty_Encounter(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable z_ = Status_1_6_000.isEncounterPerformed(y_); bool? aa_(Encounter FrailtyEncounter) { @@ -331,7 +331,7 @@ public Patient Patient() => bool? ac_ = context.Operators.Exists(ab_); bool? ad_ = context.Operators.Or(w_, ac_); CqlValueSet ae_ = this.Frailty_Symptom(); - IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable ag_ = Status_1_6_000.isSymptom(af_); bool? ah_(Observation FrailtySymptom) { @@ -357,14 +357,14 @@ public Patient Patient() => private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Emergency_Department_Evaluation_and_Management_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Nonacute_Inpatient(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); IEnumerable l_ = Status_1_6_000.isEncounterPerformed(k_); @@ -447,7 +447,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t private bool? Has_Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter InpatientEncounter) { @@ -491,8 +491,8 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t private bool? Has_Dementia_Medications_in_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationActive(e_); bool? g_(MedicationRequest DementiaMedication) @@ -607,7 +607,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t bool? i_ = context.Operators.GreaterOrEqual(h_, 66); CqlCode j_ = this.Housing_status(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable m_ = Status_1_6_000.isAssessmentPerformed(l_); bool? n_(Observation HousingStatus) { diff --git a/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs b/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs index 234b2910d..664fcadc7 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs @@ -136,7 +136,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -194,7 +194,7 @@ private IEnumerable Qualifying_CTScan_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation CTScanResult) { CqlInterval f_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs index 88fa4ce4e..2da2619ee 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs @@ -134,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -147,7 +147,7 @@ public Patient Patient() => private IEnumerable Qualifying_Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter InpatientEncounter) { Period e_ = InpatientEncounter?.Period; @@ -223,7 +223,7 @@ private IEnumerable Initial_Population_Value() { CqlCode a_ = this.CT_dose_and_image_quality_category(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_(Observation CTScan) { IEnumerable f_ = this.Qualifying_Inpatient_Encounters(); diff --git a/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs b/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs index ecbe3fbba..dc78b8d09 100644 --- a/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs @@ -55,7 +55,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs b/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs index 93fd29131..4ebcb0458 100644 --- a/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AnticoagulationTherapyforAtrialFibrillationFlutterFHIR-0.3.000.g.cs @@ -200,7 +200,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -227,7 +227,7 @@ private IEnumerable Encounter_with_a_History_of_Atrial_Ablation_Value bool? b_(Encounter IschemicStrokeEncounter) { CqlValueSet l_ = this.Atrial_Ablation(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? n_(Procedure AtrialAblationProcedure) { Code q_ = AtrialAblationProcedure?.StatusElement; @@ -255,7 +255,7 @@ private IEnumerable Encounter_with_a_History_of_Atrial_Ablation_Value IEnumerable e_(Encounter IschemicStrokeEncounter) { CqlValueSet ad_ = this.History_of_Atrial_Ablation(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? af_(Condition AtrialAblationDiagnosis) { CodeableConcept aj_ = AtrialAblationDiagnosis?.VerificationStatus; @@ -290,7 +290,7 @@ Encounter ah_(Condition AtrialAblationDiagnosis) => IEnumerable i_(Encounter IschemicStrokeEncounter) { CqlValueSet bb_ = this.History_of_Atrial_Ablation(); - IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, bb_, default)); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, bb_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? bd_(Observation AtrialAblationObservation) { Code bh_ = AtrialAblationObservation?.StatusElement; @@ -387,7 +387,7 @@ private IEnumerable Encounter_with_Prior_or_Present_Diagnosis_of_Atri IEnumerable b_(Encounter IschemicStrokeEncounter) { CqlValueSet h_ = this.Atrial_Fibrillation_or_Flutter(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? j_(Condition AtrialFibrillationFlutter) { CodeableConcept n_ = AtrialFibrillationFlutter?.VerificationStatus; @@ -548,8 +548,8 @@ private IEnumerable Numerator_Value() IEnumerable b_(Encounter Encounter) { CqlValueSet d_ = this.Anticoagulant_Therapy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest DischargeAnticoagulant) { @@ -610,7 +610,7 @@ public IEnumerable Numerator() => private IEnumerable Documented_Reason_for_Not_Giving_Anticoagulant_at_Discharge_Value() { CqlValueSet a_ = this.Anticoagulant_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); bool? c_(MedicationRequest NoAnticoagulant) { List e_ = NoAnticoagulant?.ReasonCode; diff --git a/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs index 8bbd0d6db..efc31c82f 100644 --- a/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs @@ -226,7 +226,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -283,8 +283,8 @@ public CqlInterval Intake_Period() => private CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); bool? g_(MedicationDispense Antidepressant) @@ -329,7 +329,7 @@ public CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period() => private bool? Has_Initial_Major_Depression_Diagnosis_Value() { CqlValueSet a_ = this.Major_Depression(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition MajorDepression) { CqlDate f_ = this.Earliest_Antidepressant_Dispensed_During_Intake_Period(); @@ -361,32 +361,32 @@ public CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Annual_Wellness_Visit(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Nursing_Facility_Visit(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Psych_Visit_Psychotherapy(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Telephone_Visits(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Online_Assessments(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); bool? ad_(Encounter ValidEncounter) @@ -454,8 +454,8 @@ public IEnumerable Qualifying_Encounters() => { bool? a_ = Hospice_6_9_000.Has_Hospice_Services(); CqlValueSet b_ = this.Antidepressant_Medication(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable g_ = Status_1_6_000.Active_Medication(f_); bool? h_(MedicationRequest ActiveAntidepressant) @@ -507,8 +507,8 @@ CqlInterval u_(object Meds) private IEnumerable> Antidepressant_Medication_Period_Between_IPSD_and_114_Days_After_IPSD_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); CqlInterval g_(MedicationDispense Antidepressant) @@ -558,8 +558,8 @@ public IEnumerable> Antidepressant_Medication_Period_Betwee private IEnumerable> Antidepressant_Medication_Period_Between_IPSD_and_231_Days_After_IPSD_Value() { CqlValueSet a_ = this.Antidepressant_Medication(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationdispense")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Dispensed_Medication(e_); CqlInterval g_(MedicationDispense Antidepressant) diff --git a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs index ff10a5d6c..0eadb19a2 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs @@ -698,7 +698,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -755,11 +755,11 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter E) { List x_ = E?.Type; @@ -785,17 +785,17 @@ CqlConcept y_(CodeableConcept @this) }; IEnumerable h_ = context.Operators.Where(f_, g_); CqlValueSet i_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Outpatient_Consultation(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet o_ = this.Online_Assessments(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Telephone_Visits(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable u_ = context.Operators.Union(r_, t_); bool? v_(Encounter ValidEncounters) { @@ -857,7 +857,7 @@ public IEnumerable Qualifying_Encounter() => private Observation First_BMI_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bmi")); IEnumerable b_ = Status_1_6_000.BMI(a_); bool? c_(Observation BMIRatio) { @@ -922,7 +922,7 @@ private Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_T { CqlCode a_ = this.Alcoholic_drinks_per_drinking_day___Reported(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation AverageDrinks) { @@ -978,7 +978,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteoporosis_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteoporosis(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition OsteoporosisDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteoporosisDiagnosis); @@ -1002,7 +1002,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteopenia_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteopenia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition OsteopeniaDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteopeniaDiagnosis); @@ -1039,7 +1039,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private IEnumerable Parent_History_of_Hip_Fracture_Assessment_Value() { CqlValueSet a_ = this.History_of_hip_fracture_in_parent(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Survey_Observation(b_); bool? d_(Observation ParentFractureHistory) { @@ -1065,7 +1065,7 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => private bool? Has_Risk_Factor_Any_Time_in_History_Prior_to_Measurement_Period_and_Do_Not_Need_to_be_Active_During_Measurement_Period_Value() { CqlValueSet a_ = this.Gastric_Bypass_Surgery(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure GastricBypass) { @@ -1081,8 +1081,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Aromatase_Inhibitors(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = Status_1_6_000.Active_Medication(j_); bool? l_(MedicationRequest AromataseInhibitorActive) @@ -1098,8 +1098,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable m_ = context.Operators.Where(k_, l_); IEnumerable n_ = context.Operators.Union((e_ as IEnumerable), (m_ as IEnumerable)); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = Status_1_6_000.Active_or_Completed_Medication_Request(s_); bool? u_(MedicationRequest AromataseInhibitorOrder) @@ -1150,8 +1150,8 @@ bool as_() private int? Glucocorticoid_Active_Medication_Duration_in_Days_Value() { CqlValueSet a_ = this.Glucocorticoids__oral_only_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Medication(e_); bool? g_(MedicationRequest OralGlucocorticoid) @@ -1256,16 +1256,16 @@ public IEnumerable ProcedureInPatientHistory(IEnumerable P private bool? Has_Double_or_Bilateral_Oophorectomy_Value() { CqlValueSet a_ = this.Bilateral_Oophorectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = this.ProcedureInPatientHistory(b_); bool? d_ = context.Operators.Exists(c_); CqlValueSet e_ = this.Evidence_of_Bilateral_Oophorectomy(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable g_ = this.ProcedureInPatientHistory(f_); bool? h_ = context.Operators.Exists(g_); bool? i_ = context.Operators.Or(d_, h_); CqlValueSet j_ = this.Unilateral_Oophorectomy__Unspecified_Laterality(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? l_(Procedure UnilateralOophorectomy) { List ad_ = UnilateralOophorectomy?.BodySite; @@ -1291,11 +1291,11 @@ CqlConcept ae_(CodeableConcept @this) }; IEnumerable m_ = context.Operators.Where(k_, l_); CqlValueSet n_ = this.Unilateral_Oophorectomy_Right(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = this.ProcedureInPatientHistory(p_); bool? r_ = context.Operators.Exists(q_); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? u_(Procedure UnilateralOophorectomy) { List an_ = UnilateralOophorectomy?.BodySite; @@ -1321,7 +1321,7 @@ CqlConcept ao_(CodeableConcept @this) }; IEnumerable v_ = context.Operators.Where(t_, u_); CqlValueSet w_ = this.Unilateral_Oophorectomy_Left(); - IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable y_ = context.Operators.Union(v_, x_); IEnumerable z_ = this.ProcedureInPatientHistory(y_); bool? aa_ = context.Operators.Exists(z_); @@ -1338,12 +1338,12 @@ CqlConcept ao_(CodeableConcept @this) private bool? Has_Organ_Transplants_Value() { CqlValueSet a_ = this.Major_Transplant(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); CqlValueSet c_ = this.Kidney_Transplant(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Bone_Marrow_Transplant(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = this.ProcedureInPatientHistory(h_); bool? j_ = context.Operators.Exists(i_); @@ -1359,69 +1359,69 @@ CqlConcept ao_(CodeableConcept @this) { bool? a_ = this.Has_90_or_More_Active_Glucocorticoid_Medication_Days(); CqlValueSet b_ = this.Osteoporotic_Fractures(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet d_ = this.Malabsorption_Syndromes(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(c_, e_); CqlValueSet g_ = this.Chronic_Malnutrition(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet i_ = this.Chronic_Liver_Disease(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(f_, k_); CqlValueSet m_ = this.Rheumatoid_Arthritis(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet o_ = this.Hyperthyroidism(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Type_1_Diabetes(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet u_ = this.End_Stage_Renal_Disease(); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable w_ = context.Operators.Union(t_, v_); IEnumerable x_ = context.Operators.Union(r_, w_); CqlValueSet y_ = this.Osteogenesis_Imperfecta(); - IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet aa_ = this.Ankylosing_Spondylitis(); - IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ac_ = context.Operators.Union(z_, ab_); IEnumerable ad_ = context.Operators.Union(x_, ac_); CqlValueSet ae_ = this.Psoriatic_Arthritis(); - IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ag_ = this.Ehlers_Danlos_Syndrome(); - IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ai_ = context.Operators.Union(af_, ah_); IEnumerable aj_ = context.Operators.Union(ad_, ai_); CqlValueSet ak_ = this.Cushings_Syndrome(); - IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default)); + IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet am_ = this.Hyperparathyroidism(); - IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ao_ = context.Operators.Union(al_, an_); IEnumerable ap_ = context.Operators.Union(aj_, ao_); CqlValueSet aq_ = this.Marfans_Syndrome(); - IEnumerable ar_ = context.Operators.Retrieve(new RetrieveParameters(default, aq_, default)); + IEnumerable ar_ = context.Operators.Retrieve(new RetrieveParameters(default, aq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet as_ = this.Lupus(); - IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable au_ = context.Operators.Union(ar_, at_); IEnumerable av_ = context.Operators.Union(ap_, au_); CqlValueSet aw_ = this.Multiple_Myeloma(); - IEnumerable ax_ = context.Operators.Retrieve(new RetrieveParameters(default, aw_, default)); + IEnumerable ax_ = context.Operators.Retrieve(new RetrieveParameters(default, aw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ay_ = this.Premature_Menopause(); - IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default)); + IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ba_ = context.Operators.Union(ax_, az_); IEnumerable bb_ = context.Operators.Union(av_, ba_); CqlValueSet bc_ = this.Eating_Disorders(); - IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet be_ = this.Amenorrhea(); - IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default)); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bg_ = context.Operators.Union(bd_, bf_); IEnumerable bh_ = context.Operators.Union(bb_, bg_); IEnumerable bi_ = this.DiagnosisInPatientHistory(bh_); bool? bj_ = context.Operators.Exists(bi_); bool? bk_ = context.Operators.Or(a_, bj_); CqlValueSet bl_ = this.Chemotherapy(); - IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bl_, default)); + IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable bn_ = this.ProcedureInPatientHistory(bm_); bool? bo_ = context.Operators.Exists(bn_); bool? bp_ = context.Operators.Or(bk_, bo_); @@ -1457,7 +1457,7 @@ CqlConcept ao_(CodeableConcept @this) private IEnumerable DXA_Scan_Order_During_Measurement_Period_Value() { CqlValueSet a_ = this.DXA__Dual_energy_Xray_Absorptiometry__Scan(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest DXA) { @@ -1502,7 +1502,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ { CqlCode a_ = this.Major_osteoporotic_fracture_10_year_probability__Likelihood__Fracture_Risk_Assessment(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation FRAX) { @@ -1516,7 +1516,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable f_ = context.Operators.Where(d_, e_); CqlCode g_ = this.Osteoporosis_Risk_Assessment_Instrument(); IEnumerable h_ = context.Operators.ToList(g_); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable j_ = Status_1_6_000.Final_Survey_Observation(i_); bool? k_(Observation ORAI) { @@ -1530,7 +1530,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable m_ = context.Operators.Union(f_, l_); CqlCode n_ = this.Osteoporosis_Index_of_Risk_panel(); IEnumerable o_ = context.Operators.ToList(n_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable q_ = Status_1_6_000.Final_Survey_Observation(p_); bool? r_(Observation OSIRIS) { @@ -1544,7 +1544,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable s_ = context.Operators.Where(q_, r_); CqlCode t_ = this.Osteoporosis_Self_Assessment_Tool(); IEnumerable u_ = context.Operators.ToList(t_); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable w_ = Status_1_6_000.Final_Survey_Observation(v_); bool? x_(Observation OST) { diff --git a/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs index b8988fe4d..66a0da259 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs @@ -356,7 +356,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -413,8 +413,8 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable c_ = context.Operators.Retrieve(default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? d_(Encounter E) { List bg_ = E?.Type; @@ -440,37 +440,37 @@ CqlConcept bh_(CodeableConcept @this) }; IEnumerable e_ = context.Operators.Where(c_, d_); IEnumerable f_ = context.Operators.Union(b_, e_); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet i_ = this.Home_Healthcare_Services(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(f_, k_); CqlValueSet m_ = this.Initial_Hospital_Observation_Care(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet o_ = this.Medical_Disability_Exam(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Observation(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet u_ = this.Office_Visit(); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable w_ = context.Operators.Union(t_, v_); IEnumerable x_ = context.Operators.Union(r_, w_); CqlValueSet y_ = this.Telephone_Visits(); - IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet aa_ = this.Online_Assessments(); - IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ac_ = context.Operators.Union(z_, ab_); IEnumerable ad_ = context.Operators.Union(x_, ac_); CqlValueSet ae_ = this.Outpatient_Consultation(); - IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet ag_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ai_ = context.Operators.Union(af_, ah_); IEnumerable aj_ = context.Operators.Union(ad_, ai_); CqlValueSet ak_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default)); + IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? an_(Encounter E) { List bq_ = E?.Type; @@ -498,15 +498,15 @@ CqlConcept br_(CodeableConcept @this) IEnumerable ap_ = context.Operators.Union(al_, ao_); IEnumerable aq_ = context.Operators.Union(aj_, ap_); CqlValueSet ar_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet at_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, at_, default)); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, at_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable av_ = context.Operators.Union(as_, au_); IEnumerable aw_ = context.Operators.Union(aq_, av_); CqlValueSet ax_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ax_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ax_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet az_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, az_, default)); + IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, az_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable bb_ = context.Operators.Union(ay_, ba_); IEnumerable bc_ = context.Operators.Union(aw_, bb_); IEnumerable bd_ = Status_1_6_000.Finished_Encounter(bc_); @@ -535,8 +535,8 @@ private IEnumerable Encounter_With_Antibiotic_Ordered_Within_Three_Da IEnumerable b_(Encounter EDOrAmbulatoryVisit) { CqlValueSet d_ = this.Antibiotic_Medications_for_Pharyngitis(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Active_Medication(h_); bool? j_(MedicationRequest AntibioticOrdered) @@ -577,9 +577,9 @@ public IEnumerable Encounter_With_Antibiotic_Ordered_Within_Three_Day private IEnumerable Pharyngitis_or_Tonsillitis_Value() { CqlValueSet a_ = this.Acute_Pharyngitis(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.Acute_Tonsillitis(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Condition(e_); @@ -688,16 +688,16 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable a_ = this.In_Hospice(); IEnumerable b_ = this.Encounter_With_Pharyngitis_or_Tonsillitis_With_Antibiotic(); CqlValueSet c_ = this.Antibiotic_Medications_for_Pharyngitis(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable g_ = context.Operators.Union(d_, f_); IEnumerable h_ = Antibiotic_1_5_000.Has_Antibiotic_Medication_History(b_, g_); IEnumerable i_ = context.Operators.Union(a_, h_); CqlValueSet k_ = this.Competing_Conditions_for_Respiratory_Conditions(); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable m_ = Antibiotic_1_5_000.Has_Competing_Diagnosis_History(b_, l_); CqlValueSet o_ = this.Comorbid_Conditions_for_Respiratory_Conditions(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable q_ = Antibiotic_1_5_000.Has_Comorbid_Condition_History(b_, p_); IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(i_, r_); @@ -712,7 +712,7 @@ public IEnumerable Denominator_Exclusions() => private IEnumerable Group_A_Streptococcus_Lab_Test_With_Result_Value() { CqlValueSet a_ = this.Group_A_Streptococcus_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation GroupAStreptococcusTest) { diff --git a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs index e9a5b8779..7d9d9c4e9 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs @@ -486,7 +486,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -499,7 +499,7 @@ public Patient Patient() => private IEnumerable ED_Encounter_with_Encounter_Diagnosis_of_STEMI_Value() { CqlValueSet a_ = this.ED(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EDEncounter) { Code e_ = EDEncounter?.StatusElement; @@ -555,11 +555,11 @@ public IEnumerable ED_Encounter_with_Encounter_Diagnosis_of_STEMI() = private IEnumerable ED_Encounter_with_Diagnosis_of_STEMI_Value() { CqlValueSet a_ = this.ED(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_(Encounter EDEncounter) { CqlValueSet e_ = this.STEMI(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? g_(Condition DxSTEMI) { CodeableConcept k_ = DxSTEMI?.ClinicalStatus; @@ -663,7 +663,7 @@ private IEnumerable Allergy_or_Intolerance_to_Thrombolytic_Medication IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Thrombolytic_medications(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-allergyintolerance")); bool? f_(AllergyIntolerance ThrombolyticAllergy) { CodeableConcept j_ = ThrombolyticAllergy?.ClinicalStatus; @@ -703,7 +703,7 @@ private IEnumerable Adverse_Effect_to_Thrombolytic_Medications_Before IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Adverse_reaction_to_thrombolytics(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-adverseevent")); bool? f_(AdverseEvent ThrombolyticAdverseEvent) { FhirDateTime j_ = ThrombolyticAdverseEvent?.RecordedDateElement; @@ -742,20 +742,20 @@ private IEnumerable Active_Exclusion_Diagnosis_at_Start_of_ED_Encount IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Active_Bleeding_Excluding_Menses_or_Bleeding_Diathesis(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet f_ = this.Malignant_Intracranial_Neoplasm_Group(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Cerebral_Vascular_Lesion(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet k_ = this.Dementia(); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); CqlValueSet o_ = this.Pregnancy_ICD10_SNOMEDCT(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet q_ = this.Allergy_to_thrombolytics(); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = context.Operators.Union(n_, s_); bool? u_(Condition ActiveExclusionDx) @@ -789,8 +789,8 @@ private IEnumerable Active_Oral_Anticoagulant_Medication_at_the_Start IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Oral_Anticoagulant_Medications(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest OralAnticoagulant) { @@ -835,12 +835,12 @@ private IEnumerable Exclusion_Diagnosis_During_ED_Encounter_or_Within IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Aortic_Dissection_and_Rupture(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet f_ = this.Neurologic_impairment(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Cardiopulmonary_Arrest(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable k_ = context.Operators.Union(h_, j_); bool? l_(Condition ExclusionDiagnosis) { @@ -888,7 +888,7 @@ private IEnumerable Major_Surgical_Procedure_21_Days_or_Less_Before_S IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Major_Surgical_Procedure(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure MajorSurgery) { DataType j_ = MajorSurgery?.Performed; @@ -938,9 +938,9 @@ private IEnumerable Intubation_or_Mechanical_Circulatory_Assist_Proce IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Endotracheal_Intubation(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); CqlValueSet f_ = this.Insertion_or_Replacement_of_Mechanical_Circulatory_Assist_Device(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Procedure AirwayProcedure) { @@ -997,14 +997,14 @@ private IEnumerable Active_Exclusion_Diagnosis_Within_90_Days_Before_ IEnumerable b_(Encounter EDwSTEMI) { CqlValueSet d_ = this.Ischemic_Stroke(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet f_ = this.Closed_Head_and_Facial_Trauma(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Active_Peptic_Ulcer(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet k_ = this.Cardiopulmonary_Arrest(); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); bool? o_(Condition ExclusionCondition) @@ -1045,7 +1045,7 @@ private IEnumerable Intracranial_or_Intraspinal_Procedure_90_Days_or_ IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Intracranial_or_Intraspinal_surgery(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure CranialorSpinalSurgery) { DataType j_ = CranialorSpinalSurgery?.Performed; @@ -1177,8 +1177,8 @@ private IEnumerable Fibrinolytic_Therapy_within_30_Minutes_of_Arrival IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Fibrinolytic_Therapy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationAdministration Fibrinolytic) { @@ -1223,7 +1223,7 @@ private IEnumerable PCI_within_90_Minutes_of_Arrival_Value() IEnumerable b_(Encounter EDwithSTEMI) { CqlValueSet d_ = this.Percutaneous_Coronary_Intervention(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure PCI) { DataType j_ = PCI?.Performed; diff --git a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs index 625862e33..1a07bf684 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs @@ -310,7 +310,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -367,49 +367,49 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Emergency_Department_Evaluation_and_Management_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Initial_Hospital_Observation_Care(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Medical_Disability_Exam(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Observation(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Office_Visit(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Outpatient_Consultation(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet af_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ah_ = context.Operators.Union(ae_, ag_); IEnumerable ai_ = context.Operators.Union(ac_, ah_); CqlValueSet aj_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet al_ = this.Telephone_Visits(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = context.Operators.Union(ai_, an_); CqlValueSet ap_ = this.Online_Assessments(); - IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); - IEnumerable ar_ = context.Operators.Retrieve(default); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); + IEnumerable ar_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? as_(Encounter E) { List az_ = E?.Type; @@ -466,7 +466,7 @@ private IEnumerable Encounter_with_Upper_Respiratory_Infection_Value( { IEnumerable a_ = this.Qualifying_Encounters(); CqlValueSet b_ = this.Upper_Respiratory_Infection(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounters, Condition URI)? e_(ValueTuple _valueTuple) { @@ -565,16 +565,16 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable a_ = this.Encounters_and_Assessments_with_Hospice_Patient(); IEnumerable b_ = this.Encounter_with_Upper_Respiratory_Infection(); CqlValueSet c_ = this.Comorbid_Conditions_for_Respiratory_Conditions(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = Antibiotic_1_5_000.Has_Comorbid_Condition_History(b_, d_); IEnumerable f_ = context.Operators.Union(a_, e_); CqlValueSet h_ = this.Antibiotic_Medications_for_Upper_Respiratory_Infection(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = Antibiotic_1_5_000.Has_Antibiotic_Medication_History(b_, l_); CqlValueSet o_ = this.Competing_Conditions_for_Respiratory_Conditions(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable q_ = Antibiotic_1_5_000.Has_Competing_Diagnosis_History(b_, p_); IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(f_, r_); @@ -592,8 +592,8 @@ private IEnumerable Numerator_Value() IEnumerable c_(Encounter EncounterWithURI) { CqlValueSet h_ = this.Antibiotic_Medications_for_Upper_Respiratory_Infection(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable l_ = context.Operators.Union(i_, k_); bool? m_(MedicationRequest OrderedAntibiotic) { diff --git a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs index cc3949c2e..e6678057a 100644 --- a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs @@ -120,7 +120,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -133,7 +133,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -201,7 +201,7 @@ public CqlInterval ToDateInterval(CqlInterval period) public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -248,7 +248,7 @@ object e_(Encounter @this) public Encounter edVisit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -614,7 +614,7 @@ object b_(Encounter.LocationComponent @this) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getLocation()` instead.")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -705,14 +705,14 @@ public CqlInterval HospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -723,7 +723,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -769,7 +769,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract((ef_ ?? ei_), ej_); - IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -814,7 +814,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, (eu_ ?? ex_), true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -878,7 +878,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -924,7 +924,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract((bb_ ?? (bl_ ?? bo_)), bp_); - IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -935,7 +935,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -981,7 +981,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract((kj_ ?? km_), kn_); - IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1026,7 +1026,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, (ky_ ?? lb_), true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1089,7 +1089,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -1134,7 +1134,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, (ca_ ?? (ck_ ?? cn_)), true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -1145,7 +1145,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -1191,7 +1191,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract((qn_ ?? qq_), qr_); - IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -1236,7 +1236,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, (rc_ ?? rf_), true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -1299,7 +1299,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -1362,7 +1362,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -1373,7 +1373,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -1419,7 +1419,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract((wu_ ?? wx_), wy_); - IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -1464,7 +1464,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, (xj_ ?? xm_), true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -1528,7 +1528,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -1594,14 +1594,14 @@ public CqlInterval hospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -1612,7 +1612,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -1658,7 +1658,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract((ef_ ?? ei_), ej_); - IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -1703,7 +1703,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, (eu_ ?? ex_), true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default)); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -1767,7 +1767,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -1813,7 +1813,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract((bb_ ?? (bl_ ?? bo_)), bp_); - IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -1824,7 +1824,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -1870,7 +1870,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract((kj_ ?? km_), kn_); - IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1915,7 +1915,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, (ky_ ?? lb_), true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default)); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1978,7 +1978,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -2023,7 +2023,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, (ca_ ?? (ck_ ?? cn_)), true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -2034,7 +2034,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -2080,7 +2080,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract((qn_ ?? qq_), qr_); - IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -2125,7 +2125,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, (rc_ ?? rf_), true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -2188,7 +2188,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default)); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -2251,7 +2251,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -2262,7 +2262,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -2308,7 +2308,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract((wu_ ?? wx_), wy_); - IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -2353,7 +2353,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, (xj_ ?? xm_), true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default)); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -2417,7 +2417,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -2484,7 +2484,7 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2495,7 +2495,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2541,7 +2541,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract((av_ ?? ay_), az_); - IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2586,7 +2586,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, (bk_ ?? bn_), true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2650,7 +2650,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -2716,7 +2716,7 @@ public CqlInterval hospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2727,7 +2727,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2773,7 +2773,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract((av_ ?? ay_), az_); - IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2818,7 +2818,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, (bk_ ?? bn_), true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2882,7 +2882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -3054,7 +3054,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3084,7 +3084,7 @@ public IEnumerable encounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3112,7 +3112,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getCondition()` instead")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3134,7 +3134,7 @@ public Condition GetCondition(ResourceReference reference) [CqlTag("description", "Returns the Condition resource for the given reference")] public Condition getCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3169,7 +3169,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.Retrieve(default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3209,7 +3209,7 @@ public Condition principalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.Retrieve(default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3237,7 +3237,7 @@ Condition d_(Encounter.DiagnosisComponent PD) [CqlTag("description", "Returns the Location resource specified by the given reference.")] public Location getLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -3279,7 +3279,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.Retrieve(default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medication")); bool? i_(Medication M) { Id n_ = M?.IdElement; @@ -3328,7 +3328,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.Retrieve(default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medication")); bool? i_(Medication M) { Id n_ = M?.IdElement; diff --git a/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs index 7cbefe1ae..701a9247c 100644 --- a/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs @@ -160,7 +160,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -173,20 +173,20 @@ public Patient Patient() => private bool? Has_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter Encounter) @@ -216,7 +216,7 @@ public Patient Patient() => private (string ID, CqlDateTime AuthorDate)? First_Referral_during_First_10_Months_of_Measurement_Period_Value() { CqlValueSet a_ = this.Referral(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); bool? c_(ServiceRequest ReferralOrder) { Code j_ = ReferralOrder?.StatusElement; @@ -364,7 +364,7 @@ string b_(ResourceReference Task) private bool? Referring_Clinician_Receives_Consultant_Report_to_Close_Referral_Loop_Value() { CqlValueSet a_ = this.Consultant_Report(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-task")); IEnumerable c_(Task ConsultantReportObtained) { (string ID, CqlDateTime AuthorDate)? f_ = this.First_Referral_during_First_10_Months_of_Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs index c704fd31e..e2a27f822 100644 --- a/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs @@ -682,7 +682,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -695,7 +695,7 @@ public Patient Patient() => private IEnumerable Cataract_Surgery_Between_January_and_September_of_Measurement_Period_Value() { CqlValueSet a_ = this.Cataract_Surgery(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? c_(Procedure CataractSurgery) { CqlInterval e_ = this.Measurement_Period(); @@ -771,168 +771,168 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable b_(Procedure CataractSurgeryPerformed) { CqlValueSet d_ = this.Acute_and_Subacute_Iridocyclitis(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet f_ = this.Amblyopia(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Burn_Confined_to_Eye_and_Adnexa(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet k_ = this.Cataract_Secondary_to_Ocular_Disorders(); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable m_ = context.Operators.Union(j_, l_); IEnumerable n_ = context.Operators.Union(h_, m_); CqlValueSet o_ = this.Cataract_Congenital(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet q_ = this.Cataract_Mature_or_Hypermature(); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = context.Operators.Union(n_, s_); CqlValueSet u_ = this.Cataract_Posterior_Polar(); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet w_ = this.Central_Corneal_Ulcer(); - IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable y_ = context.Operators.Union(v_, x_); IEnumerable z_ = context.Operators.Union(t_, y_); CqlValueSet aa_ = this.Certain_Types_of_Iridocyclitis(); - IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ac_ = this.Choroidal_Degenerations(); - IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default)); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ae_ = context.Operators.Union(ab_, ad_); IEnumerable af_ = context.Operators.Union(z_, ae_); CqlValueSet ag_ = this.Choroidal_Detachment(); - IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default)); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ai_ = this.Choroidal_Hemorrhage_and_Rupture(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ak_ = context.Operators.Union(ah_, aj_); IEnumerable al_ = context.Operators.Union(af_, ak_); CqlValueSet am_ = this.Chronic_Iridocyclitis(); - IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default)); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ao_ = this.Cloudy_Cornea(); - IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default)); + IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable aq_ = context.Operators.Union(an_, ap_); IEnumerable ar_ = context.Operators.Union(al_, aq_); CqlValueSet as_ = this.Corneal_Edema(); - IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default)); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet au_ = this.Disorders_of_Cornea_Including_Corneal_Opacity(); - IEnumerable av_ = context.Operators.Retrieve(new RetrieveParameters(default, au_, default)); + IEnumerable av_ = context.Operators.Retrieve(new RetrieveParameters(default, au_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable aw_ = context.Operators.Union(at_, av_); IEnumerable ax_ = context.Operators.Union(ar_, aw_); CqlValueSet ay_ = this.Degeneration_of_Macula_and_Posterior_Pole(); - IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default)); + IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ba_ = this.Degenerative_Disorders_of_Globe(); - IEnumerable bb_ = context.Operators.Retrieve(new RetrieveParameters(default, ba_, default)); + IEnumerable bb_ = context.Operators.Retrieve(new RetrieveParameters(default, ba_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bc_ = context.Operators.Union(az_, bb_); IEnumerable bd_ = context.Operators.Union(ax_, bc_); CqlValueSet be_ = this.Diabetic_Macular_Edema(); - IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default)); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet bg_ = this.Diabetic_Retinopathy(); - IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, bg_, default)); + IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, bg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bi_ = context.Operators.Union(bf_, bh_); IEnumerable bj_ = context.Operators.Union(bd_, bi_); CqlValueSet bk_ = this.Disorders_of_Optic_Chiasm(); - IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, bk_, default)); + IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, bk_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet bm_ = this.Disorders_of_Visual_Cortex(); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, bm_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, bm_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bo_ = context.Operators.Union(bl_, bn_); IEnumerable bp_ = context.Operators.Union(bj_, bo_); CqlValueSet bq_ = this.Disseminated_Chorioretinitis_and_Disseminated_Retinochoroiditis(); - IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, bq_, default)); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, bq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet bs_ = this.Focal_Chorioretinitis_and_Focal_Retinochoroiditis(); - IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, bs_, default)); + IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, bs_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bu_ = context.Operators.Union(br_, bt_); IEnumerable bv_ = context.Operators.Union(bp_, bu_); CqlValueSet bw_ = this.Glaucoma(); - IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet by_ = this.Glaucoma_Associated_with_Congenital_Anomalies_and_Dystrophies_and_Systemic_Syndromes(); - IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, by_, default)); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, by_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ca_ = context.Operators.Union(bx_, bz_); IEnumerable cb_ = context.Operators.Union(bv_, ca_); CqlValueSet cc_ = this.Hereditary_Choroidal_Dystrophies(); - IEnumerable cd_ = context.Operators.Retrieve(new RetrieveParameters(default, cc_, default)); + IEnumerable cd_ = context.Operators.Retrieve(new RetrieveParameters(default, cc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ce_ = this.Hereditary_Corneal_Dystrophies(); - IEnumerable cf_ = context.Operators.Retrieve(new RetrieveParameters(default, ce_, default)); + IEnumerable cf_ = context.Operators.Retrieve(new RetrieveParameters(default, ce_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable cg_ = context.Operators.Union(cd_, cf_); IEnumerable ch_ = context.Operators.Union(cb_, cg_); CqlValueSet ci_ = this.Hereditary_Retinal_Dystrophies(); - IEnumerable cj_ = context.Operators.Retrieve(new RetrieveParameters(default, ci_, default)); + IEnumerable cj_ = context.Operators.Retrieve(new RetrieveParameters(default, ci_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ck_ = this.Hypotony_of_Eye(); - IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, ck_, default)); + IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, ck_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable cm_ = context.Operators.Union(cj_, cl_); IEnumerable cn_ = context.Operators.Union(ch_, cm_); CqlValueSet co_ = this.Injury_to_Optic_Nerve_and_Pathways(); - IEnumerable cp_ = context.Operators.Retrieve(new RetrieveParameters(default, co_, default)); + IEnumerable cp_ = context.Operators.Retrieve(new RetrieveParameters(default, co_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet cq_ = this.Macular_Scar_of_Posterior_Polar(); - IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, cq_, default)); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, cq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable cs_ = context.Operators.Union(cp_, cr_); IEnumerable ct_ = context.Operators.Union(cn_, cs_); CqlValueSet cu_ = this.Morgagnian_Cataract(); - IEnumerable cv_ = context.Operators.Retrieve(new RetrieveParameters(default, cu_, default)); + IEnumerable cv_ = context.Operators.Retrieve(new RetrieveParameters(default, cu_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet cw_ = this.Nystagmus_and_Other_Irregular_Eye_Movements(); - IEnumerable cx_ = context.Operators.Retrieve(new RetrieveParameters(default, cw_, default)); + IEnumerable cx_ = context.Operators.Retrieve(new RetrieveParameters(default, cw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable cy_ = context.Operators.Union(cv_, cx_); IEnumerable cz_ = context.Operators.Union(ct_, cy_); CqlValueSet da_ = this.Open_Wound_of_Eyeball(); - IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, da_, default)); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, da_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet dc_ = this.Optic_Atrophy(); - IEnumerable dd_ = context.Operators.Retrieve(new RetrieveParameters(default, dc_, default)); + IEnumerable dd_ = context.Operators.Retrieve(new RetrieveParameters(default, dc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable de_ = context.Operators.Union(db_, dd_); IEnumerable df_ = context.Operators.Union(cz_, de_); CqlValueSet dg_ = this.Optic_Neuritis(); - IEnumerable dh_ = context.Operators.Retrieve(new RetrieveParameters(default, dg_, default)); + IEnumerable dh_ = context.Operators.Retrieve(new RetrieveParameters(default, dg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet di_ = this.Other_and_Unspecified_Forms_of_Chorioretinitis_and_Retinochoroiditis(); - IEnumerable dj_ = context.Operators.Retrieve(new RetrieveParameters(default, di_, default)); + IEnumerable dj_ = context.Operators.Retrieve(new RetrieveParameters(default, di_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable dk_ = context.Operators.Union(dh_, dj_); IEnumerable dl_ = context.Operators.Union(df_, dk_); CqlValueSet dm_ = this.Other_Background_Retinopathy_and_Retinal_Vascular_Changes(); - IEnumerable dn_ = context.Operators.Retrieve(new RetrieveParameters(default, dm_, default)); + IEnumerable dn_ = context.Operators.Retrieve(new RetrieveParameters(default, dm_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet do_ = this.Other_Disorders_of_Optic_Nerve(); - IEnumerable dp_ = context.Operators.Retrieve(new RetrieveParameters(default, do_, default)); + IEnumerable dp_ = context.Operators.Retrieve(new RetrieveParameters(default, do_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable dq_ = context.Operators.Union(dn_, dp_); IEnumerable dr_ = context.Operators.Union(dl_, dq_); CqlValueSet ds_ = this.Other_Endophthalmitis(); - IEnumerable dt_ = context.Operators.Retrieve(new RetrieveParameters(default, ds_, default)); + IEnumerable dt_ = context.Operators.Retrieve(new RetrieveParameters(default, ds_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet du_ = this.Other_Proliferative_Retinopathy(); - IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); + IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable dw_ = context.Operators.Union(dt_, dv_); IEnumerable dx_ = context.Operators.Union(dr_, dw_); CqlValueSet dy_ = this.Pathologic_Myopia(); - IEnumerable dz_ = context.Operators.Retrieve(new RetrieveParameters(default, dy_, default)); + IEnumerable dz_ = context.Operators.Retrieve(new RetrieveParameters(default, dy_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ea_ = this.Posterior_Lenticonus(); - IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); + IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ec_ = context.Operators.Union(dz_, eb_); IEnumerable ed_ = context.Operators.Union(dx_, ec_); CqlValueSet ee_ = this.Prior_Penetrating_Keratoplasty(); - IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default)); + IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet eg_ = this.Purulent_Endophthalmitis(); - IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); + IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ei_ = context.Operators.Union(ef_, eh_); IEnumerable ej_ = context.Operators.Union(ed_, ei_); CqlValueSet ek_ = this.Retinal_Detachment_with_Retinal_Defect(); - IEnumerable el_ = context.Operators.Retrieve(new RetrieveParameters(default, ek_, default)); + IEnumerable el_ = context.Operators.Retrieve(new RetrieveParameters(default, ek_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet em_ = this.Retinal_Vascular_Occlusion(); - IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); + IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable eo_ = context.Operators.Union(el_, en_); IEnumerable ep_ = context.Operators.Union(ej_, eo_); CqlValueSet eq_ = this.Retrolental_Fibroplasias(); - IEnumerable er_ = context.Operators.Retrieve(new RetrieveParameters(default, eq_, default)); + IEnumerable er_ = context.Operators.Retrieve(new RetrieveParameters(default, eq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet es_ = this.Scleritis(); - IEnumerable et_ = context.Operators.Retrieve(new RetrieveParameters(default, es_, default)); + IEnumerable et_ = context.Operators.Retrieve(new RetrieveParameters(default, es_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable eu_ = context.Operators.Union(er_, et_); IEnumerable ev_ = context.Operators.Union(ep_, eu_); CqlValueSet ew_ = this.Separation_of_Retinal_Layers(); - IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, ew_, default)); + IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, ew_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ey_ = this.Traumatic_Cataract(); - IEnumerable ez_ = context.Operators.Retrieve(new RetrieveParameters(default, ey_, default)); + IEnumerable ez_ = context.Operators.Retrieve(new RetrieveParameters(default, ey_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable fa_ = context.Operators.Union(ex_, ez_); IEnumerable fb_ = context.Operators.Union(ev_, fa_); CqlValueSet fc_ = this.Uveitis(); - IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fc_, default)); + IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet fe_ = this.Vascular_Disorders_of_Iris_and_Ciliary_Body(); - IEnumerable ff_ = context.Operators.Retrieve(new RetrieveParameters(default, fe_, default)); + IEnumerable ff_ = context.Operators.Retrieve(new RetrieveParameters(default, fe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable fg_ = context.Operators.Union(fd_, ff_); IEnumerable fh_ = context.Operators.Union(fb_, fg_); CqlValueSet fi_ = this.Visual_Field_Defects(); - IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fi_, default)); + IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fi_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable fk_ = context.Operators.Union(fh_, fj_); bool? fl_(Condition ComorbidDiagnosis) { @@ -969,9 +969,9 @@ IEnumerable b_(Procedure CataractSurgeryPerformed) { CqlCode d_ = this.Best_corrected_visual_acuity__observable_entity_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); CqlValueSet g_ = this.Best_Corrected_Visual_Acuity_Exam_Using_Snellen_Chart(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Observation VisualAcuityExamPerformed) { diff --git a/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs index 9281af41f..7fe5e927f 100644 --- a/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs @@ -190,7 +190,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -203,20 +203,20 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Telephone_Visits(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); IEnumerable r_ = Status_1_6_000.isEncounterPerformed(q_); @@ -281,7 +281,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Absence_of_Cervix_Value() { CqlValueSet a_ = this.Hysterectomy_with_No_Residual_Cervix(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure NoCervixProcedure) { @@ -297,7 +297,7 @@ private IEnumerable Absence_of_Cervix_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Congenital_or_Acquired_Absence_of_Cervix(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? h_(Condition NoCervixDiagnosis) { CqlInterval r_ = QICoreCommon_2_0_000.prevalenceInterval(NoCervixDiagnosis); @@ -337,7 +337,7 @@ public IEnumerable Absence_of_Cervix() => private IEnumerable Cervical_Cytology_Within_3_Years_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation CervicalCytology) { @@ -420,7 +420,7 @@ public IEnumerable Cervical_Cytology_Within_3_Years() => private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older_Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation HPVTest) { diff --git a/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs index cf3d6b4d6..8bf3c00e2 100644 --- a/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CesareanBirthFHIR-0.2.000.g.cs @@ -246,7 +246,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -379,7 +379,7 @@ public IEnumerable Encounter_with_Singleton_Delivery() => { CqlCode a_ = this.____Pregnancies(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation Gravida) { DataType k_ = Gravida?.Value; @@ -532,7 +532,7 @@ bool bc_() { CqlCode a_ = this.____Parity(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation Parity) { object k_() @@ -685,7 +685,7 @@ bool bc_() { CqlCode a_ = this.____Births_preterm(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation PretermBirth) { object k_() @@ -838,7 +838,7 @@ bool bc_() { CqlCode a_ = this.____Births_term(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation TermBirth) { object k_() @@ -1026,7 +1026,7 @@ object d_() bool n_() { CqlValueSet q_ = this.Abnormal_Presentation(); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? s_(Observation AbnormalPresentation) { object aa_() @@ -1168,7 +1168,7 @@ bool bh_() bool o_() { CqlValueSet bx_ = this.Abnormal_Presentation(); - IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? bz_(Observation AbnormalPresentation) { object ch_() @@ -1310,7 +1310,7 @@ bool do_() bool p_() { CqlValueSet ee_ = this.Abnormal_Presentation(); - IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default)); + IEnumerable ef_ = context.Operators.Retrieve(new RetrieveParameters(default, ee_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? eg_(Observation AbnormalPresentation) { object eo_() @@ -1452,7 +1452,7 @@ bool fv_() if (n_()) { CqlValueSet gl_ = this.Abnormal_Presentation(); - IEnumerable gm_ = context.Operators.Retrieve(new RetrieveParameters(default, gl_, default)); + IEnumerable gm_ = context.Operators.Retrieve(new RetrieveParameters(default, gl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? gn_(Observation AbnormalPresentation) { object gu_() @@ -1593,7 +1593,7 @@ bool ib_() else if (o_()) { CqlValueSet ir_ = this.Abnormal_Presentation(); - IEnumerable is_ = context.Operators.Retrieve(new RetrieveParameters(default, ir_, default)); + IEnumerable is_ = context.Operators.Retrieve(new RetrieveParameters(default, ir_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? it_(Observation AbnormalPresentation) { object ja_() @@ -1734,7 +1734,7 @@ bool kh_() else if (p_()) { CqlValueSet kx_ = this.Abnormal_Presentation(); - IEnumerable ky_ = context.Operators.Retrieve(new RetrieveParameters(default, kx_, default)); + IEnumerable ky_ = context.Operators.Retrieve(new RetrieveParameters(default, kx_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? kz_(Observation AbnormalPresentation) { object lg_() @@ -1991,7 +1991,7 @@ private IEnumerable Delivery_Encounter_with_Cesarean_Birth_Value() IEnumerable b_(Encounter ThirtysevenWeeksPlusEncounter) { CqlValueSet d_ = this.Cesarean_Birth(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure CSection) { CqlInterval j_ = PCMaternal_5_16_000.hospitalizationWithEDOBTriageObservation(ThirtysevenWeeksPlusEncounter); diff --git a/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs index ab0fe29c4..609f2f501 100644 --- a/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs @@ -254,7 +254,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -311,26 +311,26 @@ public CqlCode SDE_Sex() => private IEnumerable Major_Depressive_Disorder_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Psych_Visit_for_Family_Psychotherapy(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Psych_Visit_Psychotherapy(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Psychoanalysis(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Group_Psychotherapy(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Telehealth_Services(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -432,7 +432,7 @@ IEnumerable b_(Encounter MDDEncounter) { CqlCode d_ = this.Suicide_risk_assessment__procedure_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? g_(Procedure SuicideRiskAssessment) { Code k_ = SuicideRiskAssessment?.StatusElement; diff --git a/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs index 911df31dd..fa76d0e14 100644 --- a/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs @@ -832,7 +832,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -845,17 +845,17 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); - IEnumerable l_ = context.Operators.Retrieve(default); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? m_(Encounter E) { List y_ = E?.Type; @@ -881,11 +881,11 @@ CqlConcept z_(CodeableConcept @this) }; IEnumerable n_ = context.Operators.Where(l_, m_); CqlValueSet o_ = this.Online_Assessments(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(k_, q_); CqlValueSet s_ = this.Telephone_Visits(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable u_ = context.Operators.Union(r_, t_); IEnumerable v_ = Status_1_6_000.Finished_Encounter(u_); bool? w_(Encounter ValidEncounters) @@ -977,7 +977,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Severe_Combined_Immunodeficiency_Value() { CqlValueSet a_ = this.Severe_Combined_Immunodeficiency(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition SevereImmuneDisorder) { @@ -1002,7 +1002,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Immunodeficiency_Value() { CqlValueSet a_ = this.Disorders_of_the_Immune_System(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition ImmuneDisorder) { @@ -1027,7 +1027,7 @@ public CqlInterval First_Two_Years() => private bool? Has_HIV_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition HIV) { @@ -1052,7 +1052,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Lymphoreticular_Cancer__Multiple_Myeloma_or_Leukemia_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Lymphatic_and_Hematopoietic_Tissue(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition LymphaticMalignantNeoplasm) { @@ -1077,7 +1077,7 @@ public CqlInterval First_Two_Years() => private bool? Has_Intussusception_Value() { CqlValueSet a_ = this.Intussusception(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition IntussusceptionDisorder) { @@ -1143,7 +1143,7 @@ public CqlInterval Vaccine_Administration_Interval___42_Days_up_to_2_Ye private IEnumerable DTaP_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.DTaP_Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization DTaPVaccination) { @@ -1171,7 +1171,7 @@ CqlDate f_(Immunization DTaPVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.DTaP_Vaccine_Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure DTaPProcedure) { @@ -1247,9 +1247,9 @@ public IEnumerable Four_DTaP_Vaccinations() => private IEnumerable DTaP_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Anaphylactic_Reaction_to_DTaP_Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.Encephalitis_Due_to_Diphtheria__Tetanus_or_Pertussis_Vaccine(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Condition(e_); bool? g_(Condition DTaPConditions) @@ -1274,7 +1274,7 @@ public IEnumerable DTaP_Numerator_Inclusion_Conditions() => private IEnumerable Polio_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Inactivated_Polio_Vaccine__IPV_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization PolioVaccination) { @@ -1302,7 +1302,7 @@ CqlDate f_(Immunization PolioVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Inactivated_Polio_Vaccine__IPV__Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure PolioProcedure) { @@ -1376,7 +1376,7 @@ private IEnumerable Polio_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_human_poliovirus_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition PolioConditions) { @@ -1431,7 +1431,7 @@ public CqlInterval Date_of_First_Birthday_to_Date_of_Second_Birthday() private IEnumerable One_MMR_Vaccination_Value() { CqlValueSet a_ = this.Measles__Mumps_and_Rubella__MMR__Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization MMRVaccination) { @@ -1446,7 +1446,7 @@ private IEnumerable One_MMR_Vaccination_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Measles__Mumps_and_Rubella__MMR__Vaccine_Administered(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure MMRProcedure) { @@ -1473,7 +1473,7 @@ private IEnumerable MMR_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Measles_morbillivirus_and_Mumps_orthorubulavirus_and_Rubella_virus_antigens__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition MMRConditions) { @@ -1497,7 +1497,7 @@ public IEnumerable MMR_Numerator_Inclusion_Conditions() => private IEnumerable Measles_Indicators_Value() { CqlValueSet a_ = this.Measles(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition MeaslesDiagnosis) { @@ -1521,7 +1521,7 @@ public IEnumerable Measles_Indicators() => private IEnumerable Mumps_Indicators_Value() { CqlValueSet a_ = this.Mumps(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition MumpsDiagnosis) { @@ -1545,7 +1545,7 @@ public IEnumerable Mumps_Indicators() => private IEnumerable Rubella_Indicators_Value() { CqlValueSet a_ = this.Rubella(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition RubellaDiagnosis) { @@ -1569,7 +1569,7 @@ public IEnumerable Rubella_Indicators() => private IEnumerable Hib_3_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hib_Vaccine__3_dose_schedule_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ThreeDoseHibVaccine) { @@ -1597,7 +1597,7 @@ CqlDate f_(Immunization ThreeDoseHibVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hib_Vaccine__3_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure ThreeDoseHibProcedure) { @@ -1636,7 +1636,7 @@ public IEnumerable Hib_3_Dose_Immunizations_or_Procedures() => private IEnumerable Hib_4_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hib_Vaccine__4_dose_schedule_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HibVaccine) { @@ -1664,7 +1664,7 @@ CqlDate f_(Immunization HibVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hib_Vaccine__4_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure HibProcedure) { @@ -1787,7 +1787,7 @@ private IEnumerable Hib_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_due_to_Haemophilus_influenzae_type_b_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition HibReaction) { @@ -1811,7 +1811,7 @@ public IEnumerable Hib_Numerator_Inclusion_Conditions() => private IEnumerable Hepatitis_B_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Hepatitis_B_Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HepatitisBVaccination) { @@ -1839,7 +1839,7 @@ CqlDate f_(Immunization HepatitisBVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Hepatitis_B_Vaccine_Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure HepatitisBProcedure) { @@ -1913,7 +1913,7 @@ private IEnumerable NewBorn_Vaccine_Requirement_Value() { CqlCode a_ = this.Introduction_of_Serum__Toxoid_and_Vaccine_into_Muscle__Percutaneous_Approach(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable d_ = Status_1_6_000.Completed_Procedure(c_); bool? e_(Procedure NewBornVaccine) { @@ -2001,9 +2001,9 @@ private IEnumerable Hepatitis_B_Numerator_Inclusion_Conditions_Value( { CqlCode a_ = this.Anaphylaxis_due_to_Hepatitis_B_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet d_ = this.Hepatitis_B(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition HepBConditions) @@ -2028,7 +2028,7 @@ public IEnumerable Hepatitis_B_Numerator_Inclusion_Conditions() => private IEnumerable One_Chicken_Pox_Vaccination_Value() { CqlValueSet a_ = this.Varicella_Zoster_Vaccine__VZV_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ChickenPoxVaccination) { @@ -2043,7 +2043,7 @@ private IEnumerable One_Chicken_Pox_Vaccination_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Varicella_Zoster_Vaccine__VZV__Administered(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure ChickenPoxProcedure) { @@ -2069,10 +2069,10 @@ public IEnumerable One_Chicken_Pox_Vaccination() => private IEnumerable Varicella_Zoster_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Varicella_Zoster(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlCode c_ = this.Anaphylaxis_caused_by_vaccine_containing_Human_alphaherpesvirus_3_antigen__disorder_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(b_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition VaricellaZoster) @@ -2097,7 +2097,7 @@ public IEnumerable Varicella_Zoster_Numerator_Inclusion_Conditions() private IEnumerable Pneumococcal_Conjugate_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Pneumococcal_Conjugate_Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization PneumococcalVaccination) { @@ -2125,7 +2125,7 @@ CqlDate f_(Immunization PneumococcalVaccination) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Pneumococcal_Conjugate_Vaccine_Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure PneumococcalProcedure) { @@ -2202,7 +2202,7 @@ private IEnumerable Pneumococcal_Conjugate_Numerator_Inclusion_Condit { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Streptococcus_pneumoniae_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition PneumococcalReaction) { @@ -2226,7 +2226,7 @@ public IEnumerable Pneumococcal_Conjugate_Numerator_Inclusion_Conditi private IEnumerable One_Hepatitis_A_Vaccinations_Value() { CqlValueSet a_ = this.Hepatitis_A_Vaccine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization HepatitisAVaccination) { @@ -2241,7 +2241,7 @@ private IEnumerable One_Hepatitis_A_Vaccinations_Value() }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Hepatitis_A_Vaccine_Administered(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = Status_1_6_000.Completed_Procedure(g_); bool? i_(Procedure HepatitisAProcedure) { @@ -2267,10 +2267,10 @@ public IEnumerable One_Hepatitis_A_Vaccinations() => private IEnumerable Hepatitis_A_Numerator_Inclusion_Conditions_Value() { CqlValueSet a_ = this.Hepatitis_A(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlCode c_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Hepatitis_A_virus_antigen__disorder_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(b_, e_); IEnumerable g_ = Status_1_6_000.Active_Condition(f_); bool? h_(Condition HepatitisADiagnosis) @@ -2296,7 +2296,7 @@ private IEnumerable Rotavirus_2_Dose_Immunizations_or_Procedures_Value( { CqlCode a_ = this.rotavirus__live__monovalent_vaccine(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable d_ = Status_1_6_000.Completed_Immunization(c_); bool? e_(Immunization TwoDoseRotavirusVaccine) { @@ -2324,7 +2324,7 @@ CqlDate g_(Immunization TwoDoseRotavirusVaccine) }; IEnumerable h_ = context.Operators.Select(f_, g_); CqlValueSet i_ = this.Rotavirus_Vaccine__2_dose_schedule__Administered(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable k_ = Status_1_6_000.Completed_Procedure(j_); bool? l_(Procedure TwoDoseRotavirusProcedure) { @@ -2363,7 +2363,7 @@ public IEnumerable Rotavirus_2_Dose_Immunizations_or_Procedures() => private IEnumerable Rotavirus_3_Dose_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Rotavirus_Vaccine__3_dose_schedule_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization ThreeDoseRotavirusVaccine) { @@ -2391,7 +2391,7 @@ CqlDate f_(Immunization ThreeDoseRotavirusVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Rotavirus_Vaccine__3_dose_schedule__Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure ThreeDoseRotavirusAdministered) { @@ -2514,7 +2514,7 @@ private IEnumerable Rotavirus_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_due_to_rotavirus_vaccine__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition RotavirusConditions) { @@ -2558,7 +2558,7 @@ public CqlInterval Vaccine_Administration_Interval___180_Days_up_to_2_Y private IEnumerable Influenza_Immunizations_or_Procedures_Value() { CqlValueSet a_ = this.Child_Influenza_Immunization_Administered(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization InfluenzaVaccine) { @@ -2586,7 +2586,7 @@ CqlDate f_(Immunization InfluenzaVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Child_Influenza_Vaccine_Administered(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure InfluenzaAdministration) { @@ -2662,7 +2662,7 @@ public IEnumerable Two_Influenza_Vaccinations() => private IEnumerable LAIV_Vaccinations_Value() { CqlValueSet a_ = this.Influenza_Virus_LAIV_Immunization(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-immunization")); IEnumerable c_ = Status_1_6_000.Completed_Immunization(b_); bool? d_(Immunization LAIVVaccine) { @@ -2691,7 +2691,7 @@ CqlDate f_(Immunization LAIVVaccine) }; IEnumerable g_ = context.Operators.Select(e_, f_); CqlValueSet h_ = this.Influenza_Virus_LAIV_Procedure(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable j_ = Status_1_6_000.Completed_Procedure(i_); bool? k_(Procedure InfluenzaAdministration) { @@ -2747,7 +2747,7 @@ private IEnumerable Influenza_Numerator_Inclusion_Conditions_Value() { CqlCode a_ = this.Anaphylaxis_caused_by_vaccine_product_containing_Influenza_virus_antigen__disorder_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable d_ = Status_1_6_000.Active_Condition(c_); bool? e_(Condition InfluenzaConditions) { diff --git a/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs index bda640cca..a0d0b02b3 100644 --- a/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs @@ -210,7 +210,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -223,7 +223,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Clinical_Oral_Evaluation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter ValidEncounter) { @@ -291,7 +291,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Dental_Caries(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition DentalCaries) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(DentalCaries); diff --git a/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs index 5a1cf8ec9..e3998959e 100644 --- a/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs @@ -390,7 +390,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -447,26 +447,26 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Home_Healthcare_Services(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Online_Assessments(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); IEnumerable x_ = Status_1_6_000.Finished_Encounter(w_); @@ -493,7 +493,7 @@ public IEnumerable Qualifying_Encounters() => { CqlCode a_ = this.Have_you_ever_had_vaginal_intercourse__PhenX_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation SexualActivityAssessment) { @@ -546,12 +546,12 @@ bool s_() private bool? Has_Diagnoses_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Diagnoses_Used_to_Indicate_Sexual_Activity(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.HIV(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Complications_of_Pregnancy__Childbirth_and_the_Puerperium(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition SexualActivityDiagnosis) { @@ -574,8 +574,8 @@ bool s_() private bool? Has_Active_Contraceptive_Medications_Value() { CqlValueSet a_ = this.Contraceptive_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Medication(e_); bool? g_(MedicationRequest ActiveContraceptives) @@ -606,8 +606,8 @@ bool s_() private bool? Has_Ordered_Contraceptive_Medications_Value() { CqlValueSet a_ = this.Contraceptive_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest OrderedContraceptives) @@ -633,12 +633,12 @@ bool s_() private bool? Has_Laboratory_Tests_Identifying_Sexual_Activity_But_Not_Pregnancy_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); CqlValueSet c_ = this.Lab_Tests_During_Pregnancy(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Lab_Tests_for_Sexually_Transmitted_Infections(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(h_); bool? j_(ServiceRequest LabOrders) @@ -664,7 +664,7 @@ bool s_() private bool? Has_Laboratory_Tests_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Pregnancy_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest PregnancyTest) { @@ -691,7 +691,7 @@ bool s_() private bool? Has_Diagnostic_Studies_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Diagnostic_Studies_During_Pregnancy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest SexualActivityDiagnostics) { @@ -716,7 +716,7 @@ bool s_() private bool? Has_Procedures_Identifying_Sexual_Activity_Value() { CqlValueSet a_ = this.Procedures_Used_to_Indicate_Sexual_Activity(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ProceduresForSexualActivity) { @@ -794,12 +794,12 @@ bool s_() private bool? Has_Pregnancy_Test_Exclusion_Value() { CqlValueSet a_ = this.Pregnancy_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); IEnumerable d_(ServiceRequest PregnancyTest) { CqlValueSet m_ = this.XRay_Study(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable o_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(n_); bool? p_(ServiceRequest XrayOrder) { @@ -839,13 +839,13 @@ ServiceRequest r_(ServiceRequest XrayOrder) => return s_; }; IEnumerable e_ = context.Operators.SelectMany(c_, d_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable h_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(g_); IEnumerable i_(ServiceRequest PregnancyTestOrder) { CqlValueSet av_ = this.Isotretinoin(); - IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); + IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable az_ = context.Operators.Union(aw_, ay_); IEnumerable ba_ = Status_1_6_000.Active_or_Completed_Medication_Request(az_); bool? bb_(MedicationRequest AccutaneOrder) @@ -933,7 +933,7 @@ ServiceRequest bd_(MedicationRequest AccutaneOrder) => private bool? Numerator_Value() { CqlValueSet a_ = this.Chlamydia_Screening(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation ChlamydiaTest) { diff --git a/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs index 5313f00e9..dddfc8a86 100644 --- a/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs @@ -176,7 +176,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -267,7 +267,7 @@ public CqlCode SDE_Sex() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition ColorectalCancer) { @@ -291,7 +291,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure Colectomy) { @@ -340,7 +340,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation FecalOccultResult) { @@ -418,7 +418,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Stool_DNA_with_FIT_Test_Performed_Value() { CqlValueSet a_ = this.sDNA_FIT_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Lab_Observation(b_); bool? d_(Observation sDNATest) { @@ -501,7 +501,7 @@ public IEnumerable Stool_DNA_with_FIT_Test_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure FlexibleSigmoidoscopy) { @@ -531,7 +531,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Observation(b_); bool? d_(Observation Colonography) { @@ -561,7 +561,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure Colonoscopy) { diff --git a/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs b/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs index 5175a9fc0..e34e17d87 100644 --- a/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs @@ -541,7 +541,7 @@ public string ErrorLevel() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs index d4c821d34..7d598757a 100644 --- a/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs @@ -314,7 +314,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -371,18 +371,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -419,7 +419,7 @@ private IEnumerable Diabetic_Retinopathy_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Diabetic_Retinopathy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? f_(Condition DiabeticRetinopathy) { CqlInterval j_ = QICoreCommon_2_0_000.prevalenceInterval(DiabeticRetinopathy); @@ -489,7 +489,7 @@ public IEnumerable Diabetic_Retinopathy_Encounter() => private IEnumerable Macular_Exam_Performed_Value() { CqlValueSet a_ = this.Macular_Exam(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_(Observation MacularExam) { IEnumerable g_ = this.Diabetic_Retinopathy_Encounter(); @@ -559,7 +559,7 @@ private IEnumerable Level_of_Severity_of_Retinopathy_Findings_Com { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communication")); IEnumerable d_(Communication LevelOfSeverityCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -608,7 +608,7 @@ private IEnumerable Macular_Edema_Absence_Communicated_Value() { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_edema_absent__situation_(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communication")); IEnumerable d_(Communication MacularEdemaAbsentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -657,7 +657,7 @@ private IEnumerable Macular_Edema_Presence_Communicated_Value() { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_Edema_Findings_Present(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communication")); IEnumerable d_(Communication MacularEdemaPresentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -724,8 +724,8 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication LevelOfSeverityNotCommunicated) { @@ -793,8 +793,8 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_edema_absent__situation_(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication MacularEdemaAbsentNotCommunicated) { @@ -862,8 +862,8 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_Edema_Findings_Present(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-communicationnotdone")); IEnumerable g_ = context.Operators.Union(c_, f_); IEnumerable h_(Communication MacularEdemaPresentNotCommunicated) { diff --git a/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs index 2df9ae056..8423604ad 100644 --- a/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs @@ -250,7 +250,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -263,30 +263,30 @@ public Patient Patient() => private IEnumerable Encounter_to_Assess_Cognition_Value() { CqlValueSet a_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Nursing_Facility_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Psych_Visit_Psychotherapy(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Behavioral_Neuropsych_Assessment(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Occupational_Therapy_Evaluation(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Office_Visit(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Outpatient_Consultation(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable z_ = context.Operators.Union(w_, y_); return z_; @@ -302,7 +302,7 @@ private IEnumerable Dementia_Encounter_During_Measurement_Period_Valu IEnumerable b_(Encounter EncounterAssessCognition) { CqlValueSet d_ = this.Dementia_and_Mental_Degenerations(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? f_(Condition Dementia) { CqlInterval j_ = this.Measurement_Period(); @@ -355,7 +355,7 @@ private IEnumerable Qualifying_Encounter_During_Measurement_Period_Va { IEnumerable a_ = this.Encounter_to_Assess_Cognition(); CqlValueSet b_ = this.Patient_Provider_Interaction(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable d_ = context.Operators.Union(a_, c_); bool? e_(Encounter ValidEncounter) { @@ -410,9 +410,9 @@ public IEnumerable Qualifying_Encounter_During_Measurement_Period() = private IEnumerable Assessment_of_Cognition_Using_Standardized_Tools_or_Alternate_Methods_Value() { CqlValueSet a_ = this.Standardized_Tools_Score_for_Assessment_of_Cognition(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); CqlValueSet c_ = this.Cognitive_Assessment(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation CognitiveAssessment) { @@ -491,9 +491,9 @@ public IEnumerable Assessment_of_Cognition_Using_Standardized_Tools private IEnumerable Patient_Reason_for_Not_Performing_Assessment_of_Cognition_Using_Standardized_Tools_or_Alternate_Methods_Value() { CqlValueSet a_ = this.Standardized_Tools_Score_for_Assessment_of_Cognition(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); CqlValueSet c_ = this.Cognitive_Assessment(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation NoCognitiveAssessment) { diff --git a/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs index d4e8fbe58..a86588fd3 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs @@ -234,7 +234,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -247,24 +247,24 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Ophthalmological_Services(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.isEncounterPerformed(t_); bool? v_(Encounter ValidEncounters) @@ -301,7 +301,7 @@ public IEnumerable Qualifying_Encounters() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.And(j_, l_); CqlValueSet n_ = this.Diabetes(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? p_(Condition Diabetes) { CqlInterval t_ = QICoreCommon_2_0_000.prevalenceInterval(Diabetes); @@ -352,7 +352,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Diabetic_Retinopathy_Overlapping_Measurement_Period_Value() { CqlValueSet a_ = this.Diabetic_Retinopathy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Retinopathy) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(Retinopathy); @@ -374,7 +374,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Retinal_Exam_in_Measurement_Period_Value() { CqlValueSet a_ = this.Retinal_or_Dilated_Eye_Exam(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation RetinalExam) { @@ -398,7 +398,7 @@ public IEnumerable Retinal_Exam_in_Measurement_Period() => private IEnumerable Retinal_Exam_in_Measurement_Period_or_Year_Prior_Value() { CqlValueSet a_ = this.Retinal_or_Dilated_Eye_Exam(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation RetinalExam) { diff --git a/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs index e425f3aa2..365e0e1a5 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs @@ -118,7 +118,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -188,7 +188,7 @@ public CqlCode SDE_Sex() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.And(j_, l_); CqlValueSet n_ = this.Diabetes(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? p_(Condition Diabetes) { CqlInterval t_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Diabetes); @@ -239,7 +239,7 @@ public CqlCode SDE_Sex() => private Observation Most_Recent_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation RecentHbA1c) { @@ -354,7 +354,7 @@ public Observation Most_Recent_HbA1c() => private bool? Has_No_Record_Of_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isLaboratoryTestPerformed(b_); bool? d_(Observation NoHbA1c) { diff --git a/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs b/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs index b9c4eefc6..1896cd122 100644 --- a/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DischargedonAntithromboticTherapyFHIR-0.9.000.g.cs @@ -134,7 +134,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -220,8 +220,8 @@ private IEnumerable Numerator_Value() IEnumerable b_(Encounter IschemicStrokeEncounter) { CqlValueSet d_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(MedicationRequest DischargeAntithrombotic) { @@ -252,8 +252,8 @@ public IEnumerable Numerator() => private IEnumerable Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest Antithrombotic) { @@ -301,8 +301,8 @@ public IEnumerable Antithrombotic_Therapy_at_Discharge() => private IEnumerable Reason_for_Not_Giving_Antithrombotic_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy_for_Ischemic_Stroke(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest NoAntithromboticDischarge) { @@ -389,8 +389,8 @@ public IEnumerable Encounter_with_Documented_Reason_for_No_Antithromb private IEnumerable Pharmacological_Contraindications_for_Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Pharmacological_Contraindications_For_Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest Pharmacological) { diff --git a/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs index bc55c191d..2b906ca32 100644 --- a/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs @@ -244,7 +244,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -301,48 +301,48 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Ophthalmological_Services(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Discharge_Services_Nursing_Facility(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Nursing_Facility_Visit(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Audiology_Visit(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet af_ = this.Telephone_Visits(); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ah_ = context.Operators.Union(ae_, ag_); IEnumerable ai_ = context.Operators.Union(ac_, ah_); CqlValueSet aj_ = this.Online_Assessments(); - IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet al_ = this.Physical_Therapy_Evaluation(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = context.Operators.Union(ai_, an_); CqlValueSet ap_ = this.Occupational_Therapy_Evaluation(); - IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ar_ = context.Operators.Union(ao_, aq_); IEnumerable as_ = Status_1_6_000.Finished_Encounter(ar_); bool? at_(Encounter ValidEncounter) @@ -411,7 +411,7 @@ public IEnumerable Qualifying_Encounter() => private bool? Numerator_Value() { CqlValueSet a_ = this.Falls_Screening(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation FallsScreening) { diff --git a/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs index e16d4074a..86f7d515d 100644 --- a/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs @@ -410,7 +410,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -469,44 +469,44 @@ public CqlInterval Intake_Period() => private IEnumerable<(CqlDate startDate, nint _)?> ADHD_Medication_Prescribed_During_Intake_Period_and_Not_Previously_on_ADHD_Medication_Value() { CqlValueSet a_ = this.Atomoxetine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Clonidine(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Dexmethylphenidate(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Dextroamphetamine(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Lisdexamfetamine(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlCode ad_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable ae_ = context.Operators.ToList(ad_); - IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ae_)); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ae_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ah_ = context.Operators.ToList(ad_); - IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_)); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable aj_ = context.Operators.Union(af_, ai_); IEnumerable ak_ = context.Operators.Union(ac_, aj_); CqlValueSet al_ = this.Methylphenidate(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); - IEnumerable ao_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ao_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ap_ = context.Operators.Union(am_, ao_); IEnumerable aq_ = context.Operators.Union(ak_, ap_); CqlValueSet ar_ = this.Guanfacine(); - IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); - IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable av_ = context.Operators.Union(as_, au_); IEnumerable aw_ = context.Operators.Union(aq_, av_); bool? ax_(MedicationRequest ADHDMedications) @@ -520,37 +520,37 @@ public CqlInterval Intake_Period() => return dj_; }; IEnumerable ay_ = context.Operators.Where(aw_, ax_); - IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable ba_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bd_ = context.Operators.Union(ba_, bc_); - IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bh_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bi_ = context.Operators.Union(bf_, bh_); IEnumerable bj_ = context.Operators.Union(bd_, bi_); - IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable bl_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bo_ = context.Operators.Union(bl_, bn_); IEnumerable bp_ = context.Operators.Union(bj_, bo_); - IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); - IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bt_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bu_ = context.Operators.Union(br_, bt_); IEnumerable bv_ = context.Operators.Union(bp_, bu_); - IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); - IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ca_ = context.Operators.Union(bx_, bz_); IEnumerable cb_ = context.Operators.Union(bv_, ca_); IEnumerable cd_ = context.Operators.ToList(ad_); - IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cd_)); + IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cd_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cg_ = context.Operators.ToList(ad_); - IEnumerable ch_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cg_)); + IEnumerable ch_ = context.Operators.Retrieve(new RetrieveParameters(default, default, cg_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ci_ = context.Operators.Union(ce_, ch_); IEnumerable cj_ = context.Operators.Union(cb_, ci_); - IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); - IEnumerable cn_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable cl_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable cn_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable co_ = context.Operators.Union(cl_, cn_); IEnumerable cp_ = context.Operators.Union(cj_, co_); - IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); - IEnumerable ct_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ct_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cu_ = context.Operators.Union(cr_, ct_); IEnumerable cv_ = context.Operators.Union(cp_, cu_); bool? cw_(MedicationRequest ADHDMedications) @@ -567,44 +567,44 @@ public CqlInterval Intake_Period() => IEnumerable cy_(MedicationRequest ADHDMedicationOrder) { CqlValueSet dp_ = this.Atomoxetine(); - IEnumerable dq_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default)); - IEnumerable ds_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default)); + IEnumerable dq_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ds_ = context.Operators.Retrieve(new RetrieveParameters(default, dp_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable dt_ = context.Operators.Union(dq_, ds_); CqlValueSet du_ = this.Clonidine(); - IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); - IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default)); + IEnumerable dv_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, du_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable dy_ = context.Operators.Union(dv_, dx_); IEnumerable dz_ = context.Operators.Union(dt_, dy_); CqlValueSet ea_ = this.Dexmethylphenidate(); - IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); - IEnumerable ed_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default)); + IEnumerable eb_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ed_ = context.Operators.Retrieve(new RetrieveParameters(default, ea_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ee_ = context.Operators.Union(eb_, ed_); IEnumerable ef_ = context.Operators.Union(dz_, ee_); CqlValueSet eg_ = this.Dextroamphetamine(); - IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); - IEnumerable ej_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default)); + IEnumerable eh_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ej_ = context.Operators.Retrieve(new RetrieveParameters(default, eg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ek_ = context.Operators.Union(eh_, ej_); IEnumerable el_ = context.Operators.Union(ef_, ek_); CqlValueSet em_ = this.Lisdexamfetamine(); - IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); - IEnumerable ep_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default)); + IEnumerable en_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ep_ = context.Operators.Retrieve(new RetrieveParameters(default, em_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable eq_ = context.Operators.Union(en_, ep_); IEnumerable er_ = context.Operators.Union(el_, eq_); CqlCode es_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable et_ = context.Operators.ToList(es_); - IEnumerable eu_ = context.Operators.Retrieve(new RetrieveParameters(default, default, et_)); + IEnumerable eu_ = context.Operators.Retrieve(new RetrieveParameters(default, default, et_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ew_ = context.Operators.ToList(es_); - IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ew_)); + IEnumerable ex_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ew_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ey_ = context.Operators.Union(eu_, ex_); IEnumerable ez_ = context.Operators.Union(er_, ey_); CqlValueSet fa_ = this.Methylphenidate(); - IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); - IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable fd_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable fe_ = context.Operators.Union(fb_, fd_); IEnumerable ff_ = context.Operators.Union(ez_, fe_); CqlValueSet fg_ = this.Guanfacine(); - IEnumerable fh_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default)); - IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default)); + IEnumerable fh_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable fj_ = context.Operators.Retrieve(new RetrieveParameters(default, fg_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable fk_ = context.Operators.Union(fh_, fj_); IEnumerable fl_ = context.Operators.Union(ff_, fk_); bool? fm_(MedicationRequest ActiveADHDMedication) @@ -698,14 +698,14 @@ public CqlDate IPSD() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(Encounter ValidEncounters) @@ -758,7 +758,7 @@ public IEnumerable PrincipalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable i_ = context.Operators.Retrieve(default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? j_(Condition C) { Id m_ = C?.IdElement; @@ -784,7 +784,7 @@ Condition d_(Encounter.DiagnosisComponent PD) private IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter InpatientStay) { IEnumerable e_ = this.PrincipalDiagnosis(InpatientStay); @@ -890,7 +890,7 @@ public IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_In private IEnumerable Narcolepsy_Exclusion_Value() { CqlValueSet a_ = this.Narcolepsy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Narcolepsy) { CqlInterval e_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Narcolepsy); @@ -927,20 +927,20 @@ public IEnumerable Narcolepsy_Exclusion() => private IEnumerable Qualifying_Numerator_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Initial_Hospital_Observation_Care(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Behavioral_Health_Follow_up_Visit(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Psychotherapy_and_Pharmacologic_Management(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? p_(Encounter PsychPharmManagement) { List ao_ = PsychPharmManagement?.Location; @@ -970,25 +970,25 @@ CqlConcept av_(CodeableConcept @this) IEnumerable r_ = context.Operators.Union(m_, q_); IEnumerable s_ = context.Operators.Union(k_, r_); CqlValueSet t_ = this.Outpatient_Consultation(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet v_ = this.Home_Healthcare_Services(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); CqlValueSet z_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet ab_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ad_ = context.Operators.Union(aa_, ac_); IEnumerable ae_ = context.Operators.Union(y_, ad_); CqlValueSet af_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet ah_ = this.Psych_Visit_Psychotherapy(); - IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable aj_ = context.Operators.Union(ag_, ai_); IEnumerable ak_ = context.Operators.Union(ae_, aj_); CqlValueSet al_ = this.Telephone_Visits(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable an_ = context.Operators.Union(ak_, am_); return an_; @@ -1041,8 +1041,8 @@ public IEnumerable Encounter_During_Initiation_Phase() => private IEnumerable> ADHD_Medications_Taken_on_IPSD_or_During_Continuation_and_Maintenance_Phase_Value() { CqlValueSet a_ = this.Atomoxetine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); (CqlInterval period, CqlDate periodStart)? f_(MedicationRequest AtomoxetineMed) { @@ -1077,8 +1077,8 @@ CqlInterval l_((CqlInterval period, CqlDate periodStart)? @thi IEnumerable> m_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(k_, l_); IEnumerable> n_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(m_); CqlValueSet o_ = this.Clonidine(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable s_ = context.Operators.Union(p_, r_); (CqlInterval period, CqlDate periodStart)? t_(MedicationRequest ClonidineMed) { @@ -1114,8 +1114,8 @@ CqlInterval z_((CqlInterval period, CqlDate periodStart)? @thi IEnumerable> ab_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(aa_); IEnumerable> ac_ = context.Operators.Union>(n_, ab_); CqlValueSet ad_ = this.Dexmethylphenidate(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable ah_ = context.Operators.Union(ae_, ag_); (CqlInterval period, CqlDate periodStart)? ai_(MedicationRequest DexmethylphenidateMed) { @@ -1150,8 +1150,8 @@ CqlInterval ao_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> ap_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(an_, ao_); IEnumerable> aq_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(ap_); CqlValueSet ar_ = this.Dextroamphetamine(); - IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); - IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default)); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable au_ = context.Operators.Retrieve(new RetrieveParameters(default, ar_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable av_ = context.Operators.Union(as_, au_); (CqlInterval period, CqlDate periodStart)? aw_(MedicationRequest DextroamphetamineMed) { @@ -1188,8 +1188,8 @@ CqlInterval bc_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> bf_ = context.Operators.Union>(aq_, be_); IEnumerable> bg_ = context.Operators.Union>(ac_, bf_); CqlValueSet bh_ = this.Lisdexamfetamine(); - IEnumerable bi_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default)); - IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default)); + IEnumerable bi_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bh_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bl_ = context.Operators.Union(bi_, bk_); (CqlInterval period, CqlDate periodStart)? bm_(MedicationRequest LisdexamfetamineMed) { @@ -1224,8 +1224,8 @@ CqlInterval bs_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> bt_ = context.Operators.Select<(CqlInterval period, CqlDate periodStart)?, CqlInterval>(br_, bs_); IEnumerable> bu_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(bt_); CqlValueSet bv_ = this.Methylphenidate(); - IEnumerable bw_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default)); - IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default)); + IEnumerable bw_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bv_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bz_ = context.Operators.Union(bw_, by_); (CqlInterval period, CqlDate periodStart)? ca_(MedicationRequest MethylphenidateMed) { @@ -1262,8 +1262,8 @@ CqlInterval cg_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> cj_ = context.Operators.Union>(bu_, ci_); IEnumerable> ck_ = context.Operators.Union>(bg_, cj_); CqlValueSet cl_ = this.Guanfacine(); - IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); - IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); + IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cp_ = context.Operators.Union(cm_, co_); (CqlInterval period, CqlDate periodStart)? cq_(MedicationRequest GuanfacineMed) { @@ -1299,9 +1299,9 @@ CqlInterval cw_((CqlInterval period, CqlDate periodStart)? @th IEnumerable> cy_ = CumulativeMedicationDuration_4_0_000.RolloutIntervals(cx_); CqlCode cz_ = this.methamphetamine_hydrochloride_5_MG_Oral_Tablet(); IEnumerable da_ = context.Operators.ToList(cz_); - IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, default, da_)); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, default, da_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable dd_ = context.Operators.ToList(cz_); - IEnumerable de_ = context.Operators.Retrieve(new RetrieveParameters(default, default, dd_)); + IEnumerable de_ = context.Operators.Retrieve(new RetrieveParameters(default, default, dd_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable df_ = context.Operators.Union(db_, de_); (CqlInterval period, CqlDate periodStart)? dg_(MedicationRequest MethamphetamineMed) { @@ -1512,7 +1512,7 @@ public IEnumerable Encounter_31_to_300_Days_into_Continuation_and_Maint private IEnumerable Online_Assessment_31_to_300_Days_into_Continuation_and_Maintenance_Phase_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter OnlineAssessment) { Period g_ = OnlineAssessment?.Period; diff --git a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs index c071c6c87..027003f58 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs @@ -548,7 +548,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -621,11 +621,11 @@ public CqlDateTime November_1_Year_Prior_to_the_Measurement_Period() => private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Outpatient_Consultation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Office_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter E) { List t_ = E?.Type; @@ -651,11 +651,11 @@ CqlConcept u_(CodeableConcept @this) }; IEnumerable h_ = context.Operators.Where(f_, g_); CqlValueSet i_ = this.Telephone_Visits(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Online_Assessments(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable o_ = context.Operators.Union(l_, n_); IEnumerable p_ = Status_1_6_000.isEncounterPerformed(o_); bool? q_(Encounter ValidEncounters) @@ -716,7 +716,7 @@ public CqlDateTime October_31_Year_Prior_to_the_Measurement_Period() => private IEnumerable Total_Hip_Arthroplasty_Procedure_Value() { CqlValueSet a_ = this.Primary_THA_Procedure(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure THAProcedure) { @@ -779,7 +779,7 @@ public IEnumerable Total_Hip_Arthroplasty_Procedure() => { CqlCode a_ = this.Severe_cognitive_impairment__finding_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? d_(Condition Dementia) { CqlInterval g_ = QICoreCommon_2_0_000.prevalenceInterval(Dementia); @@ -804,7 +804,7 @@ public IEnumerable Total_Hip_Arthroplasty_Procedure() => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Lower_Body_Fractures_Excluding_Ankle_and_Foot(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? g_(Condition LowerBodyFracture) { CqlInterval k_ = QICoreCommon_2_0_000.prevalenceInterval(LowerBodyFracture); @@ -848,7 +848,7 @@ Procedure i_(Condition LowerBodyFracture) => private bool? Has_Partial_Hip_Arthroplasty_Procedure_Value() { CqlValueSet a_ = this.Partial_Arthroplasty_of_Hip(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); IEnumerable d_(Procedure PartialTHAProcedure) { @@ -888,7 +888,7 @@ Procedure j_(Procedure THAProcedure) => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Removal__Revision_and_Supplement_Procedures_of_the_Lower_Body_and_Spine(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable g_ = Status_1_6_000.isProcedurePerformed(f_); bool? h_(Procedure RevisionTHAProcedure) { @@ -922,7 +922,7 @@ Procedure j_(Procedure RevisionTHAProcedure) => private bool? Has_Malignant_Neoplasm_of_Lower_and_Unspecified_Limbs_Value() { CqlValueSet a_ = this.Malignant_Neoplasms_of_Lower_and_Unspecified_Limbs(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition MalignantNeoplasm) { IEnumerable f_ = this.Total_Hip_Arthroplasty_Procedure(); @@ -956,7 +956,7 @@ Condition i_(Procedure THAProcedure) => private bool? Has_Mechanical_Complication_Value() { CqlValueSet a_ = this.Mechanical_Complications_Excluding_Upper_Body(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition MechanicalComplications) { IEnumerable f_ = this.Total_Hip_Arthroplasty_Procedure(); @@ -993,7 +993,7 @@ Condition i_(Procedure THAProcedure) => IEnumerable b_(Procedure THAProcedure) { CqlValueSet e_ = this.Primary_THA_Procedure(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable g_ = Status_1_6_000.isProcedurePerformed(f_); bool? h_(Procedure ElectiveTHAProcedure) { @@ -1106,23 +1106,23 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() { CqlCode a_ = this.Quality_of_life_score__HOOS_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.isAssessmentPerformed(c_); CqlCode e_ = this.Sport_recreation_score__HOOS_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.isAssessmentPerformed(g_); CqlCode i_ = this.Activities_of_daily_living_score__HOOS_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable l_ = Status_1_6_000.isAssessmentPerformed(k_); CqlCode m_ = this.Symptoms_score__HOOS_(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable p_ = Status_1_6_000.isAssessmentPerformed(o_); CqlCode q_ = this.Pain_score__HOOS_(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable t_ = Status_1_6_000.isAssessmentPerformed(s_); IEnumerable> u_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_); (Observation HOOSLifeQuality, Observation HOOSSport, Observation HOOSActivityScore, Observation HOOSSymptoms, Observation HOOSPain)? v_(ValueTuple _valueTuple) @@ -1337,7 +1337,7 @@ private IEnumerable Date_HOOSJr_Total_Assessment_Completed_Value() { CqlCode a_ = this.Total_interval_score__HOOSJR_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation HOOSJr) { DataType h_ = HOOSJr?.Value; @@ -1454,10 +1454,10 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_10_Global_Mental_Health__GMH__score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); CqlCode d_ = this.PROMIS_10_Global_Physical_Health__GPH__score_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation PROMIS10MentalScore, Observation PROMIS10PhysicalScore)? h_(ValueTuple _valueTuple) { @@ -1608,10 +1608,10 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); CqlCode d_ = this.VR_12_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? h_(ValueTuple _valueTuple) { @@ -1762,10 +1762,10 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); CqlCode d_ = this.VR_12_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> g_ = context.Operators.CrossJoin(c_, f_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? h_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs index 2aca0a67d..852323f96 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs @@ -494,7 +494,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -551,12 +551,12 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Online_Assessments(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = Status_1_6_000.Finished_Encounter(h_); bool? j_(Encounter ValidEncounter) @@ -629,7 +629,7 @@ public IEnumerable Two_Outpatient_Encounters_during_Measurement_Perio int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); CqlValueSet j_ = this.Heart_Failure(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? l_(Condition HeartFailure) { CqlInterval s_ = QICoreCommon_2_0_000.ToPrevalenceInterval(HeartFailure); @@ -668,7 +668,7 @@ public IEnumerable Two_Outpatient_Encounters_during_Measurement_Perio bool? a_ = Hospice_6_9_000.Has_Hospice_Services(); CqlCode b_ = this.Severe_cognitive_impairment__finding_(); IEnumerable c_ = context.Operators.ToList(b_); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, c_)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, c_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? e_(Condition Dementia) { CqlInterval i_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Dementia); @@ -692,11 +692,11 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_10_Global_Mental_Health__GMH__score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.PROMIS_10_Global_Physical_Health__GPH__score_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation PROMIS10MentalScore, Observation PROMIS10PhysicalScore)? j_(ValueTuple _valueTuple) @@ -830,31 +830,31 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() { CqlCode a_ = this.PROMIS_29_Sleep_disturbance_score_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.PROMIS_29_Satisfaction_with_participation_in_social_roles_score_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); CqlCode i_ = this.PROMIS_29_Physical_function_score_T_score(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable l_ = Status_1_6_000.Final_Survey_Observation(k_); CqlCode m_ = this.PROMIS_29_Pain_interference_score_T_score(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable p_ = Status_1_6_000.Final_Survey_Observation(o_); CqlCode q_ = this.PROMIS_29_Fatigue_score_T_score(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable t_ = Status_1_6_000.Final_Survey_Observation(s_); CqlCode u_ = this.PROMIS_29_Depression_score_T_score(); IEnumerable v_ = context.Operators.ToList(u_); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable x_ = Status_1_6_000.Final_Survey_Observation(w_); CqlCode y_ = this.PROMIS_29_Anxiety_score_T_score(); IEnumerable z_ = context.Operators.ToList(y_); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, default, z_)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, default, z_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable ab_ = Status_1_6_000.Final_Survey_Observation(aa_); IEnumerable> ac_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_, x_, ab_); (Observation Promis29Sleep, Observation Promis29SocialRoles, Observation Promis29Physical, Observation Promis29Pain, Observation Promis29Fatigue, Observation Promis29Depression, Observation Promis29Anxiety)? ad_(ValueTuple _valueTuple) @@ -1093,11 +1093,11 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_12_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1231,11 +1231,11 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_12_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_12_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR12MentalAssessment, Observation VR12PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1369,11 +1369,11 @@ private IEnumerable Date_VR36_Oblique_Total_Assessment_Completed_Value( { CqlCode a_ = this.VR_36_Mental_component_summary__MCS__score___oblique_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_36_Physical_component_summary__PCS__score___oblique_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR36MentalAssessment, Observation VR36PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1507,11 +1507,11 @@ private IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed_Val { CqlCode a_ = this.VR_36_Mental_component_summary__MCS__score___orthogonal_method_T_score(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.VR_36_Physical_component_summary__PCS__score___orthogonal_method_T_score(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation VR36MentalAssessment, Observation VR36PhysicalAssessment)? j_(ValueTuple _valueTuple) @@ -1645,11 +1645,11 @@ private IEnumerable Date_MLHFQ_Total_Assessment_Completed_Value() { CqlCode a_ = this.Physical_score__MLHFQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Emotional_score__MLHFQ_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation MLHFQPhysical, Observation MLHFQEmotional)? j_(ValueTuple _valueTuple) @@ -1783,11 +1783,11 @@ private IEnumerable Date_KCCQ12_Total_Assessment_Completed_Value() { CqlCode a_ = this.Kansas_City_Cardiomyopathy_Questionnaire___12_item__KCCQ_12_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Overall_summary_score__KCCQ_12_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); IEnumerable> i_ = context.Operators.CrossJoin(d_, h_); (Observation KCCQ12Item, Observation KCCQ12Summary)? j_(ValueTuple _valueTuple) @@ -1921,27 +1921,27 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() { CqlCode a_ = this.Quality_of_life_score__KCCQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); CqlCode e_ = this.Symptom_stability_score__KCCQ_(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable h_ = Status_1_6_000.Final_Survey_Observation(g_); CqlCode i_ = this.Self_efficacy_score__KCCQ_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable l_ = Status_1_6_000.Final_Survey_Observation(k_); CqlCode m_ = this.Total_symptom_score__KCCQ_(); IEnumerable n_ = context.Operators.ToList(m_); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, default, n_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable p_ = Status_1_6_000.Final_Survey_Observation(o_); CqlCode q_ = this.Physical_limitation_score__KCCQ_(); IEnumerable r_ = context.Operators.ToList(q_); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, default, r_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable t_ = Status_1_6_000.Final_Survey_Observation(s_); CqlCode u_ = this.Social_limitation_score__KCCQ_(); IEnumerable v_ = context.Operators.ToList(u_); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, default, v_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable x_ = Status_1_6_000.Final_Survey_Observation(w_); IEnumerable> y_ = context.Operators.CrossJoin(d_, h_, l_, p_, t_, x_); (Observation KCCQLifeQuality, Observation KCCQSymptomStability, Observation KCCQSelfEfficacy, Observation KCCQSymptoms, Observation KCCQPhysicalLimits, Observation KCCQSocialLimits)? z_(ValueTuple _valueTuple) @@ -2159,7 +2159,7 @@ private IEnumerable Date_KCCQ_Total_Assessment_Completed_Value() { CqlCode a_ = this.Overall_summary_score__KCCQ_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation KCCQSummaryScore) { diff --git a/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs index 714866be9..7c3863868 100644 --- a/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs @@ -302,7 +302,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -359,7 +359,7 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EncounterInpatient) { Period e_ = EncounterInpatient?.Period; @@ -427,7 +427,7 @@ private IEnumerable Encounter_with_Hospital_Dietitian_Referral_Value( { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Hospital_Dietitian_Referral(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Procedure HospitalDietitianReferral)? e_(ValueTuple _valueTuple) { @@ -477,7 +477,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_Value( { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -562,7 +562,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_Not_at { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -644,7 +644,7 @@ private IEnumerable Encounter_with_Malnutrition_Risk_Screening_at_Ris { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Risk_Screening(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation MalnutritionRiskScreening)? e_(ValueTuple _valueTuple) { @@ -725,7 +725,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_and_Identifie { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -789,7 +789,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_Status_Modera { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -849,7 +849,7 @@ private IEnumerable Encounter_with_Nutrition_Assessment_Not_or_Mildly { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Assessment(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Observation NutritionAssessment)? e_(ValueTuple _valueTuple) { @@ -905,7 +905,7 @@ private IEnumerable Encounter_with_Malnutrition_Diagnosis_Value() { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Malnutrition_Diagnosis(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Condition MalnutritionDiagnosis)? e_(ValueTuple _valueTuple) { @@ -944,7 +944,7 @@ private IEnumerable Encounter_with_Nutrition_Care_Plan_Value() { IEnumerable a_ = this.Qualifying_Encounter(); CqlValueSet b_ = this.Nutrition_Care_Plan(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable> d_ = context.Operators.CrossJoin(a_, c_); (Encounter QualifyingEncounter, Procedure NutritionCarePlan)? e_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs index ef2fb49d9..b2272074e 100644 --- a/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs @@ -272,7 +272,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -342,8 +342,8 @@ public Patient Patient() => private bool? Has_Beta_Blocker_Therapy_for_LVSD_Ordered_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_for_LVSD(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest BetaBlockerOrdered) { @@ -385,8 +385,8 @@ public Patient Patient() => private bool? Is_Currently_Taking_Beta_Blocker_Therapy_for_LVSD_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_for_LVSD(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest ActiveBetaBlocker) { @@ -419,7 +419,7 @@ public Patient Patient() => private bool? Has_Consecutive_Heart_Rates_Less_than_50_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/heartrate")); IEnumerable b_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); IEnumerable> c_ = context.Operators.CrossJoin(a_, b_); (Observation HeartRate, Encounter ModerateOrSevereLVSDHFOutpatientEncounter)? d_(ValueTuple _valueTuple) @@ -452,7 +452,7 @@ public Patient Patient() => CqlQuantity z_ = context.Operators.Quantity(50m, "/min"); bool? aa_ = context.Operators.Less(y_, z_); bool? ab_ = context.Operators.And(w_, aa_); - IEnumerable ac_ = context.Operators.Retrieve(default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/heartrate")); bool? ad_(Observation MostRecentPriorHeartRate) { Period an_ = tuple_fufpmqdratbglhghdwfuubanf?.ModerateOrSevereLVSDHFOutpatientEncounter?.Period; @@ -505,7 +505,7 @@ Observation h_((Observation HeartRate, Encounter ModerateOrSevereLVSDHFOutpatien private bool? Has_Medical_or_Patient_Reason_for_Not_Ordering_Beta_Blocker_for_LVSD_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); IEnumerable b_(MedicationRequest NoBetaBlockerOrdered) { IEnumerable g_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -570,7 +570,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Arrhythmia_Diagnosis_Value() { CqlValueSet a_ = this.Arrhythmia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Arrhythmia) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Arrhythmia); @@ -598,7 +598,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Hypotension_Diagnosis_Value() { CqlValueSet a_ = this.Hypotension(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Hypotension) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Hypotension); @@ -626,7 +626,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Asthma_Diagnosis_Value() { CqlValueSet a_ = this.Asthma(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Asthma) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Asthma); @@ -654,9 +654,9 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Diagnosis_of_Allergy_or_Intolerance_to_Beta_Blocker_Therapy_Value() { CqlValueSet a_ = this.Allergy_to_Beta_Blocker_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.Intolerance_to_Beta_Blocker_Therapy(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Condition BetaBlockerAllergyOrIntoleranceDiagnosis) { @@ -685,7 +685,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Bradycardia_Diagnosis_Value() { CqlValueSet a_ = this.Bradycardia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Bradycardia) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(Bradycardia); @@ -713,10 +713,10 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Allergy_or_Intolerance_to_Beta_Blocker_Therapy_Ingredient_Value() { CqlValueSet a_ = this.Beta_Blocker_Therapy_Ingredient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-allergyintolerance")); CqlCode c_ = this.Substance_with_beta_adrenergic_receptor_antagonist_mechanism_of_action__substance_(); IEnumerable d_ = context.Operators.ToList(c_); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, default, d_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-allergyintolerance")); IEnumerable f_ = context.Operators.Union(b_, e_); bool? g_(AllergyIntolerance BetaBlockerAllergyIntolerance) { @@ -745,7 +745,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Atrioventricular_Block_Diagnosis_Value() { CqlValueSet a_ = this.Atrioventricular_Block(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition AtrioventricularBlock) { bool? f_ = AHAOverall_2_6_000.overlapsHeartFailureOutpatientEncounter(AtrioventricularBlock); @@ -773,7 +773,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Diagnosis_of_Cardiac_Pacer_in_Situ_Value() { CqlValueSet a_ = this.Cardiac_Pacer_in_Situ(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition CardiacPacerDiagnosis) { bool? f_ = AHAOverall_2_6_000.overlapsAfterHeartFailureOutpatientEncounter((CardiacPacerDiagnosis as object)); @@ -801,7 +801,7 @@ CqlConcept aa_(CodeableConcept @this) private bool? Has_Cardiac_Pacer_Device_Implanted_Value() { CqlValueSet a_ = this.Cardiac_Pacer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure ImplantedCardiacPacer) { IEnumerable h_ = AHAOverall_2_6_000.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); diff --git a/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs index 3a9e695c6..1d84dee84 100644 --- a/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs @@ -234,7 +234,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -519,7 +519,7 @@ public CqlCode SDE_Sex() => private bool? Has_Active_HIV_Diagnosis_Starts_On_or_Before_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition HIVDx) { CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval(HIVDx); @@ -549,36 +549,36 @@ public CqlCode SDE_Sex() => private bool? Has_Qualifying_Encounter_During_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable af_ = context.Operators.Union(ac_, ae_); bool? ag_(Encounter QualifyingEncounter) { @@ -631,41 +631,41 @@ public CqlCode SDE_Sex() => private IEnumerable Encounter_During_Measurement_Period_With_HIV_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable af_ = context.Operators.Union(ac_, ae_); IEnumerable ag_(Encounter ValidEncounter) { CqlValueSet ai_ = this.HIV(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? ak_(Condition HIVDiagnosis) { CqlInterval ao_ = this.Measurement_Period(); @@ -722,7 +722,7 @@ public IEnumerable Encounter_During_Measurement_Period_With_HIV() => private bool? Has_HIV_Viral_Load_Test_During_Measurement_Period_Value() { CqlValueSet a_ = this.HIV_Viral_Load(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation ViralLoadTest) { CqlInterval f_ = this.Measurement_Period(); @@ -749,7 +749,7 @@ public IEnumerable Encounter_During_Measurement_Period_With_HIV() => IEnumerable b_(Encounter EncounterWithHIV) { CqlValueSet e_ = this.HIV_Viral_Load(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? g_(Observation ViralLoadTest) { CqlInterval k_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs index 1ddbacf34..b971b1ba8 100644 --- a/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs @@ -270,7 +270,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -283,7 +283,7 @@ public Patient Patient() => private bool? Has_Active_HIV_Diagnosis_Before_or_in_First_90_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition HIVDx) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(HIVDx); @@ -309,36 +309,36 @@ public Patient Patient() => private bool? Has_Qualifying_Encounter_During_First_240_Days_of_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Outpatient_Consultation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Annual_Wellness_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Face_to_Face_Interaction(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Preventive_Care_Services_Other(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable af_ = context.Operators.Union(ac_, ae_); bool? ag_(Encounter QualifyingEncounter) { @@ -435,7 +435,7 @@ public CqlCode SDE_Sex() => private Observation Most_Recent_Viral_Load_Test_During_Measurement_Period_Value() { CqlValueSet a_ = this.HIV_Viral_Load(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation ViralLoad) { object h_() diff --git a/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs b/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs index 458751556..344033cb3 100644 --- a/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs @@ -170,7 +170,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -183,7 +183,7 @@ public Patient Patient() => private bool? Has_Hospice_Services_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter InpatientEncounter) { @@ -212,7 +212,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Hospice_Encounter(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable i_ = Status_1_6_000.isEncounterPerformed(h_); bool? j_(Encounter HospiceEncounter) { @@ -229,7 +229,7 @@ public Patient Patient() => bool? m_ = context.Operators.Or(f_, l_); CqlCode n_ = this.Hospice_care__Minimum_Data_Set_(); IEnumerable o_ = context.Operators.ToList(n_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable q_ = Status_1_6_000.isAssessmentPerformed(p_); bool? r_(Observation HospiceAssessment) { @@ -251,7 +251,7 @@ public Patient Patient() => bool? t_ = context.Operators.Exists(s_); bool? u_ = context.Operators.Or(m_, t_); CqlValueSet v_ = this.Hospice_Care_Ambulatory(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable x_ = Status_1_6_000.isInterventionOrder(w_); bool? y_(ServiceRequest HospiceOrder) { @@ -266,7 +266,7 @@ public Patient Patient() => IEnumerable z_ = context.Operators.Where(x_, y_); bool? aa_ = context.Operators.Exists(z_); bool? ab_ = context.Operators.Or(u_, aa_); - IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable ae_ = Status_1_6_000.isInterventionPerformed(ad_); bool? af_(Procedure HospicePerformed) { @@ -282,7 +282,7 @@ public Patient Patient() => bool? ah_ = context.Operators.Exists(ag_); bool? ai_ = context.Operators.Or(ab_, ah_); CqlValueSet aj_ = this.Hospice_Diagnosis(); - IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default)); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, aj_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? al_(Condition HospiceCareDiagnosis) { CqlInterval cj_ = QICoreCommon_2_0_000.prevalenceInterval(HospiceCareDiagnosis); diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs index 1d0dbd980..4a708b736 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs @@ -194,7 +194,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -207,7 +207,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -245,8 +245,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Opioid_Administration_Value() { CqlValueSet a_ = this.Opioids__All(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration Opioids) { @@ -359,8 +359,8 @@ public IEnumerable Denominator() => private IEnumerable Opioid_Antagonist_Administration_Value() { CqlValueSet a_ = this.Opioid_Antagonist(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration AntagonistGiven) { diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs index e94bdeff4..ca6412369 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs @@ -230,7 +230,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -243,7 +243,7 @@ public Patient Patient() => private IEnumerable Encounter_with_Age_18_and_Older_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -362,7 +362,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -486,7 +486,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -654,7 +654,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; @@ -798,7 +798,7 @@ IEnumerable b_(Encounter InpatientHospitalization) { CqlCode d_ = this.Physical_findings_of_Skin(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? g_(Observation SkinExam) { DataType k_ = SkinExam?.Effective; diff --git a/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs index 2f55442c8..dcdd311f9 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs @@ -150,7 +150,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -163,7 +163,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter InpatientEncounter) { Patient e_ = this.Patient(); @@ -201,8 +201,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Hypoglycemic_Medication_Administration_Value() { CqlValueSet a_ = this.Hypoglycemics_Severe_Hypoglycemia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration HypoMedication) { @@ -287,7 +287,7 @@ private IEnumerable Glucose_Test_with_Result_Less_Than_40_Value() IEnumerable a_ = this.Denominator(); IEnumerable b_ = this.Hypoglycemic_Medication_Administration(); CqlValueSet c_ = this.Glucose_Lab_Test_Mass_Per_Volume(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> e_ = context.Operators.CrossJoin(a_, b_, d_); (Encounter QualifyingEncounter, MedicationAdministration HypoglycemicMedication, Observation GlucoseTest)? f_(ValueTuple _valueTuple) { @@ -559,7 +559,7 @@ private IEnumerable Low_Glucose_Test_Followed_By_Glucose_Test_Resul IEnumerable a_ = this.Denominator(); IEnumerable b_ = this.Glucose_Test_with_Result_Less_Than_40(); CqlValueSet c_ = this.Glucose_Lab_Test_Mass_Per_Volume(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable> e_ = context.Operators.CrossJoin(a_, b_, d_); (Encounter QualifyingEncounter, Observation LowGlucoseTest, Observation FollowupGlucoseTest)? f_(ValueTuple _valueTuple) { diff --git a/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs index 0eb46ae10..15f30910b 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs @@ -268,7 +268,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -281,13 +281,13 @@ public Patient Patient() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_(Encounter InpatientEncounter) { CqlValueSet e_ = this.Medicare_FFS_payer(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); CqlValueSet g_ = this.Medicare_Advantage_payer(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Coverage MedicarePayer) { @@ -353,7 +353,7 @@ public IEnumerable Initial_Population() => { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bodytemp")); bool? g_(Observation temperature) { DataType x_ = temperature?.Effective; @@ -467,7 +467,7 @@ object q_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/heartrate")); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -582,7 +582,7 @@ object q_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? h_(Observation O2Saturation) { object r_() @@ -735,7 +735,7 @@ object o_() bool cc_() { CqlValueSet cf_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? ch_(Observation O2Saturation) { object cp_() @@ -890,7 +890,7 @@ bool ek_() bool cd_() { CqlValueSet fa_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? fc_(Observation O2Saturation) { object fk_() @@ -1045,7 +1045,7 @@ bool hf_() bool ce_() { CqlValueSet hv_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default)); + IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? hx_(Observation O2Saturation) { object if_() @@ -1200,7 +1200,7 @@ bool ka_() if (cc_()) { CqlValueSet kq_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default)); + IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? ks_(Observation O2Saturation) { object kz_() @@ -1354,7 +1354,7 @@ bool mu_() else if (cd_()) { CqlValueSet nk_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default)); + IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? nm_(Observation O2Saturation) { object nt_() @@ -1508,7 +1508,7 @@ bool po_() else if (ce_()) { CqlValueSet qe_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? qg_(Observation O2Saturation) { object qn_() @@ -1680,7 +1680,7 @@ bool si_() private IEnumerable Blood_Pressure_Reading_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? b_(Observation BloodPressure) { Code d_ = BloodPressure?.StatusElement; @@ -1723,7 +1723,7 @@ public IEnumerable Encounter_with_First_Systolic_Blood_Pressure() => Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Bicarbonate_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation BicarbonateLab) { Instant z_ = BicarbonateLab?.IssuedElement; @@ -1771,7 +1771,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation BicarbonateLab) { Instant bd_ = BicarbonateLab?.IssuedElement; @@ -1841,7 +1841,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Creatinine_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation CreatinineLab) { Instant z_ = CreatinineLab?.IssuedElement; @@ -1889,7 +1889,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation CreatinineLab) { Instant bd_ = CreatinineLab?.IssuedElement; @@ -1959,7 +1959,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation HematocritLab) { Instant z_ = HematocritLab?.IssuedElement; @@ -2007,7 +2007,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation HematocritLab) { Instant bd_ = HematocritLab?.IssuedElement; @@ -2077,7 +2077,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Platelet_count_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation PlateletLab) { Instant z_ = PlateletLab?.IssuedElement; @@ -2125,7 +2125,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation PlateletLab) { Instant bd_ = PlateletLab?.IssuedElement; @@ -2195,7 +2195,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Sodium_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation SodiumLab) { Instant z_ = SodiumLab?.IssuedElement; @@ -2243,7 +2243,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation SodiumLab) { Instant bd_ = SodiumLab?.IssuedElement; @@ -2313,7 +2313,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation WhiteBloodCellLab) { Instant z_ = WhiteBloodCellLab?.IssuedElement; @@ -2361,7 +2361,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation WhiteBloodCellLab) { Instant bd_ = WhiteBloodCellLab?.IssuedElement; diff --git a/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs index 4b0e0dd4b..6303af59d 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs @@ -284,7 +284,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -297,13 +297,13 @@ public Patient Patient() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_(Encounter InpatientEncounter) { CqlValueSet e_ = this.Medicare_FFS_payer(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); CqlValueSet g_ = this.Medicare_Advantage_payer(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); IEnumerable i_ = context.Operators.Union(f_, h_); bool? j_(Coverage MedicarePayer) { @@ -368,7 +368,7 @@ public IEnumerable Initial_Population() => { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bodytemp")); bool? g_(Observation temperature) { DataType x_ = temperature?.Effective; @@ -482,7 +482,7 @@ object q_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/heartrate")); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -597,7 +597,7 @@ object q_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? h_(Observation O2Saturation) { object r_() @@ -750,7 +750,7 @@ object o_() bool cc_() { CqlValueSet cf_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? ch_(Observation O2Saturation) { object cp_() @@ -905,7 +905,7 @@ bool ek_() bool cd_() { CqlValueSet fa_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default)); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, fa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? fc_(Observation O2Saturation) { object fk_() @@ -1060,7 +1060,7 @@ bool hf_() bool ce_() { CqlValueSet hv_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default)); + IEnumerable hw_ = context.Operators.Retrieve(new RetrieveParameters(default, hv_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? hx_(Observation O2Saturation) { object if_() @@ -1215,7 +1215,7 @@ bool ka_() if (cc_()) { CqlValueSet kq_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default)); + IEnumerable kr_ = context.Operators.Retrieve(new RetrieveParameters(default, kq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? ks_(Observation O2Saturation) { object kz_() @@ -1369,7 +1369,7 @@ bool mu_() else if (cd_()) { CqlValueSet nk_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default)); + IEnumerable nl_ = context.Operators.Retrieve(new RetrieveParameters(default, nk_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? nm_(Observation O2Saturation) { object nt_() @@ -1523,7 +1523,7 @@ bool po_() else if (ce_()) { CqlValueSet qe_ = this.Oxygen_Saturation_by_Pulse_Oximetry(); - IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default)); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? qg_(Observation O2Saturation) { object qn_() @@ -1700,7 +1700,7 @@ bool si_() { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/resprate")); bool? g_(Observation RespRate) { DataType x_ = RespRate?.Effective; @@ -1809,7 +1809,7 @@ object q_(Observation @this) private IEnumerable Blood_Pressure_Reading_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? b_(Observation BloodPressure) { Code d_ = BloodPressure?.StatusElement; @@ -1860,7 +1860,7 @@ public IEnumerable Encounter_with_First_Systolic_Blood_Pressure() => Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Bicarbonate_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation bicarbonatelab) { Instant z_ = bicarbonatelab?.IssuedElement; @@ -1908,7 +1908,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation bicarbonatelab) { Instant bd_ = bicarbonatelab?.IssuedElement; @@ -1978,7 +1978,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Creatinine_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation CreatinineLab) { Instant z_ = CreatinineLab?.IssuedElement; @@ -2026,7 +2026,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation CreatinineLab) { Instant bd_ = CreatinineLab?.IssuedElement; @@ -2096,7 +2096,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Glucose_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation GlucoseLab) { Instant z_ = GlucoseLab?.IssuedElement; @@ -2144,7 +2144,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation GlucoseLab) { Instant bd_ = GlucoseLab?.IssuedElement; @@ -2214,7 +2214,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation HematocritLab) { Instant z_ = HematocritLab?.IssuedElement; @@ -2262,7 +2262,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation HematocritLab) { Instant bd_ = HematocritLab?.IssuedElement; @@ -2332,7 +2332,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Potassium_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation PotassiumLab) { Instant z_ = PotassiumLab?.IssuedElement; @@ -2380,7 +2380,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation PotassiumLab) { Instant bd_ = PotassiumLab?.IssuedElement; @@ -2450,7 +2450,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Sodium_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation SodiumLab) { Instant z_ = SodiumLab?.IssuedElement; @@ -2498,7 +2498,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation SodiumLab) { Instant bd_ = SodiumLab?.IssuedElement; @@ -2568,7 +2568,7 @@ object s_(Observation @this) Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation WhiteBloodCellLab) { Instant z_ = WhiteBloodCellLab?.IssuedElement; @@ -2616,7 +2616,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation WhiteBloodCellLab) { Instant bd_ = WhiteBloodCellLab?.IssuedElement; @@ -2685,7 +2685,7 @@ object s_(Observation @this) { Id d_ = EncounterInpatient?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bodyweight")); bool? g_(Observation WeightExam) { DataType x_ = WeightExam?.Effective; diff --git a/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs index 258a7d0a0..ee4c44551 100644 --- a/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs @@ -366,7 +366,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -419,7 +419,7 @@ public Patient Patient() => private IEnumerable Bladder_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Bladder_Cancer_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition BladderCancer) { CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(BladderCancer); @@ -445,7 +445,7 @@ private Procedure First_Bladder_Cancer_Staging_Procedure_Value() { CqlCode a_ = this.Tumor_staging__tumor_staging_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable d_(Procedure BladderCancerStaging) { IEnumerable k_ = this.Bladder_Cancer_Diagnosis(); @@ -624,7 +624,7 @@ Procedure b_(ResourceReference StagingReference) { CqlCode a_ = this.Stage_group_pathology_Cancer(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation StagingObservation) { IEnumerable g_ = this.getStagingProcedure(StagingObservation); @@ -677,7 +677,7 @@ Procedure b_(ResourceReference StagingReference) private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter ValidEncounter) { CqlInterval f_ = this.Measurement_Period(); @@ -738,8 +738,8 @@ Procedure b_(ResourceReference StagingReference) private IEnumerable BCG_Not_Available_Within_6_Months_After_Bladder_Cancer_Staging_Value() { CqlValueSet a_ = this.BCG_Bacillus_Calmette_Guerin_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotadministered")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotadministered")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationAdministration BCGNotGiven) { @@ -860,8 +860,8 @@ public IEnumerable BCG_Not_Available_Within_6_Months_A private MedicationAdministration First_BCG_Administered_Value() { CqlValueSet a_ = this.BCG_Bacillus_Calmette_Guerin_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationadministration")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationAdministration BCG) { @@ -1001,7 +1001,7 @@ public CqlCode SDE_Sex() => private IEnumerable Acute_Tuberculosis_Diagnosis_Value() { CqlValueSet a_ = this.Active_Tuberculosis_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition ActiveTuberculosis) { Procedure g_ = this.First_Bladder_Cancer_Staging_Procedure(); @@ -1044,8 +1044,8 @@ public IEnumerable Acute_Tuberculosis_Diagnosis() => private IEnumerable Immunosuppressive_Drugs_Value() { CqlValueSet a_ = this.Immunosuppressive_Drugs_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationRequest ImmunosuppressiveDrugs) { @@ -1085,7 +1085,7 @@ public IEnumerable Immunosuppressive_Drugs() => private IEnumerable Cystectomy_Done_Value() { CqlValueSet a_ = this.Cystectomy_for_Urology_Care(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure Cystectomy) { Procedure g_ = this.First_Bladder_Cancer_Staging_Procedure(); @@ -1146,12 +1146,12 @@ public IEnumerable Cystectomy_Done() => private bool? Has_Excluding__HIV__Immunocompromised_Conditions_or_Mixed_Histology_Before_Staging_Value() { CqlValueSet a_ = this.HIV(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.Immunocompromised_Conditions(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Mixed_histology_urothelial_cell_carcinoma_for_Urology_Care(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_(Condition ExclusionDiagnosis) { @@ -1198,8 +1198,8 @@ Condition r_(Procedure FirstBladderCancerStaging) => private bool? Has_Excluding_Chemotherapy_or_Radiotherapy_Procedure_Before_Staging_Value() { CqlValueSet a_ = this.Chemotherapy_Agents_for_Advanced_Cancer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(MedicationRequest ExclusionMed) { @@ -1265,7 +1265,7 @@ MedicationRequest w_(Procedure FirstBladderCancerStaging) => IEnumerable i_ = context.Operators.Where(g_, h_); CqlCode j_ = this.Combined_radiotherapy__procedure_(); IEnumerable k_ = context.Operators.ToList(j_); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, default, k_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable m_(Procedure ExclusionProcedure) { Procedure bi_ = this.First_Bladder_Cancer_Staging_Procedure(); diff --git a/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs index 8a27aa175..bb59844eb 100644 --- a/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs @@ -332,7 +332,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -345,7 +345,7 @@ public Patient Patient() => private bool? Has_Active_Diabetes_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Diabetes(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition Diabetes) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(Diabetes); @@ -373,24 +373,24 @@ public Patient Patient() => private bool? Has_Outpatient_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Office_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Outpatient_Consultation(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable t_ = context.Operators.Union(q_, s_); bool? u_(Encounter ValidEncounter) { @@ -454,9 +454,9 @@ public Patient Patient() => private IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Chronic_Kidney_Disease__Stage_5(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet c_ = this.End_Stage_Renal_Disease(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Condition CKDOrESRD) { @@ -500,7 +500,7 @@ public IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measure private bool? Has_Kidney_Panel_Performed_During_Measurement_Period_Value() { CqlValueSet a_ = this.Estimated_Glomerular_Filtration_Rate(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation eGFRTest) { CqlInterval l_ = this.Measurement_Period(); @@ -529,7 +529,7 @@ public IEnumerable Has_CKD_Stage_5_or_ESRD_Diagnosis_Overlaps_Measure IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Urine_Albumin_Creatinine_Ratio(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? h_(Observation uACRTest) { CqlInterval ab_ = this.Measurement_Period(); diff --git a/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs index 0fd622506..8704e5955 100644 --- a/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs @@ -164,7 +164,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -177,7 +177,7 @@ public Patient Patient() => private IEnumerable Chemotherapy_Within_31_Days_Prior_and_During_Measurement_Period_Value() { CqlValueSet a_ = this.Chemotherapy_Administration(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ChemoAdministration) { @@ -206,11 +206,11 @@ public IEnumerable Chemotherapy_Within_31_Days_Prior_and_During_Measu private IEnumerable Face_to_Face_or_Telehealth_Encounter_with_Ongoing_Chemotherapy_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.Finished_Encounter(b_); IEnumerable d_ = this.Chemotherapy_Within_31_Days_Prior_and_During_Measurement_Period(); CqlValueSet f_ = this.Cancer(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable> h_ = context.Operators.CrossJoin(c_, d_, d_, g_); (Encounter FaceToFaceOrTelehealthEncounter, Procedure ChemoBeforeEncounter, Procedure ChemoAfterEncounter, Condition Cancer)? i_(ValueTuple _valueTuple) { @@ -311,12 +311,12 @@ public IEnumerable Denominator_1() => private IEnumerable Radiation_Treatment_Management_During_Measurement_Period_with_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Radiation_Treatment_Management(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.Finished_Encounter(b_); IEnumerable d_(Encounter RadiationTreatmentManagement) { CqlValueSet f_ = this.Cancer(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? h_(Condition Cancer) { bool? l_ = QICoreCommon_2_0_000.isActive(Cancer); @@ -376,7 +376,7 @@ private IEnumerable Numerator_1_Value() IEnumerable b_(Encounter FaceToFaceOrTelehealthEncounterWithChemo) { CqlValueSet d_ = this.Standardized_Pain_Assessment_Tool(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? f_(Observation PainAssessed) { Period j_ = FaceToFaceOrTelehealthEncounterWithChemo?.Period; @@ -419,7 +419,7 @@ private IEnumerable Numerator_2_Value() IEnumerable b_(Encounter RadiationManagementEncounter) { CqlValueSet d_ = this.Standardized_Pain_Assessment_Tool(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? f_(Observation PainAssessed) { bool? j_() diff --git a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs index 8380e0077..fa1e8e3ac 100644 --- a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs @@ -150,7 +150,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -197,14 +197,14 @@ public CqlInterval hospitalizationWithEDOBTriageObservation(Encount CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.ED_Visit_and_OB_Triage(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastEDOBTriage) { Period af_ = LastEDOBTriage?.Period; CqlInterval ag_ = FHIRHelpers_4_3_000.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ak_(Encounter LastObs) { Period cg_ = LastObs?.Period; @@ -250,7 +250,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? az_(Encounter LastObs) { Period dg_ = LastObs?.Period; @@ -295,7 +295,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bo_(Encounter LastObs) { Period eg_ = LastObs?.Period; @@ -363,7 +363,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Period fj_ = LastObs?.Period; @@ -425,7 +425,7 @@ private IEnumerable Delivery_Encounter_with_Age_Range_Value() IEnumerable b_(Encounter EncounterWithAge) { CqlValueSet d_ = this.Delivery_Procedures(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure DeliveryProcedure) { Code j_ = DeliveryProcedure?.StatusElement; @@ -463,7 +463,7 @@ public CqlDateTime lastTimeOfDelivery(Encounter TheEncounter) { CqlCode a_ = this.Date_and_time_of_obstetric_delivery(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation TimeOfDelivery) { DataType k_ = TimeOfDelivery?.Value; @@ -614,7 +614,7 @@ public CqlDateTime lastEstimatedDeliveryDate(Encounter TheEncounter) { CqlCode a_ = this.Delivery_date_Estimated(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation EstimatedDateOfDelivery) { DataType k_ = EstimatedDateOfDelivery?.Value; @@ -799,7 +799,7 @@ bool bc_() public CqlQuantity lastEstimatedGestationalAge(Encounter TheEncounter) { CqlValueSet a_ = this.Estimated_Gestational_Age_at_Delivery(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation EstimatedGestationalAge) { object j_() diff --git a/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs index e09402c68..d10588093 100644 --- a/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs @@ -380,7 +380,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -393,7 +393,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_to_Screen_for_Blood_Pressure(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter ValidEncounter) { CqlInterval e_ = this.Measurement_Period(); @@ -465,7 +465,7 @@ private IEnumerable Denominator_Exclusions_Value() IEnumerable b_(Encounter QualifyingEncounter) { CqlValueSet d_ = this.Diagnosis_of_Hypertension(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? f_(Condition Hypertension) { bool? j_ = QICoreCommon_2_0_000.isProblemListItem(Hypertension); @@ -524,7 +524,7 @@ private IEnumerable Encounter_with_Normal_Blood_Pressure_Reading_Valu IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? e_(Observation BloodPressure) { DataType ak_ = BloodPressure?.Effective; @@ -662,7 +662,7 @@ private IEnumerable Encounter_with_Elevated_Blood_Pressure_Reading_SB IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? e_(Observation BloodPressure) { DataType ak_ = BloodPressure?.Effective; @@ -800,10 +800,10 @@ private IEnumerable Follow_up_with_Rescreen_in_2_to_6_Months_Val { CqlCode a_ = this.Follow_up_2_3_months__finding_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); CqlCode d_ = this.Follow_up_4_6_months__finding_(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable g_ = context.Operators.Union(c_, f_); bool? h_(ServiceRequest FollowUp) { @@ -826,18 +826,18 @@ public IEnumerable Follow_up_with_Rescreen_in_2_to_6_Months() => private IEnumerable NonPharmacological_Interventions_Value() { CqlValueSet a_ = this.Lifestyle_Recommendation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); CqlValueSet c_ = this.Weight_Reduction_Recommended(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Dietary_Recommendations(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); CqlValueSet h_ = this.Recommendation_to_Increase_Physical_Activity(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Referral_or_Counseling_for_Alcohol_Consumption(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(ServiceRequest NonPharmaInterventions) { @@ -860,7 +860,7 @@ public IEnumerable NonPharmacological_Interventions() => private IEnumerable Referral_to_Alternate_or_Primary_Healthcare_Professional_for_Hypertensive_Reading_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); bool? c_(ServiceRequest Referral) { List e_ = Referral?.ReasonCode; @@ -970,7 +970,7 @@ private IEnumerable Encounter_with_Hypertensive_Reading_Within_Year_P IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? e_(Observation BloodPressure) { DataType bk_ = BloodPressure?.Effective; @@ -1262,7 +1262,7 @@ private IEnumerable Encounter_with_First_Hypertensive_Reading_SBP_Gre IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? g_(Observation BloodPressure) { DataType bm_ = BloodPressure?.Effective; @@ -1474,7 +1474,7 @@ public IEnumerable Encounter_with_First_Hypertensive_Reading_SBP_Grea private IEnumerable First_Hypertensive_Reading_Interventions_or_Referral_to_Alternate_Professional_Value() { CqlValueSet a_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_(ServiceRequest FourWeekRescreen) { IEnumerable g_ = this.NonPharmacological_Interventions(); @@ -1551,7 +1551,7 @@ private IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_13 IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? e_(Observation BloodPressure) { DataType bs_ = BloodPressure?.Effective; @@ -1811,13 +1811,13 @@ private IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Valu { CqlCode a_ = this._12_lead_EKG_panel(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); CqlCode d_ = this.EKG_study(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable g_ = context.Operators.Union(c_, f_); CqlValueSet h_ = this.Laboratory_Tests_for_Hypertension(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable j_ = context.Operators.Union(g_, i_); bool? k_(ServiceRequest EKGLab) { @@ -1951,7 +1951,7 @@ private IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_Gr IEnumerable a_ = this.Qualifying_Encounter_during_Measurement_Period(); bool? b_(Encounter QualifyingEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? e_(Observation BloodPressure) { DataType bn_ = BloodPressure?.Effective; @@ -2204,7 +2204,7 @@ public IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_Gre private IEnumerable Second_Hypertensive_Reading_SBP_Greater_than_or_Equal_to_140_OR_DBP_Greater_than_or_Equal_to_90_Interventions_Value() { CqlValueSet a_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_(ServiceRequest WeeksRescreen) { IEnumerable i_ = this.Laboratory_Test_or_ECG_for_Hypertension(); @@ -2262,8 +2262,8 @@ ServiceRequest aj_(ServiceRequest HTNInterventions) => IEnumerable g_(ServiceRequest WeeksRescreen) { CqlValueSet ap_ = this.Pharmacologic_Therapy_for_Hypertension(); - IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); - IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable at_ = context.Operators.Union(aq_, as_); bool? au_(MedicationRequest Medications) { @@ -2375,10 +2375,10 @@ IEnumerable b_(Encounter QualifyingEncounter) { CqlCode d_ = this.Systolic_blood_pressure(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); CqlCode g_ = this.Diastolic_blood_pressure(); IEnumerable h_ = context.Operators.ToList(g_); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); IEnumerable j_ = context.Operators.Union(f_, i_); bool? k_(Observation NoBPScreen) { @@ -2463,27 +2463,27 @@ public IEnumerable Encounter_with_Medical_Reason_for_Not_Obtaining_or private IEnumerable NonPharmacological_Intervention_Not_Ordered_Value() { CqlValueSet a_ = this.Lifestyle_Recommendation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Weight_Reduction_Recommended(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Dietary_Recommendations(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Recommendation_to_Increase_Physical_Activity(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Referral_or_Counseling_for_Alcohol_Consumption(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); bool? ad_(ServiceRequest NonPharmIntervention) @@ -2532,14 +2532,14 @@ private IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Not_ { CqlCode a_ = this._12_lead_EKG_panel(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); CqlCode d_ = this.EKG_study(); IEnumerable e_ = context.Operators.ToList(d_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, e_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable g_ = context.Operators.Union(c_, f_); CqlValueSet h_ = this.Laboratory_Tests_for_Hypertension(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = context.Operators.Union(g_, l_); bool? n_(ServiceRequest LabECGNotDone) @@ -2582,15 +2582,15 @@ public IEnumerable Laboratory_Test_or_ECG_for_Hypertension_Not_O private IEnumerable Second_Hypertensive_Reading_SBP_130_to_139_OR_DBP_80_to_89_Interventions_Declined_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlCode f_ = this.Follow_up_2_3_months__finding_(); IEnumerable g_ = context.Operators.ToList(f_); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); CqlCode i_ = this.Follow_up_4_6_months__finding_(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable l_ = context.Operators.Union(h_, k_); IEnumerable m_ = context.Operators.Union(e_, l_); bool? n_(ServiceRequest SecondHTNDeclinedReferralAndFollowUp) @@ -2642,12 +2642,12 @@ public IEnumerable Second_Hypertensive_Reading_SBP_130_to_139_OR private IEnumerable Second_Hypertensive_Reading_SBP_Greater_than_or_Equal_to_140_OR_DBP_Greater_than_or_Equal_to_90_Interventions_Declined_Value() { CqlValueSet a_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(ServiceRequest SecondHTN140Over90ReferralFollowUpNotDone) @@ -2685,8 +2685,8 @@ object ab_(Extension @this) }; IEnumerable m_ = context.Operators.Where(k_, l_); CqlValueSet n_ = this.Pharmacologic_Therapy_for_Hypertension(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); - IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-mednotrequested")); IEnumerable r_ = context.Operators.Union(o_, q_); bool? s_(MedicationRequest MedicationRequestNotOrdered) { @@ -2717,15 +2717,15 @@ private IEnumerable Encounter_with_Order_for_Hypertension_Follow_Up_D IEnumerable b_(Encounter ElevatedBPEncounter) { CqlValueSet x_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable ab_ = context.Operators.Union(y_, aa_); CqlCode ac_ = this.Follow_up_2_3_months__finding_(); IEnumerable ad_ = context.Operators.ToList(ac_); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ad_)); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ad_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); CqlCode af_ = this.Follow_up_4_6_months__finding_(); IEnumerable ag_ = context.Operators.ToList(af_); - IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ag_)); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ag_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable ai_ = context.Operators.Union(ae_, ah_); IEnumerable aj_ = context.Operators.Union(ab_, ai_); bool? ak_(ServiceRequest ElevatedBPDeclinedInterventions) @@ -2801,12 +2801,12 @@ Encounter bp_(ServiceRequest NotOrdered) => IEnumerable i_(Encounter FirstHTNEncounter) { CqlValueSet bw_ = this.Follow_Up_Within_4_Weeks(); - IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); - IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default)); + IEnumerable bx_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable bz_ = context.Operators.Retrieve(new RetrieveParameters(default, bw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable ca_ = context.Operators.Union(bx_, bz_); CqlValueSet cb_ = this.Referral_to_Primary_Care_or_Alternate_Provider(); - IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default)); - IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default)); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); + IEnumerable ce_ = context.Operators.Retrieve(new RetrieveParameters(default, cb_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicenotrequested")); IEnumerable cf_ = context.Operators.Union(cc_, ce_); IEnumerable cg_ = context.Operators.Union(ca_, cf_); bool? ch_(ServiceRequest FirstHTNDeclinedInterventions) diff --git a/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs index fad3edf82..0d4980721 100644 --- a/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs @@ -222,7 +222,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -279,18 +279,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Nursing_Facility_Visit(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -327,7 +327,7 @@ private IEnumerable Primary_Open_Angle_Glaucoma_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Primary_Open_Angle_Glaucoma(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? f_(Condition PrimaryOpenAngleGlaucoma) { CqlInterval j_ = QICoreCommon_2_0_000.prevalenceInterval(PrimaryOpenAngleGlaucoma); @@ -408,8 +408,8 @@ public IEnumerable Primary_Open_Angle_Glaucoma_Encounter() => private IEnumerable Medical_Reason_for_Not_Performing_Cup_to_Disc_Ratio_Value() { CqlValueSet a_ = this.Cup_to_Disc_Ratio(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation CupToDiscExamNotPerformed) { @@ -473,8 +473,8 @@ public IEnumerable Medical_Reason_for_Not_Performing_Cup_to_Disc_Ra private IEnumerable Medical_Reason_for_Not_Performing_Optic_Disc_Exam_Value() { CqlValueSet a_ = this.Optic_Disc_Exam_for_Structural_Abnormalities(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observationnotdone")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_(Observation OpticDiscExamNotPerformed) { @@ -553,7 +553,7 @@ public IEnumerable Medical_Reason_for_Not_Performing_Optic_Disc_Exa private IEnumerable Cup_to_Disc_Ratio_Performed_with_Result_Value() { CqlValueSet a_ = this.Cup_to_Disc_Ratio(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_(Observation CupToDiscExamPerformed) { IEnumerable g_ = this.Primary_Open_Angle_Glaucoma_Encounter(); @@ -607,7 +607,7 @@ public IEnumerable Cup_to_Disc_Ratio_Performed_with_Result() => private IEnumerable Optic_Disc_Exam_Performed_with_Result_Value() { CqlValueSet a_ = this.Optic_Disc_Exam_for_Structural_Abnormalities(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_(Observation OpticDiscExamPerformed) { IEnumerable g_ = this.Primary_Open_Angle_Glaucoma_Encounter(); diff --git a/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs b/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs index 91e7b6648..095517fae 100644 --- a/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs @@ -113,7 +113,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -127,7 +127,7 @@ public Patient Patient() => { CqlCode a_ = this.Functional_Assessment_of_Chronic_Illness_Therapy___Palliative_Care_Questionnaire__FACIT_Pal_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.isAssessmentPerformed(c_); bool? e_(Observation PalliativeAssessment) { @@ -142,7 +142,7 @@ public Patient Patient() => IEnumerable f_ = context.Operators.Where(d_, e_); bool? g_ = context.Operators.Exists(f_); CqlValueSet h_ = this.Palliative_Care_Diagnosis(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? j_(Condition PalliativeDiagnosis) { CqlInterval ag_ = QICoreCommon_2_0_000.prevalenceInterval(PalliativeDiagnosis); @@ -155,7 +155,7 @@ public Patient Patient() => bool? l_ = context.Operators.Exists(k_); bool? m_ = context.Operators.Or(g_, l_); CqlValueSet n_ = this.Palliative_Care_Encounter(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = Status_1_6_000.isEncounterPerformed(o_); bool? q_(Encounter PalliativeEncounter) { @@ -171,7 +171,7 @@ public Patient Patient() => bool? s_ = context.Operators.Exists(r_); bool? t_ = context.Operators.Or(m_, s_); CqlValueSet u_ = this.Palliative_Care_Intervention(); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable w_ = Status_1_6_000.isInterventionPerformed(v_); bool? x_(Procedure PalliativeIntervention) { diff --git a/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs b/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs index d670bcd44..84841ab0c 100644 --- a/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs @@ -424,7 +424,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -437,8 +437,8 @@ public Patient Patient() => private IEnumerable Qualifying_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Home_Healthcare_Services(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable c_ = context.Operators.Retrieve(default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? d_(Encounter E) { List ar_ = E?.Type; @@ -489,35 +489,35 @@ CqlConcept bc_(CodeableConcept @this) }; IEnumerable i_ = context.Operators.Where(c_, h_); CqlValueSet j_ = this.Occupational_Therapy_Evaluation(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable l_ = context.Operators.Union(i_, k_); IEnumerable m_ = context.Operators.Union(f_, l_); CqlValueSet n_ = this.Office_Visit(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet p_ = this.Ophthalmological_Services(); - IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable r_ = context.Operators.Union(o_, q_); IEnumerable s_ = context.Operators.Union(m_, r_); CqlValueSet t_ = this.Physical_Therapy_Evaluation(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet v_ = this.Psych_Visit_Diagnostic_Evaluation(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); CqlValueSet z_ = this.Psych_Visit_Psychotherapy(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet ab_ = this.Psychoanalysis(); - IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ad_ = context.Operators.Union(aa_, ac_); IEnumerable ae_ = context.Operators.Union(y_, ad_); CqlValueSet af_ = this.Speech_and_Hearing_Evaluation(); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet ah_ = this.Telephone_Visits(); - IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable aj_ = context.Operators.Union(ag_, ai_); IEnumerable ak_ = context.Operators.Union(ae_, aj_); CqlValueSet al_ = this.Online_Assessments(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable an_ = context.Operators.Union(ak_, am_); IEnumerable ao_ = Status_1_6_000.isEncounterPerformed(an_); bool? ap_(Encounter OfficeBasedEncounter) @@ -542,13 +542,13 @@ public IEnumerable Qualifying_Visit_During_Measurement_Period() => private IEnumerable Preventive_Visit_During_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Group_Counseling(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable h_ = context.Operators.Retrieve(default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? i_(Encounter E) { List ac_ = E?.Type; @@ -576,7 +576,7 @@ CqlConcept ad_(CodeableConcept @this) IEnumerable k_ = context.Operators.Union(g_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? p_(Encounter E) { List am_ = E?.Type; @@ -604,9 +604,9 @@ CqlConcept an_(CodeableConcept @this) IEnumerable r_ = context.Operators.Union(n_, q_); IEnumerable s_ = context.Operators.Union(l_, r_); CqlValueSet t_ = this.Nutrition_Services(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet v_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = context.Operators.Union(s_, x_); IEnumerable z_ = Status_1_6_000.isEncounterPerformed(y_); @@ -669,7 +669,7 @@ public IEnumerable Preventive_Visit_During_Measurement_Period() => private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_User_Value() { CqlValueSet a_ = this.Tobacco_Use_Screening(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation TobaccoUseScreening) { @@ -743,7 +743,7 @@ public Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_User() => private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_Non_User_Value() { CqlValueSet a_ = this.Tobacco_Use_Screening(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.isAssessmentPerformed(b_); bool? d_(Observation TobaccoUseScreening) { @@ -807,7 +807,7 @@ public Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_Non_User( private IEnumerable Tobacco_Cessation_Counseling_Given_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Counseling(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.isInterventionPerformed(b_); bool? d_(Procedure TobaccoCessationCounseling) { @@ -827,7 +827,7 @@ private IEnumerable Tobacco_Cessation_Counseling_Given_Value() IEnumerable e_ = context.Operators.Where(c_, d_); CqlCode f_ = this.Tobacco_abuse_counseling(); IEnumerable g_ = context.Operators.ToList(f_); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, g_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? i_(Condition TobaccoCounseling) { CqlInterval w_ = QICoreCommon_2_0_000.prevalenceInterval(TobaccoCounseling); @@ -855,8 +855,8 @@ public IEnumerable Tobacco_Cessation_Counseling_Given() => private IEnumerable Tobacco_Cessation_Pharmacotherapy_Ordered_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Pharmacotherapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationOrder(e_); bool? g_(MedicationRequest CessationPharmacotherapyOrdered) @@ -885,8 +885,8 @@ public IEnumerable Tobacco_Cessation_Pharmacotherapy_Ordered( private IEnumerable Active_Pharmacotherapy_for_Tobacco_Cessation_Value() { CqlValueSet a_ = this.Tobacco_Use_Cessation_Pharmacotherapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.isMedicationActive(e_); bool? g_(MedicationRequest TakingCessationPharmacotherapy) diff --git a/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs b/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs index fea9da922..ce39fffd7 100644 --- a/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs +++ b/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs @@ -148,7 +148,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -161,7 +161,7 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Clinical_Oral_Evaluation(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable c_ = Status_1_6_000.isEncounterPerformed(b_); bool? d_(Encounter ValidEncounter) { @@ -229,7 +229,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Fluoride_Varnish_Application_for_Children(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.isProcedurePerformed(b_); bool? d_(Procedure FluorideApplication) { diff --git a/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs b/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs index c341d112b..3cc4bc9f5 100644 --- a/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs @@ -252,7 +252,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -309,7 +309,7 @@ public CqlCode SDE_Sex() => private IEnumerable Prostate_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Prostate_Cancer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition ProstateCancer) { CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(ProstateCancer); @@ -336,7 +336,7 @@ public IEnumerable Prostate_Cancer_Diagnosis() => private bool? Has_Diagnosis_of_Pain_related_to_Prostate_Cancer_Value() { CqlValueSet a_ = this.Pain_Warranting_Further_Investigation_for_Prostate_Cancer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition ProstateCancerPain) { IEnumerable f_ = this.Prostate_Cancer_Diagnosis(); @@ -376,7 +376,7 @@ Condition i_(Condition ActiveProstateCancer) => private bool? Has_Salvage_Therapy_Performed_after_Prostate_Cancer_Diagnosis_Value() { CqlValueSet a_ = this.Salvage_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure SalvageTherapy) { IEnumerable f_ = this.Prostate_Cancer_Diagnosis(); @@ -417,7 +417,7 @@ Procedure i_(Condition ActiveProstateCancer) => private IEnumerable Bone_Scan_Study_Performed_Value() { CqlValueSet a_ = this.Bone_Scan(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_(Observation BoneScan) { IEnumerable e_ = this.Prostate_Cancer_Diagnosis(); @@ -490,7 +490,7 @@ public IEnumerable Bone_Scan_Study_Performed() => private Procedure First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period_Value() { CqlValueSet a_ = this.Prostate_Cancer_Treatment(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? c_(Procedure ProstateCancerTreatment) { DataType h_ = ProstateCancerTreatment?.Performed; @@ -543,7 +543,7 @@ public Procedure First_Prostate_Cancer_Treatment_during_day_of_Measurement_Perio { CqlCode a_ = this.Gleason_score_in_Specimen_Qualitative(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_(Observation GleasonScore) { Procedure m_ = this.First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period(); @@ -619,7 +619,7 @@ private Observation Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a_Va { CqlCode a_ = this.Tumor_staging__tumor_staging_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_(Observation ProstateCancerStaging) { Procedure m_ = this.First_Prostate_Cancer_Treatment_during_day_of_Measurement_Period(); @@ -724,7 +724,7 @@ public Observation Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a() = private bool? Most_Recent_PSA_Test_Result_is_Low_Value() { CqlValueSet a_ = this.Prostate_Specific_Antigen_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_(Observation PSATest) { Observation l_ = this.Most_Recent_Prostate_Cancer_Staging_Tumor_Size_T1a_to_T2a(); diff --git a/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs b/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs index bebf3ba89..206d58f9f 100644 --- a/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs @@ -830,7 +830,7 @@ public CqlCode[] USCoreConditionCategoryExtensionCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs index c071d2856..a89de408f 100644 --- a/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs @@ -670,7 +670,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -868,7 +868,7 @@ object v_(Extension @this) IEnumerable f_ = context.Operators.Where((IEnumerable)d_, e_); bool? g_ = context.Operators.Exists(f_); CqlValueSet h_ = this.Severe_Maternal_Morbidity_Procedures(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? j_(Procedure EncounterSMMProcedures) { Code ah_ = EncounterSMMProcedures?.StatusElement; @@ -928,7 +928,7 @@ private IEnumerable Delivery_Encounters_with_Blood_Transfusion_Value( IEnumerable b_(Encounter TwentyWeeksPlusEncounter) { CqlValueSet d_ = this.Blood_Transfusion(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure BloodTransfusion) { Code j_ = BloodTransfusion?.StatusElement; @@ -1016,7 +1016,7 @@ private IEnumerable Delivery_Encounters_with_COVID_and_Respiratory_Co IEnumerable j_ = context.Operators.Where(d_, i_); bool? k_ = context.Operators.Exists(j_); CqlValueSet l_ = this.Respiratory_Support_Procedures_Related_to_COVID_19(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? n_(Procedure COVIDRespiratoryProcedure) { Code aa_ = COVIDRespiratoryProcedure?.StatusElement; @@ -1778,7 +1778,7 @@ public IEnumerable Risk_Variable_Preterm_Birth() => Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.Hematocrit_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation Hematocrit) { Instant z_ = Hematocrit?.IssuedElement; @@ -1822,7 +1822,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation Hematocrit) { Instant ax_ = Hematocrit?.IssuedElement; @@ -1888,7 +1888,7 @@ object s_(Observation @this) Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; CqlValueSet f_ = this.White_blood_cells_count_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? h_(Observation WBC) { Instant z_ = WBC?.IssuedElement; @@ -1932,7 +1932,7 @@ object j_(Observation @this) Observation l_ = context.Operators.First(k_); DataType m_ = l_?.Value; object n_ = FHIRHelpers_4_3_000.ToValue(m_); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/core/StructureDefinition/us-core-observation-lab")); bool? q_(Observation WBC) { Instant ax_ = WBC?.IssuedElement; @@ -1997,7 +1997,7 @@ object s_(Observation @this) { Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/heartrate")); bool? g_(Observation HeartRate) { DataType x_ = HeartRate?.Effective; @@ -2095,7 +2095,7 @@ object q_(Observation @this) { Id d_ = TwentyWeeksPlusEncounter?.IdElement; string e_ = d_?.Value; - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bp")); bool? g_(Observation BP) { DataType aa_ = BP?.Effective; diff --git a/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs b/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs index 80866e18d..9934daa26 100644 --- a/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Status-1.6.000.g.cs @@ -118,7 +118,7 @@ public CqlCode[] ConditionClinicalStatusCodes() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs b/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs index 0a7038155..8112b0cf7 100644 --- a/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs +++ b/Demo/Measures.CMS/CSharp/SupplementalDataElements-3.4.000.g.cs @@ -88,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -225,7 +225,7 @@ DataType ag_(Extension @this) private IEnumerable<(CqlConcept code, CqlInterval period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer_Type(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-coverage")); (CqlConcept code, CqlInterval period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs b/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs index 440c8f4ef..33644beb2 100644 --- a/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs +++ b/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs @@ -163,7 +163,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -176,7 +176,7 @@ public Patient Patient() => private IEnumerable Non_Elective_Inpatient_Encounter_Value() { CqlValueSet a_ = this.Nonelective_Inpatient_Encounter(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter NonElectiveEncounter) { Period e_ = NonElectiveEncounter?.Period; @@ -317,7 +317,7 @@ public IEnumerable Ischemic_Stroke_Encounters_with_Discharge_Disposit private IEnumerable Intervention_Comfort_Measures_Value() { CqlValueSet a_ = this.Comfort_Measures(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); bool? c_(ServiceRequest SR) { Code j_ = SR?.StatusElement; @@ -352,7 +352,7 @@ private IEnumerable Intervention_Comfort_Measures_Value() return aa_; }; IEnumerable d_ = context.Operators.Where(b_, c_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? g_(Procedure InterventionPerformed) { Code ab_ = InterventionPerformed?.StatusElement; diff --git a/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs b/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs index 87e1a6ebb..8a561e0c2 100644 --- a/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs @@ -264,7 +264,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -292,7 +292,7 @@ public Patient Patient() => private bool? Has_Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter ValidEncounter) { CqlInterval f_ = this.Measurement_Period(); @@ -367,7 +367,7 @@ private Condition Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_S { CqlCode a_ = this.Benign_prostatic_hyperplasia_with_lower_urinary_tract_symptoms(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? d_(Condition NewBPHDiagnosis) { CqlInterval i_ = QICoreCommon_2_0_000.prevalenceInterval(NewBPHDiagnosis); @@ -420,7 +420,7 @@ public Condition Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_St { CqlCode a_ = this.International_Prostate_Symptom_Score__IPSS_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation IPSSAssessment) { Code h_ = IPSSAssessment?.StatusElement; @@ -515,7 +515,7 @@ bool y_() { CqlCode a_ = this.American_Urological_Association_Symptom_Index__AUASI_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation AUASIAssessment) { List h_ = AUASIAssessment?.Category; @@ -614,7 +614,7 @@ bool au_() object af_ = FHIRHelpers_4_3_000.ToValue(ae_); CqlCode ag_ = this.If_you_were_to_spend_the_rest_of_your_life_with_your_urinary_condition_just_the_way_it_is_now__how_would_you_feel_about_that__IPSS_(); IEnumerable ah_ = context.Operators.ToList(ag_); - IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_)); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, default, ah_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? aj_(Observation QOLAssessment) { object bk_() @@ -979,7 +979,7 @@ object d_((CqlDateTime effectiveDatetime, int? valueInteger)? @this) private IEnumerable Urinary_Retention_Diagnosis_Starts_Within_1_Year_After_Initial_BPH_Diagnosis_Value() { CqlValueSet a_ = this.Urinary_retention(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition UrinaryRetention) { Condition g_ = this.Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_Start_of_Measurement_Period(); @@ -1035,7 +1035,7 @@ private Condition Initial_BPH_Diagnosis_Starts_During_or_Within_30_Days_After_En IEnumerable c_(Condition InitialBPHDiagnosis) { CqlValueSet f_ = this.Hospital_Services_for_urology_care(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? h_(Encounter InHospitalServices) { CqlInterval l_ = QICoreCommon_2_0_000.prevalenceInterval(InitialBPHDiagnosis); @@ -1077,7 +1077,7 @@ public Condition Initial_BPH_Diagnosis_Starts_During_or_Within_30_Days_After_End private IEnumerable Morbid_Obesity_Diagnosis_On_or_Before_Follow_Up_USS_Assessment_Value() { CqlValueSet a_ = this.Morbid_Obesity(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition MorbidObesity) { (CqlDateTime effectiveDatetime, int? valueInteger)? e_ = this.Urinary_Symptom_Score_6_to_12_Months_After_Initial_BPH_Diagnosis(); @@ -1116,7 +1116,7 @@ public IEnumerable Morbid_Obesity_Diagnosis_On_or_Before_Follow_Up_US private bool? Has_BMI_Exam_Result_Greater_Than_or_Equal_To_40_During_Measurement_Period_and_On_or_Before_Follow_Up_USS_Assessment_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bmi")); IEnumerable b_(Observation BMIExam) { (CqlDateTime effectiveDatetime, int? valueInteger)? g_ = this.Urinary_Symptom_Score_6_to_12_Months_After_Initial_BPH_Diagnosis(); diff --git a/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs index 8b854d42f..da1eaf857 100644 --- a/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs @@ -724,7 +724,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -737,37 +737,37 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Ophthalmologic_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Discharge_Services_Nursing_Facility(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet t_ = this.Annual_Wellness_Visit(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Home_Healthcare_Services(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet z_ = this.Telephone_Visits(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable ab_ = context.Operators.Union(y_, aa_); IEnumerable ac_ = context.Operators.Union(w_, ab_); CqlValueSet ad_ = this.Online_Assessments(); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default)); - IEnumerable af_ = context.Operators.Retrieve(default); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ad_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ag_(Encounter E) { List am_ = E?.Type; @@ -939,96 +939,96 @@ MedicationRequest d_(MedicationRequest OrderMedication1) => private IEnumerable Same_High_Risk_Medications_Ordered_on_Different_Days_Value() { CqlValueSet a_ = this.Anticholinergics__first_generation_antihistamines(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); CqlValueSet g_ = this.Anticholinergics__anti_Parkinson_agents(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = this.More_Than_One_Order(k_); IEnumerable m_ = context.Operators.Union(f_, l_); CqlValueSet n_ = this.Antispasmodics(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); - IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable r_ = context.Operators.Union(o_, q_); IEnumerable s_ = this.More_Than_One_Order(r_); CqlValueSet t_ = this.Antithrombotic(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable x_ = context.Operators.Union(u_, w_); IEnumerable y_ = this.More_Than_One_Order(x_); IEnumerable z_ = context.Operators.Union(s_, y_); IEnumerable aa_ = context.Operators.Union(m_, z_); CqlValueSet ab_ = this.Cardiovascular__alpha_agonists__central(); - IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); - IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ae_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable af_ = context.Operators.Union(ac_, ae_); IEnumerable ag_ = this.More_Than_One_Order(af_); CqlValueSet ah_ = this.Cardiovascular__other(); - IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); - IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default)); + IEnumerable ai_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ak_ = context.Operators.Retrieve(new RetrieveParameters(default, ah_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable al_ = context.Operators.Union(ai_, ak_); IEnumerable am_ = this.More_Than_One_Order(al_); IEnumerable an_ = context.Operators.Union(ag_, am_); IEnumerable ao_ = context.Operators.Union(aa_, an_); CqlValueSet ap_ = this.Central_nervous_system__antidepressants(); - IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); - IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default)); + IEnumerable aq_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable as_ = context.Operators.Retrieve(new RetrieveParameters(default, ap_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable at_ = context.Operators.Union(aq_, as_); IEnumerable au_ = this.More_Than_One_Order(at_); CqlValueSet av_ = this.Central_nervous_system__barbiturates(); - IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default)); + IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, av_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable az_ = context.Operators.Union(aw_, ay_); IEnumerable ba_ = this.More_Than_One_Order(az_); IEnumerable bb_ = context.Operators.Union(au_, ba_); IEnumerable bc_ = context.Operators.Union(ao_, bb_); CqlValueSet bd_ = this.Central_nervous_system__vasodilators(); - IEnumerable be_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default)); - IEnumerable bg_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default)); + IEnumerable be_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bg_ = context.Operators.Retrieve(new RetrieveParameters(default, bd_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bh_ = context.Operators.Union(be_, bg_); IEnumerable bi_ = this.More_Than_One_Order(bh_); CqlValueSet bj_ = this.Central_nervous_system__other(); - IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default)); - IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default)); + IEnumerable bk_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bj_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bn_ = context.Operators.Union(bk_, bm_); IEnumerable bo_ = this.More_Than_One_Order(bn_); IEnumerable bp_ = context.Operators.Union(bi_, bo_); IEnumerable bq_ = context.Operators.Union(bc_, bp_); CqlValueSet br_ = this.Endocrine_system__estrogens_with_or_without_progestins(); - IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default)); - IEnumerable bu_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default)); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable bu_ = context.Operators.Retrieve(new RetrieveParameters(default, br_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable bv_ = context.Operators.Union(bs_, bu_); IEnumerable bw_ = this.More_Than_One_Order(bv_); CqlValueSet bx_ = this.Endocrine_system__sulfonylureas__long_duration(); - IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); - IEnumerable ca_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default)); + IEnumerable by_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ca_ = context.Operators.Retrieve(new RetrieveParameters(default, bx_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cb_ = context.Operators.Union(by_, ca_); IEnumerable cc_ = this.More_Than_One_Order(cb_); IEnumerable cd_ = context.Operators.Union(bw_, cc_); IEnumerable ce_ = context.Operators.Union(bq_, cd_); CqlValueSet cf_ = this.Endocrine_system__other(); - IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); - IEnumerable ci_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default)); + IEnumerable cg_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable ci_ = context.Operators.Retrieve(new RetrieveParameters(default, cf_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cj_ = context.Operators.Union(cg_, ci_); IEnumerable ck_ = this.More_Than_One_Order(cj_); CqlValueSet cl_ = this.Nonbenzodiazepine_hypnotics(); - IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); - IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default)); + IEnumerable cm_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable co_ = context.Operators.Retrieve(new RetrieveParameters(default, cl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cp_ = context.Operators.Union(cm_, co_); IEnumerable cq_ = this.More_Than_One_Order(cp_); IEnumerable cr_ = context.Operators.Union(ck_, cq_); IEnumerable cs_ = context.Operators.Union(ce_, cr_); CqlValueSet ct_ = this.Pain_medications__skeletal_muscle_relaxants(); - IEnumerable cu_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default)); - IEnumerable cw_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default)); + IEnumerable cu_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable cw_ = context.Operators.Retrieve(new RetrieveParameters(default, ct_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable cx_ = context.Operators.Union(cu_, cw_); IEnumerable cy_ = this.More_Than_One_Order(cx_); CqlValueSet cz_ = this.Pain_medications__other(); - IEnumerable da_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default)); - IEnumerable dc_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default)); + IEnumerable da_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable dc_ = context.Operators.Retrieve(new RetrieveParameters(default, cz_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable dd_ = context.Operators.Union(da_, dc_); IEnumerable de_ = this.More_Than_One_Order(dd_); IEnumerable df_ = context.Operators.Union(cy_, de_); @@ -1119,8 +1119,8 @@ public IEnumerable Same_High_Risk_Medications_Ordered_on_Diff private bool? Two_High_Risk_Medications_with_Prolonged_Duration_Value() { CqlValueSet a_ = this.Anti_Infectives__other(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); decimal? g_(MedicationRequest AntiInfectives) @@ -1469,8 +1469,8 @@ bool f_() private bool? High_Risk_Medications_with_Average_Daily_Dose_Criteria_Value() { CqlValueSet a_ = this.Reserpine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest ReserpineOrdered) { @@ -1484,8 +1484,8 @@ bool f_() IEnumerable h_ = this.More_Than_One_Order(g_); bool? i_ = context.Operators.Exists(h_); CqlValueSet j_ = this.Digoxin(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(MedicationRequest DigoxinOrdered) { @@ -1500,8 +1500,8 @@ bool f_() bool? r_ = context.Operators.Exists(q_); bool? s_ = context.Operators.Or(i_, r_); CqlValueSet t_ = this.Doxepin(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable x_ = context.Operators.Union(u_, w_); bool? y_(MedicationRequest DoxepinOrdered) { @@ -1542,8 +1542,8 @@ bool f_() private bool? More_than_One_Antipsychotic_Order_Value() { CqlValueSet a_ = this.Antipsychotic(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); bool? g_ = context.Operators.Exists(f_); @@ -1558,8 +1558,8 @@ bool f_() private CqlDateTime Antipsychotic_Index_Prescription_Start_Date_Value() { CqlValueSet a_ = this.Antipsychotic(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest AntipsychoticMedication) @@ -1593,8 +1593,8 @@ public CqlDateTime Antipsychotic_Index_Prescription_Start_Date() => private bool? More_than_One_Benzodiazepine_Order_Value() { CqlValueSet a_ = this.Benzodiazepine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = this.More_Than_One_Order(e_); bool? g_ = context.Operators.Exists(f_); @@ -1609,8 +1609,8 @@ public CqlDateTime Antipsychotic_Index_Prescription_Start_Date() => private CqlDateTime Benzodiazepine_Index_Prescription_Start_Date_Value() { CqlValueSet a_ = this.Benzodiazepine(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_or_Completed_Medication_Request(e_); bool? g_(MedicationRequest BenzodiazepineMedication) @@ -1645,9 +1645,9 @@ public CqlDateTime Benzodiazepine_Index_Prescription_Start_Date() => { bool? a_ = this.More_than_One_Antipsychotic_Order(); CqlValueSet b_ = this.Schizophrenia(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet d_ = this.Bipolar_Disorder(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(c_, e_); bool? g_(Condition AntipsychoticTreatedDiagnoses) { @@ -1668,18 +1668,18 @@ public CqlDateTime Benzodiazepine_Index_Prescription_Start_Date() => bool? k_ = context.Operators.And(a_, j_); bool? l_ = this.More_than_One_Benzodiazepine_Order(); CqlValueSet m_ = this.Seizure_Disorder(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet o_ = this.REM_Sleep_Behavior_Disorder(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable q_ = context.Operators.Union(n_, p_); CqlValueSet r_ = this.Benzodiazepine_Withdrawal(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet t_ = this.Alcohol_Withdrawal(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); CqlValueSet x_ = this.Generalized_Anxiety_Disorder(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable z_ = context.Operators.Union(w_, y_); bool? aa_(Condition BenzodiazepineTreatedDiagnoses) { diff --git a/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs b/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs index 9df86a6bc..cefb42ace 100644 --- a/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs @@ -91,7 +91,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs b/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs index a4314fae9..7fe3c795f 100644 --- a/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs @@ -420,7 +420,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -477,24 +477,24 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services__Initial_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Preventive_Care__Established_Office_Visit__0_to_17(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services___Group_Counseling(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Home_Healthcare_Services(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable t_ = context.Operators.Union(q_, s_); IEnumerable u_ = Status_1_6_000.Finished_Encounter(t_); bool? v_(Encounter ValidEncounters) @@ -553,7 +553,7 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Pregnancy_Diagnosis_Which_Overlaps_Measurement_Period_Value() { CqlValueSet a_ = this.Pregnancy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_ = Status_1_6_000.Active_Condition(b_); bool? d_(Condition Pregnancy) { @@ -588,7 +588,7 @@ public IEnumerable Pregnancy_Diagnosis_Which_Overlaps_Measurement_Per private IEnumerable BMI_Percentile_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bmi")); IEnumerable b_ = Status_1_6_000.BMI(a_); bool? c_(Observation BMIPercentile) { @@ -615,7 +615,7 @@ public IEnumerable BMI_Percentile_in_Measurement_Period() => private IEnumerable Height_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bodyheight")); IEnumerable b_ = Status_1_6_000.BodyHeight(a_); bool? c_(Observation Height) { @@ -642,7 +642,7 @@ public IEnumerable Height_in_Measurement_Period() => private IEnumerable Weight_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bodyweight")); IEnumerable b_ = Status_1_6_000.BodyWeight(a_); bool? c_(Observation Weight) { @@ -688,7 +688,7 @@ public IEnumerable Weight_in_Measurement_Period() => private bool? Numerator_2_Value() { CqlValueSet a_ = this.Counseling_for_Nutrition(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure NutritionCounseling) { @@ -713,7 +713,7 @@ public IEnumerable Weight_in_Measurement_Period() => private bool? Numerator_3_Value() { CqlValueSet a_ = this.Counseling_for_Physical_Activity(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure ActivityCounseling) { diff --git a/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs b/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs index f80f11d72..e1d0f9924 100644 --- a/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs +++ b/Demo/Measures.Demo/CSharp/AdultOutpatientEncountersFHIR4-2.2.000.g.cs @@ -107,7 +107,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -120,18 +120,18 @@ public Patient Patient() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Annual_Wellness_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Home_Healthcare_Services(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter ValidEncounter) { diff --git a/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs b/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs index f51d0221a..0a6366e45 100644 --- a/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs +++ b/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs @@ -211,7 +211,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -224,8 +224,8 @@ public Patient Patient() => private IEnumerable Dementia_Medications_In_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationRequest DementiaMed) { @@ -260,9 +260,9 @@ public IEnumerable Dementia_Medications_In_Year_Before_or_Dur private IEnumerable> Long_Term_Care_Periods_During_Measurement_Period_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Nursing_Facility_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter LongTermFacilityEncounter) { @@ -299,14 +299,14 @@ public IEnumerable> Long_Term_Care_Periods_During_Measu private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Emergency_Department_Visit(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Nonacute_Inpatient(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); bool? l_(Encounter Outpatient) @@ -321,7 +321,7 @@ private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value IEnumerable n_(Encounter OutpatientEncounter) { CqlValueSet s_ = this.Advanced_Illness(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? u_(Condition AdvancedIllnessDiagnosis) { IEnumerable y_ = MATGlobalCommonFunctionsFHIR4_6_1_000.EncounterDiagnosis(OutpatientEncounter); @@ -478,7 +478,7 @@ public IEnumerable> Long_Term_Care_Adjacent_Periods() = private IEnumerable Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter AcuteInpatient) { Code g_ = AcuteInpatient?.StatusElement; @@ -491,7 +491,7 @@ private IEnumerable Inpatient_Encounter_with_Advanced_Illness_Value() IEnumerable e_(Encounter InpatientEncounter) { CqlValueSet j_ = this.Advanced_Illness(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? l_(Condition AdvancedIllnessDiagnosis) { IEnumerable p_ = MATGlobalCommonFunctionsFHIR4_6_1_000.EncounterDiagnosis(InpatientEncounter); @@ -532,8 +532,8 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DeviceRequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DeviceRequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(DeviceRequest FrailtyDeviceOrder) { @@ -559,7 +559,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => }; IEnumerable g_ = context.Operators.Where(e_, f_); bool? h_ = context.Operators.Exists(g_); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? k_(Observation FrailtyDeviceApplied) { Code at_ = FrailtyDeviceApplied?.StatusElement; @@ -582,7 +582,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? m_ = context.Operators.Exists(l_); bool? n_ = context.Operators.Or(h_, m_); CqlValueSet o_ = this.Frailty_Diagnosis(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? q_(Condition FrailtyDiagnosis) { CqlInterval bc_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(FrailtyDiagnosis); @@ -595,7 +595,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? s_ = context.Operators.Exists(r_); bool? t_ = context.Operators.Or(n_, s_); CqlValueSet u_ = this.Frailty_Encounter(); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? w_(Encounter FrailtyEncounter) { Code bf_ = FrailtyEncounter?.StatusElement; @@ -613,7 +613,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => bool? y_ = context.Operators.Exists(x_); bool? z_ = context.Operators.Or(t_, y_); CqlValueSet aa_ = this.Frailty_Symptom(); - IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default)); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? ac_(Observation FrailtySymptom) { Code bn_ = FrailtySymptom?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs index f3869e9f7..4023fe151 100644 --- a/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs @@ -245,7 +245,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -287,7 +287,7 @@ public CqlInterval Participation_Period() => private IEnumerable Member_Coverage_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); bool? b_(Coverage C) { Period d_ = C?.Period; @@ -390,7 +390,7 @@ public IEnumerable Member_Coverage() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Absence_of_Right_Breast(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition RightMastectomyDiagnosis) { @@ -414,10 +414,10 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -437,7 +437,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -479,7 +479,7 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Absence_of_Left_Breast(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition LeftMastectomyDiagnosis) { @@ -503,10 +503,10 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -526,7 +526,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -568,7 +568,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable c_ = NCQAStatus_1_0_0.Active_Condition(b_); bool? d_(Condition BilateralMastectomyHistory) { @@ -592,10 +592,10 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable c_ = NCQAStatus_1_0_0.Completed_Procedure(b_); CqlValueSet d_ = this.Unilateral_Mastectomy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable f_ = NCQAStatus_1_0_0.Completed_Procedure(e_); bool? g_(Procedure UnilateralMastectomyProcedure) { @@ -615,7 +615,7 @@ CqlConcept s_(CodeableConcept X) IEnumerable h_ = context.Operators.Where(f_, g_); IEnumerable i_ = context.Operators.Union(c_, h_); CqlValueSet j_ = this.Clinical_Unilateral_Mastectomy(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable l_ = NCQAStatus_1_0_0.Completed_Procedure(k_); bool? m_(Procedure ClinicalUnilateralMastectomyProcedure) { @@ -702,7 +702,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Numerator_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Mammogram) { DataType f_ = Mammogram?.Effective; diff --git a/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs b/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs index 02f1871e2..abc9d4c41 100644 --- a/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs @@ -232,7 +232,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -289,9 +289,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -376,9 +376,9 @@ public IEnumerable Telehealth_Services() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Right_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -418,7 +418,7 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure UnilateralMastectomyRightPerformed) { Code e_ = UnilateralMastectomyRightPerformed?.StatusElement; @@ -446,9 +446,9 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Left_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -488,7 +488,7 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure UnilateralMastectomyLeftPerformed) { Code e_ = UnilateralMastectomyLeftPerformed?.StatusElement; @@ -516,7 +516,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_bilateral_mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition BilateralMastectomyHistory) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(BilateralMastectomyHistory); @@ -539,7 +539,7 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure BilateralMastectomyPerformed) { Code e_ = BilateralMastectomyPerformed?.StatusElement; @@ -612,7 +612,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -654,7 +654,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DiagnosticReport")); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -727,7 +727,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -770,7 +770,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DiagnosticReport")); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs b/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs index ab8608f76..733faaabe 100644 --- a/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs +++ b/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs @@ -216,7 +216,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -273,20 +273,20 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Home_Healthcare_Services(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Telephone_Visits(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet n_ = this.Online_Assessments(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter ValidEncounter) @@ -352,7 +352,7 @@ public IEnumerable Qualifying_Encounters() => private IEnumerable Absence_of_Cervix_Value() { CqlValueSet a_ = this.Hysterectomy_with_No_Residual_Cervix(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure NoCervixProcedure) { Code j_ = NoCervixProcedure?.StatusElement; @@ -370,7 +370,7 @@ private IEnumerable Absence_of_Cervix_Value() }; IEnumerable d_ = context.Operators.Where(b_, c_); CqlValueSet e_ = this.Congenital_or_Acquired_Absence_of_Cervix(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? g_(Condition NoCervixDiagnosis) { CqlInterval t_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(NoCervixDiagnosis); @@ -410,7 +410,7 @@ public IEnumerable Absence_of_Cervix() => private IEnumerable Cervical_Cytology_Within_3_Years_Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation CervicalCytology) { Code e_ = CervicalCytology?.StatusElement; @@ -465,7 +465,7 @@ public IEnumerable Cervical_Cytology_Within_3_Years() => private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older_Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation HPVTest) { Code e_ = HPVTest?.StatusElement; @@ -587,7 +587,7 @@ public CqlDateTime latest(object choice) private IEnumerable Cervical_Cytology_Within_3_Years__2__Value() { CqlValueSet a_ = this.Pap_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation CervicalCytology) { bool? e_ = this.isComplete(CervicalCytology); @@ -632,7 +632,7 @@ public CqlInterval toInterval(object choice) private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Older__2__Value() { CqlValueSet a_ = this.HPV_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation HPVTest) { bool? e_ = this.isComplete(HPVTest); diff --git a/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs b/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs index 1037ad5e3..2b3d386c9 100644 --- a/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs @@ -470,7 +470,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -527,9 +527,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -610,7 +610,7 @@ public IEnumerable Telehealth_Services() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition ColorectalCancer) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColorectalCancer); @@ -633,7 +633,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colectomy) { Code e_ = Colectomy?.StatusElement; @@ -661,7 +661,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Total_Colectomy_Condition_Value() { CqlValueSet a_ = this.Total_Colectomy_ICD9(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition ColectomyDx) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColectomyDx); @@ -720,7 +720,7 @@ public IEnumerable Total_Colectomy_Condition() => private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Occult_Blood_Test_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { DataType g_ = FecalOccult?.Effective; @@ -821,7 +821,7 @@ string ak_(Code @this) private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -899,7 +899,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -977,7 +977,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffs private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { List e_ = FecalOccult?.Category; @@ -1047,7 +1047,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -1082,7 +1082,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Immunochemical_Test_DNA_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { DataType g_ = FitDNA?.Effective; @@ -1186,7 +1186,7 @@ string ao_(Code @this) private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1272,7 +1272,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed() => private IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1358,7 +1358,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { List e_ = FitDNA?.Category; @@ -1436,7 +1436,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1479,7 +1479,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable CT_Colonography_Display_Date_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { DataType g_ = Colonography?.Effective; @@ -1518,7 +1518,7 @@ public IEnumerable CT_Colonography_Display_Date() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1559,7 +1559,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable CT_Colonography_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1601,7 +1601,7 @@ public IEnumerable CT_Colonography_Performed_without_appropriate_st private IEnumerable Flexible_Sigmoidoscopy_Display_Date_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { DataType g_ = FlexibleSigmoidoscopy?.Performed; @@ -1640,7 +1640,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Display_Date() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1675,7 +1675,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1711,7 +1711,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropria private IEnumerable Colonoscopy_Display_Date_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { DataType g_ = Colonoscopy?.Performed; @@ -1750,7 +1750,7 @@ public IEnumerable Colonoscopy_Display_Date() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; @@ -1785,7 +1785,7 @@ public IEnumerable Colonoscopy_Performed() => private IEnumerable Colonoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs b/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs index ebc973288..71ae42986 100644 --- a/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs +++ b/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs @@ -341,7 +341,7 @@ public string ErrorLevel() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs b/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs index d99a825ac..d94584efa 100644 --- a/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs +++ b/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs @@ -301,7 +301,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -358,18 +358,18 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Ophthalmological_Services(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Nursing_Facility_Visit(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Encounter QualifyingEncounter) { @@ -399,7 +399,7 @@ private IEnumerable Diabetic_Retinopathy_Encounter_Value() IEnumerable b_(Encounter ValidQualifyingEncounter) { CqlValueSet d_ = this.Diabetic_Retinopathy(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? f_(Condition DiabeticRetinopathy) { CodeableConcept j_ = DiabeticRetinopathy?.ClinicalStatus; @@ -466,7 +466,7 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable d_(Communication LevelOfSeverityNotCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -525,7 +525,7 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlCode b_ = this.Macular_edema_absent__situation_(); IEnumerable c_ = context.Operators.ToList(b_); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable e_(Communication MacularEdemaAbsentNotCommunicated) { IEnumerable i_ = this.Diabetic_Retinopathy_Encounter(); @@ -583,7 +583,7 @@ private IEnumerable Medical_or_Patient_Reason_for_Not_Communicati { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_Edema_Findings_Present(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable d_(Communication MacularEdemaPresentNotCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -679,7 +679,7 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin private IEnumerable Macular_Exam_Performed_Value() { CqlValueSet a_ = this.Macular_Exam(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable c_(Observation MacularExam) { IEnumerable g_ = this.Diabetic_Retinopathy_Encounter(); @@ -744,7 +744,7 @@ private IEnumerable Level_of_Severity_of_Retinopathy_Findings_Com { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Level_of_Severity_of_Retinopathy_Findings(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable d_(Communication LevelOfSeverityCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); @@ -789,7 +789,7 @@ private IEnumerable Macular_Edema_Absence_Communicated_Value() PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlCode b_ = this.Macular_edema_absent__situation_(); IEnumerable c_ = context.Operators.ToList(b_); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(a_, default, c_, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable e_(Communication MacularEdemaAbsentCommunicated) { IEnumerable i_ = this.Diabetic_Retinopathy_Encounter(); @@ -833,7 +833,7 @@ private IEnumerable Macular_Edema_Presence_Communicated_Value() { PropertyInfo a_ = typeof(Communication).GetProperty("ReasonCode"); CqlValueSet b_ = this.Macular_Edema_Findings_Present(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(a_, b_, default, "http://hl7.org/fhir/StructureDefinition/Communication")); IEnumerable d_(Communication MacularEdemaPresentCommunicated) { IEnumerable h_ = this.Diabetic_Retinopathy_Encounter(); diff --git a/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs b/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs index f0e33ff7a..4103c28e5 100644 --- a/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/DevDays-2023.0.0.g.cs @@ -95,7 +95,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -107,7 +107,7 @@ public Patient Patient() => private IEnumerable Jet_engine_conditions_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? b_(Condition c) { CodeableConcept d_ = c?.Code; @@ -141,7 +141,7 @@ public IEnumerable Jet_engine_conditions() => private IEnumerable Subsequent_encounters_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? b_(Condition c) { CodeableConcept d_ = c?.Code; diff --git a/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs b/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs index 9d80c529b..ced8c8a6c 100644 --- a/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs +++ b/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs @@ -237,7 +237,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -294,7 +294,7 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Telephone_Visits(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter TelehealthEncounter) { Code e_ = TelehealthEncounter?.StatusElement; @@ -335,7 +335,7 @@ public IEnumerable Telehealth_Services() => bool? n_ = context.Operators.Exists(m_); bool? o_ = context.Operators.And(j_, n_); CqlValueSet p_ = this.Diabetes(); - IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? r_(Condition Diabetes) { CqlInterval v_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Diabetes); @@ -369,7 +369,7 @@ public IEnumerable Telehealth_Services() => private Observation Most_Recent_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation RecentHbA1c) { Code h_ = RecentHbA1c?.StatusElement; @@ -439,7 +439,7 @@ public Observation Most_Recent_HbA1c() => private bool? Has_No_Record_Of_HbA1c_Value() { CqlValueSet a_ = this.HbA1c_Laboratory_Test(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation NoHbA1c) { Code g_ = NoHbA1c?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs b/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs index 4eaca4516..b833f24a4 100644 --- a/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs +++ b/Demo/Measures.Demo/CSharp/DischargedonAntithromboticTherapyFHIR-0.0.010.g.cs @@ -227,7 +227,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -251,7 +251,7 @@ public IEnumerable Denominator() => private IEnumerable Antithrombotic_Not_Given_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? c_(MedicationRequest NoAntithromboticDischarge) { FhirBoolean e_ = NoAntithromboticDischarge?.DoNotPerformElement; @@ -354,7 +354,7 @@ public IEnumerable Encounter_With_No_Antithrombotic_At_Discharge() => private IEnumerable Pharmacological_Contraindications_for_Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Pharmacological_Contraindications_For_Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? c_(MedicationRequest Pharmacological) { FhirBoolean e_ = Pharmacological?.DoNotPerformElement; @@ -474,7 +474,7 @@ public IEnumerable Initial_Population() => private IEnumerable Antithrombotic_Therapy_at_Discharge_Value() { CqlValueSet a_ = this.Antithrombotic_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? c_(MedicationRequest Antithrombotic) { FhirBoolean e_ = Antithrombotic?.DoNotPerformElement; diff --git a/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs b/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs index 2bada9993..57ec53caa 100644 --- a/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs @@ -232,7 +232,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -289,9 +289,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -376,9 +376,9 @@ public IEnumerable Telehealth_Services() => private IEnumerable Right_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Right_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -418,7 +418,7 @@ public IEnumerable Right_Mastectomy_Diagnosis() => private IEnumerable Right_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Right(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure UnilateralMastectomyRightPerformed) { Code e_ = UnilateralMastectomyRightPerformed?.StatusElement; @@ -446,9 +446,9 @@ public IEnumerable Right_Mastectomy_Procedure() => private IEnumerable Left_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.Status_Post_Left_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Unilateral_Mastectomy__Unspecified_Laterality(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition UnilateralMastectomyDiagnosis) { List j_ = UnilateralMastectomyDiagnosis?.BodySite; @@ -488,7 +488,7 @@ public IEnumerable Left_Mastectomy_Diagnosis() => private IEnumerable Left_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Unilateral_Mastectomy_Left(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure UnilateralMastectomyLeftPerformed) { Code e_ = UnilateralMastectomyLeftPerformed?.StatusElement; @@ -516,7 +516,7 @@ public IEnumerable Left_Mastectomy_Procedure() => private IEnumerable Bilateral_Mastectomy_Diagnosis_Value() { CqlValueSet a_ = this.History_of_bilateral_mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition BilateralMastectomyHistory) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(BilateralMastectomyHistory); @@ -539,7 +539,7 @@ public IEnumerable Bilateral_Mastectomy_Diagnosis() => private IEnumerable Bilateral_Mastectomy_Procedure_Value() { CqlValueSet a_ = this.Bilateral_Mastectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure BilateralMastectomyPerformed) { Code e_ = BilateralMastectomyPerformed?.StatusElement; @@ -612,7 +612,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -654,7 +654,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_with_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DiagnosticReport")); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -727,7 +727,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Observation_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Mammogram) { Code f_ = Mammogram?.StatusElement; @@ -770,7 +770,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => private bool? Diagnostic_Report_without_appropriate_status_Value() { CqlValueSet a_ = this.Mammography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/DiagnosticReport")); bool? c_(DiagnosticReport Mammogram) { Code f_ = Mammogram?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs b/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs index feea3063f..a8b7af1f6 100644 --- a/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs @@ -470,7 +470,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -527,9 +527,9 @@ public CqlCode SDE_Sex() => private IEnumerable Telehealth_Services_Value() { CqlValueSet a_ = this.Online_Assessments(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Telephone_Visits(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(Encounter TelehealthEncounter) { @@ -610,7 +610,7 @@ public IEnumerable Telehealth_Services() => private IEnumerable Malignant_Neoplasm_Value() { CqlValueSet a_ = this.Malignant_Neoplasm_of_Colon(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition ColorectalCancer) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColorectalCancer); @@ -633,7 +633,7 @@ public IEnumerable Malignant_Neoplasm() => private IEnumerable Total_Colectomy_Performed_Value() { CqlValueSet a_ = this.Total_Colectomy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colectomy) { Code e_ = Colectomy?.StatusElement; @@ -661,7 +661,7 @@ public IEnumerable Total_Colectomy_Performed() => private IEnumerable Total_Colectomy_Condition_Value() { CqlValueSet a_ = this.Total_Colectomy_ICD9(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition ColectomyDx) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ColectomyDx); @@ -720,7 +720,7 @@ public IEnumerable Total_Colectomy_Condition() => private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Occult_Blood_Test_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { DataType g_ = FecalOccult?.Effective; @@ -821,7 +821,7 @@ string ak_(Code @this) private IEnumerable Fecal_Occult_Blood_Test_Performed_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -899,7 +899,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed() => private IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -977,7 +977,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed__day_of_TZoffs private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { List e_ = FecalOccult?.Category; @@ -1047,7 +1047,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.Fecal_Occult_Blood_Test__FOBT_(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FecalOccult) { Code e_ = FecalOccult?.StatusElement; @@ -1082,7 +1082,7 @@ public IEnumerable Fecal_Occult_Blood_Test_Performed_without_approp private IEnumerable<(CqlDateTime occultDate, IEnumerable occultResult, IEnumerable occultCategoryCode, Code occultStatus)?> Fecal_Immunochemical_Test_DNA_Display_Date__Result__Category__Status_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { DataType g_ = FitDNA?.Effective; @@ -1186,7 +1186,7 @@ string ao_(Code @this) private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1272,7 +1272,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed() => private IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1358,7 +1358,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed__day_of_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_category__ignore_status__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { List e_ = FitDNA?.Category; @@ -1436,7 +1436,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_appropriate_status__ignore_category__day_of_TZoffset_Value() { CqlValueSet a_ = this.FIT_DNA(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FitDNA) { Code e_ = FitDNA?.StatusElement; @@ -1479,7 +1479,7 @@ public IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without_ private IEnumerable CT_Colonography_Display_Date_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { DataType g_ = Colonography?.Effective; @@ -1518,7 +1518,7 @@ public IEnumerable CT_Colonography_Display_Date() => private IEnumerable CT_Colonography_Performed_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1559,7 +1559,7 @@ public IEnumerable CT_Colonography_Performed() => private IEnumerable CT_Colonography_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.CT_Colonography(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation Colonography) { Code e_ = Colonography?.StatusElement; @@ -1601,7 +1601,7 @@ public IEnumerable CT_Colonography_Performed_without_appropriate_st private IEnumerable Flexible_Sigmoidoscopy_Display_Date_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { DataType g_ = FlexibleSigmoidoscopy?.Performed; @@ -1640,7 +1640,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Display_Date() => private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1675,7 +1675,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed() => private IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Flexible_Sigmoidoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FlexibleSigmoidoscopy) { Code e_ = FlexibleSigmoidoscopy?.StatusElement; @@ -1711,7 +1711,7 @@ public IEnumerable Flexible_Sigmoidoscopy_Performed_without_appropria private IEnumerable Colonoscopy_Display_Date_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { DataType g_ = Colonoscopy?.Performed; @@ -1750,7 +1750,7 @@ public IEnumerable Colonoscopy_Display_Date() => private IEnumerable Colonoscopy_Performed_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; @@ -1785,7 +1785,7 @@ public IEnumerable Colonoscopy_Performed() => private IEnumerable Colonoscopy_Performed_without_appropriate_status_Value() { CqlValueSet a_ = this.Colonoscopy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure Colonoscopy) { Code e_ = Colonoscopy?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs b/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs index 14df5e343..8afc60964 100644 --- a/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs +++ b/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs @@ -489,7 +489,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -502,18 +502,18 @@ public Patient Patient() => private IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measurement_Period_Value() { CqlValueSet a_ = this.Myocardial_Infarction(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Cerebrovascular_Disease__Stroke__TIA(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Atherosclerosis_and_Peripheral_Arterial_Disease(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet h_ = this.Ischemic_Heart_Disease_or_Other_Related_Diagnoses(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Stable_and_Unstable_Angina(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable n_ = context.Operators.Union(k_, m_); bool? o_(Condition ASCVDDiagnosis) { @@ -527,14 +527,14 @@ private IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measureme }; IEnumerable p_ = context.Operators.Where(n_, o_); CqlValueSet q_ = this.PCI(); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, q_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); CqlValueSet s_ = this.CABG_Surgeries(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable u_ = context.Operators.Union(r_, t_); CqlValueSet v_ = this.Carotid_Intervention(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); CqlValueSet x_ = this.CABG__PCI_Procedure(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable z_ = context.Operators.Union(w_, y_); IEnumerable aa_ = context.Operators.Union(u_, z_); bool? ab_(Procedure ASCVDProcedure) @@ -565,26 +565,26 @@ public IEnumerable ASCVD_Diagnosis_or_Procedure_before_End_of_Measuremen private IEnumerable Qualifying_Encounter_during_Measurement_Period_Value() { CqlValueSet a_ = this.Annual_Wellness_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Office_Visit(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Outpatient_Consultation(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Outpatient_Encounters_for_Preventive_Care(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet n_ = this.Preventive_Care_Services___Other(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Preventive_Care_Services_Individual_Counseling(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet t_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -656,7 +656,7 @@ public IEnumerable Qualifying_Encounter_during_Measurement_Period() = private IEnumerable LDL_Result_Greater_Than_or_Equal_To_190_Value() { CqlValueSet a_ = this.LDL_Cholesterol(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation LDL) { DataType e_ = LDL?.Value; @@ -695,7 +695,7 @@ public IEnumerable LDL_Result_Greater_Than_or_Equal_To_190() => private IEnumerable Hypercholesterolemia_Diagnosis_Value() { CqlValueSet a_ = this.Hypercholesterolemia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition Hypercholesterolemia) { CqlInterval e_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Hypercholesterolemia); @@ -763,7 +763,7 @@ public IEnumerable Hypercholesterolemia_Diagnosis() => private bool? Has_Diabetes_Diagnosis_Value() { CqlValueSet a_ = this.Diabetes(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition Diabetes) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Diabetes); @@ -887,7 +887,7 @@ public CqlCode SDE_Sex() => private bool? Has_Allergy_to_Statin_Value() { CqlValueSet a_ = this.Statin_Allergen(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/AllergyIntolerance")); bool? c_(AllergyIntolerance StatinAllergy) { DataType f_ = StatinAllergy?.Onset; @@ -912,9 +912,9 @@ public CqlCode SDE_Sex() => private bool? Has_Order_or_Receiving_Hospice_Care_or_Palliative_Care_Value() { CqlValueSet a_ = this.Hospice_Care_Ambulatory(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/ServiceRequest")); CqlValueSet c_ = this.Palliative_or_Hospice_Care(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/ServiceRequest")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(ServiceRequest PalliativeOrHospiceCareOrder) { @@ -941,8 +941,8 @@ public CqlCode SDE_Sex() => }; IEnumerable g_ = context.Operators.Where(e_, f_); bool? h_ = context.Operators.Exists(g_); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable m_ = context.Operators.Union(j_, l_); bool? n_(Procedure PalliativeOrHospiceCarePerformed) { @@ -964,7 +964,7 @@ public CqlCode SDE_Sex() => bool? q_ = context.Operators.Or(h_, p_); CqlCode r_ = this.Encounter_for_palliative_care(); IEnumerable s_ = context.Operators.ToList(r_); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, default, s_)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, default, s_, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? u_(Encounter PalliativeEncounter) { Period aw_ = PalliativeEncounter?.Period; @@ -994,12 +994,12 @@ public CqlCode SDE_Sex() => private bool? Has_Hepatitis_or_Liver_Disease_Diagnosis_Value() { CqlValueSet a_ = this.Hepatitis_A(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Hepatitis_B(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Liver_Disease(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition HepatitisLiverDisease) { @@ -1022,7 +1022,7 @@ public CqlCode SDE_Sex() => private bool? Has_Statin_Associated_Muscle_Symptoms_Value() { CqlValueSet a_ = this.Statin_Associated_Muscle_Symptoms(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition StatinMuscleSymptom) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(StatinMuscleSymptom); @@ -1046,7 +1046,7 @@ public CqlCode SDE_Sex() => private bool? Has_ESRD_Diagnosis_Value() { CqlValueSet a_ = this.End_Stage_Renal_Disease(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition ESRD) { CqlInterval f_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(ESRD); @@ -1068,7 +1068,7 @@ public CqlCode SDE_Sex() => private bool? Has_Adverse_Reaction_to_Statin_Value() { CqlValueSet a_ = this.Statin_Allergen(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/AdverseEvent")); bool? c_(AdverseEvent StatinReaction) { FhirDateTime f_ = StatinReaction?.DateElement; @@ -1112,12 +1112,12 @@ public CqlCode SDE_Sex() => private bool? Denominator_Exclusions_Value() { CqlValueSet a_ = this.Pregnancy_or_Other_Related_Diagnoses(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); CqlValueSet c_ = this.Breastfeeding(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Rhabdomyolysis(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable h_ = context.Operators.Union(e_, g_); bool? i_(Condition ExclusionDiagnosis) { @@ -1140,17 +1140,17 @@ public CqlCode SDE_Sex() => private IEnumerable Statin_Therapy_Ordered_during_Measurement_Period_Value() { CqlValueSet a_ = this.Low_Intensity_Statin_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Moderate_Intensity_Statin_Therapy(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.High_Intensity_Statin_Therapy(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(MedicationRequest StatinOrdered) @@ -1186,17 +1186,17 @@ public IEnumerable Statin_Therapy_Ordered_during_Measurement_ private IEnumerable Prescribed_Statin_Therapy_Any_Time_during_Measurement_Period_Value() { CqlValueSet a_ = this.Low_Intensity_Statin_Therapy(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Moderate_Intensity_Statin_Therapy(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.High_Intensity_Statin_Therapy(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(MedicationRequest ActiveStatin) diff --git a/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs b/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs index 03feb60ac..d05f9cb78 100644 --- a/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs +++ b/Demo/Measures.Demo/CSharp/FHIRHelpers-4.0.001.g.cs @@ -33,7 +33,7 @@ public FHIRHelpers_4_0_001(CqlContext context) } private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs b/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs index 4fefb2877..390f2daeb 100644 --- a/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs +++ b/Demo/Measures.Demo/CSharp/HospiceFHIR4-2.3.000.g.cs @@ -111,7 +111,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -124,7 +124,7 @@ public Patient Patient() => private bool? Has_Hospice_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter DischargeHospice) { Code r_ = DischargeHospice?.StatusElement; @@ -155,7 +155,7 @@ public Patient Patient() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Hospice_care_ambulatory(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/ServiceRequest")); bool? h_(ServiceRequest HospiceOrder) { Code ao_ = HospiceOrder?.StatusElement; @@ -180,7 +180,7 @@ public Patient Patient() => IEnumerable i_ = context.Operators.Where(g_, h_); bool? j_ = context.Operators.Exists(i_); bool? k_ = context.Operators.Or(e_, j_); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? n_(Procedure HospicePerformed) { Code bb_ = HospicePerformed?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs b/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs index e9d21b114..37d2f5522 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs @@ -163,7 +163,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -220,7 +220,7 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); return b_; } @@ -279,7 +279,7 @@ private IEnumerable Qualifying_Encounters_With_Existing_Diabetes_Diag IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> b_((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization) { CqlValueSet f_ = this.Diabetes(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? h_(Condition DiabetesDiagnosis) { CodeableConcept l_ = DiabetesDiagnosis?.VerificationStatus; @@ -323,8 +323,8 @@ private IEnumerable Qualifying_Encounters_With_Hypoglycemic_Medicatio { IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> a_ = this.Qualifying_Encounters_With_Hospitalization_Period(); CqlValueSet b_ = this.Hypoglycemics_Treatment_Medications(); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/StructureDefinition/MedicationAdministration")); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/StructureDefinition/MedicationAdministration")); IEnumerable f_ = context.Operators.Union(c_, e_); IEnumerable hospitalizationPeriod)?, MedicationAdministration>> g_ = context.Operators.CrossJoin<(Encounter encounter, CqlInterval hospitalizationPeriod)?, MedicationAdministration>(a_, f_); ((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization, MedicationAdministration HypoglycemicMedication)? h_(ValueTuple<(Encounter encounter, CqlInterval hospitalizationPeriod)?, MedicationAdministration> _valueTuple) @@ -369,7 +369,7 @@ private IEnumerable Qualifying_Encounters_With_Elevated_Blood_Glucose IEnumerable<(Encounter encounter, CqlInterval hospitalizationPeriod)?> b_((Encounter encounter, CqlInterval hospitalizationPeriod)? EncounterWithHospitalization) { CqlValueSet f_ = this.Glucose_lab_test(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? h_(Observation BloodGlucoseLab) { DataType l_ = BloodGlucoseLab?.Effective; @@ -571,7 +571,7 @@ bool m_() int? j_ = EncounterDay?.dayIndex; CqlInterval k_ = EncounterDay?.dayPeriod; CqlValueSet l_ = this.Glucose_lab_test(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? n_(Observation BloodGlucoseLab1) { Code ac_ = BloodGlucoseLab1?.StatusElement; @@ -592,7 +592,7 @@ bool m_() }; IEnumerable o_ = context.Operators.Where(m_, n_); bool? p_ = context.Operators.Exists(o_); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? s_(Observation BloodGlucoseLab2) { Code ap_ = BloodGlucoseLab2?.StatusElement; @@ -613,7 +613,7 @@ bool m_() }; IEnumerable t_ = context.Operators.Where(r_, s_); bool? u_ = context.Operators.Exists(t_); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? x_(Observation BloodGlucoseLab3) { Code bc_ = BloodGlucoseLab3?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs b/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs index 8d2276ed4..47130fe67 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs @@ -178,7 +178,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -224,7 +224,7 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -276,8 +276,8 @@ public IEnumerable Qualifying_Encounter() => private IEnumerable Hypoglycemic_Medication_Administration_Value() { CqlValueSet a_ = this.Hypoglycemics_Severe_Hypoglycemia(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationAdministration")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationAdministration")); IEnumerable e_ = context.Operators.Union(b_, d_); bool? f_(MedicationAdministration HypoMedication) { @@ -360,7 +360,7 @@ private IEnumerable Severe_Hypoglycemic_Harm_Event_Value() bool? b_(Encounter QualifyingEncounter) { CqlValueSet d_ = this.Glucose_lab_test(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable f_(Observation BloodGlucoseLab) { IEnumerable r_ = this.Hypoglycemic_Medication_Administration(); @@ -406,7 +406,7 @@ Observation u_(MedicationAdministration HypoglycemicMeds) => return v_; }; IEnumerable g_ = context.Operators.SelectMany(e_, f_); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable j_(Observation BloodGlucoseLab) { IEnumerable bd_ = this.Hypoglycemic_Medication_Administration(); @@ -455,7 +455,7 @@ Observation bg_(MedicationAdministration HypoglycemicMeds) => IEnumerable l_(Observation BloodGlucoseLab) { CqlValueSet cp_ = this.Glucose_lab_test(); - IEnumerable cq_ = context.Operators.Retrieve(new RetrieveParameters(default, cp_, default)); + IEnumerable cq_ = context.Operators.Retrieve(new RetrieveParameters(default, cp_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? cr_(Observation FollowupBloodGlucoseLab) { DataType cv_ = FollowupBloodGlucoseLab?.Effective; diff --git a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs index ebbf4451f..163f8870d 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs @@ -278,7 +278,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -345,9 +345,9 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -643,36 +643,36 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlValueSet i_ = this.Body_temperature(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable k_ = this.FirstPhysicalExamWithEncounterId(j_, "FirstTemperature"); CqlCode l_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable m_ = context.Operators.ToList(l_); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, default, m_)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, default, m_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstO2Saturation"); CqlValueSet p_ = this.Hematocrit_lab_test(); - IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default)); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable r_ = this.FirstLabTestWithEncounterId(q_, "FirstHematocrit"); CqlValueSet s_ = this.Platelet_count_lab_test(); - IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default)); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable u_ = this.FirstLabTestWithEncounterId(t_, "FirstPlateletCount"); CqlValueSet v_ = this.White_blood_cells_count_lab_test(); - IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default)); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable x_ = this.FirstLabTestWithEncounterId(w_, "FirstWhiteBloodCell"); CqlValueSet y_ = this.Sodium_lab_test(); - IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default)); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable aa_ = this.FirstLabTestWithEncounterId(z_, "FirstSodium"); CqlValueSet ab_ = this.Bicarbonate_lab_test(); - IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default)); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ad_ = this.FirstLabTestWithEncounterId(ac_, "FirstBicarbonate"); CqlValueSet ae_ = this.Creatinine_lab_test(); - IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default)); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ag_ = this.FirstLabTestWithEncounterId(af_, "FirstCreatinine"); IEnumerable[] ah_ = [ d_, @@ -736,14 +736,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -784,7 +784,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -824,7 +824,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -882,7 +882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; diff --git a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs index 41b3b38cf..43ab546e4 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs @@ -308,7 +308,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -371,14 +371,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -419,7 +419,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -459,7 +459,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -517,7 +517,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -581,9 +581,9 @@ object s_(Encounter @this) private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -998,46 +998,46 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlCode i_ = this.Respiratory_rate(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable l_ = this.FirstPhysicalExamWithEncounterId(k_, "FirstRespRate"); CqlValueSet m_ = this.Body_temperature(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstTemperature"); CqlCode p_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable q_ = context.Operators.ToList(p_); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, default, q_)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, default, q_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable s_ = this.FirstPhysicalExamWithEncounterId(r_, "FirstO2Saturation"); CqlValueSet t_ = this.Body_weight(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable v_ = this.FirstPhysicalExamWithEncounterIdUsingLabTiming(u_, "FirstWeight"); CqlValueSet w_ = this.Hematocrit_lab_test(); - IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable y_ = this.FirstLabTestWithEncounterId(x_, "FirstHematocrit"); CqlValueSet z_ = this.White_blood_cells_count_lab_test(); - IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default)); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ab_ = this.FirstLabTestWithEncounterId(aa_, "FirstWhiteBloodCell"); CqlValueSet ac_ = this.Potassium_lab_test(); - IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default)); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ae_ = this.FirstLabTestWithEncounterId(ad_, "FirstPotassium"); CqlValueSet af_ = this.Sodium_lab_test(); - IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default)); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ah_ = this.FirstLabTestWithEncounterId(ag_, "FirstSodium"); CqlValueSet ai_ = this.Bicarbonate_lab_test(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ak_ = this.FirstLabTestWithEncounterId(aj_, "FirstBicarbonate"); CqlValueSet al_ = this.Creatinine_lab_test(); - IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default)); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable an_ = this.FirstLabTestWithEncounterId(am_, "FirstCreatinine"); CqlValueSet ao_ = this.Glucose_lab_test(); - IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default)); + IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable aq_ = this.FirstLabTestWithEncounterId(ap_, "FirstGlucose"); IEnumerable[] ar_ = [ d_, diff --git a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs index 871e3a642..6bef1cd4d 100644 --- a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs +++ b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs @@ -474,7 +474,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -497,7 +497,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -529,7 +529,7 @@ public IEnumerable Inpatient_Encounter() => public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -707,14 +707,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -755,7 +755,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract((ar_ ?? au_), av_); - IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -795,7 +795,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, (bg_ ?? bj_), true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -853,7 +853,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default)); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -1327,7 +1327,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -1353,7 +1353,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlDeclaration("GetCondition")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -1461,7 +1461,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) ]; Condition f_(Encounter.DiagnosisComponent PD) { - IEnumerable m_ = context.Operators.Retrieve(default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? n_(Condition C) { Id q_ = C?.IdElement; @@ -1488,7 +1488,7 @@ Condition f_(Encounter.DiagnosisComponent PD) [CqlDeclaration("GetLocation")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -1592,7 +1592,7 @@ bool b_() } else { - IEnumerable f_ = context.Operators.Retrieve(default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Medication")); bool? g_(Medication M) { Id k_ = M?.IdElement; diff --git a/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs index d43e2a315..239e8b734 100644 --- a/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs @@ -211,7 +211,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -224,7 +224,7 @@ public Patient Patient() => private bool? Has_Criteria_Indicating_Frailty_Value() { CqlValueSet a_ = this.Frailty_Device(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation FrailtyDeviceApplied) { DataType z_ = FrailtyDeviceApplied?.Effective; @@ -237,7 +237,7 @@ public Patient Patient() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Frailty_Diagnosis(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable h_ = NCQAStatus_1_0_0.Active_Condition(g_); bool? i_(Condition FrailtyDiagnosis) { @@ -251,7 +251,7 @@ public Patient Patient() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(e_, k_); CqlValueSet m_ = this.Frailty_Encounter(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable o_ = NCQAStatus_1_0_0.Finished_Encounter(n_); bool? p_(Encounter FrailtyEncounter) { @@ -266,7 +266,7 @@ public Patient Patient() => bool? r_ = context.Operators.Exists(q_); bool? s_ = context.Operators.Or(l_, r_); CqlValueSet t_ = this.Frailty_Symptom(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? v_(Observation FrailtySymptom) { DataType ak_ = FrailtySymptom?.Effective; @@ -290,27 +290,27 @@ public Patient Patient() => private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Outpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Observation(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.ED(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Telephone_Visits(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Online_Assessments(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet n_ = this.Nonacute_Inpatient(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); IEnumerable r_ = NCQAStatus_1_0_0.Finished_Encounter(q_); bool? s_(Encounter OutpatientEncounter) { CqlValueSet w_ = this.Advanced_Illness(); - IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default)); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? y_ = NCQAEncounter_1_0_0.Encounter_Has_Diagnosis(OutpatientEncounter, x_); Period z_ = OutpatientEncounter?.Period; CqlInterval aa_ = NCQAFHIRBase_1_0_0.Normalize_Interval((z_ as object)); @@ -350,7 +350,7 @@ public IEnumerable Outpatient_Encounters_with_Advanced_Illness() => private IEnumerable Nonacute_Inpatient_Discharge_with_Advanced_Illness_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Claim")); (IEnumerable InpatientDischarge, IEnumerable NonacuteInpatientDischarge, IEnumerable AcuteInpatientDischarge)? b_ = NCQAClaims_1_0_0.Medical_Claims_With_Nonacute_or_Acute_Inpatient_Discharge(a_); IEnumerable c_ = b_?.NonacuteInpatientDischarge; CqlValueSet d_ = this.Advanced_Illness(); @@ -471,12 +471,12 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Acute_Inpatient_Encounter_with_Advanced_Illness_Value() { CqlValueSet a_ = this.Acute_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable c_ = NCQAStatus_1_0_0.Finished_Encounter(b_); bool? d_(Encounter InpatientEncounter) { CqlValueSet g_ = this.Advanced_Illness(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? i_ = NCQAEncounter_1_0_0.Encounter_Has_Diagnosis(InpatientEncounter, h_); Period j_ = InpatientEncounter?.Period; CqlInterval k_ = NCQAFHIRBase_1_0_0.Normalize_Interval((j_ as object)); @@ -507,7 +507,7 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Acute_Inpatient_Discharge_with_Advanced_Illness_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Claim")); (IEnumerable InpatientDischarge, IEnumerable NonacuteInpatientDischarge, IEnumerable AcuteInpatientDischarge)? b_ = NCQAClaims_1_0_0.Medical_Claims_With_Nonacute_or_Acute_Inpatient_Discharge(a_); IEnumerable c_ = b_?.AcuteInpatientDischarge; CqlValueSet d_ = this.Advanced_Illness(); @@ -543,8 +543,8 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg private bool? Dementia_Medications_In_Year_Before_or_During_Measurement_Period_Value() { CqlValueSet a_ = this.Dementia_Medications(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationDispense")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/MedicationDispense")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = NCQAStatus_1_0_0.Dispensed_Medication(e_); bool? g_(MedicationDispense DementiaMedDispensed) diff --git a/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs index 670e02d3c..7af009ee9 100644 --- a/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAClaims-1.0.0.g.cs @@ -3385,7 +3385,7 @@ string ao_(FhirString r) ]; (int? IdentifierCount, nint _)? e_((IEnumerable<(Claim SingleCareTeam, IEnumerable CareTeamsProvider, IEnumerable CareTeamsProviderID)?> CareTeams, nint _)? ClaimProperties) { - IEnumerable at_ = context.Operators.Retrieve(default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Practitioner")); bool? au_(Practitioner p) { Id bb_ = p?.IdElement; @@ -3678,7 +3678,7 @@ string ar_(FhirString r) ]; (int? IdentifierCount, nint _)? e_((IEnumerable<(IEnumerable SingleItem, IEnumerable ItemLocation, IEnumerable ItemLocationID)?> ItemsLocationReferences, nint _)? ClaimProperties) { - IEnumerable aw_ = context.Operators.Retrieve(default); + IEnumerable aw_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Location")); bool? ax_(Location l) { Id be_ = l?.IdElement; diff --git a/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs index 0c9e67d5b..0bc65e8ce 100644 --- a/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAFHIRBase-1.0.0.g.cs @@ -40,7 +40,7 @@ public NCQAFHIRBase_1_0_0(CqlContext context) private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs index 8146dc0e7..4f81150ec 100644 --- a/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAHospice-1.0.0.g.cs @@ -79,7 +79,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -92,7 +92,7 @@ public Patient Patient() => private bool? Hospice_Intervention_or_Encounter_Value() { CqlValueSet a_ = this.Hospice_Intervention(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable c_ = NCQAStatus_1_0_0.Completed_or_Ongoing_Procedure(b_); bool? d_(Procedure HospiceInt) { @@ -106,7 +106,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Hospice_Encounter(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable i_ = NCQAStatus_1_0_0.Finished_Encounter(h_); bool? j_(Encounter HospiceEnc) { diff --git a/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs index d91c7baf8..2a0c45aa6 100644 --- a/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAPalliativeCare-1.0.0.g.cs @@ -98,7 +98,7 @@ public CqlCode[] ICD_10() => public bool? Palliative_Care_Overlapping_Period(CqlInterval Period) { CqlValueSet a_ = this.Palliative_Care_Assessment(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? c_(Observation PalliativeAssessment) { DataType ab_ = PalliativeAssessment?.Effective; @@ -121,7 +121,7 @@ public CqlCode[] ICD_10() => IEnumerable d_ = context.Operators.Where(b_, c_); bool? e_ = context.Operators.Exists(d_); CqlValueSet f_ = this.Palliative_Care_Encounter(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable h_ = NCQAStatus_1_0_0.Finished_Encounter(g_); bool? i_(Encounter PalliativeEncounter) { @@ -146,7 +146,7 @@ public CqlCode[] ICD_10() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(e_, k_); CqlValueSet m_ = this.Palliative_Care_Intervention(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); IEnumerable o_ = NCQAStatus_1_0_0.Completed_or_Ongoing_Procedure(n_); bool? p_(Procedure PalliativeIntervention) { @@ -172,7 +172,7 @@ public CqlCode[] ICD_10() => bool? s_ = context.Operators.Or(l_, r_); CqlCode t_ = this.Encounter_for_palliative_care(); IEnumerable u_ = context.Operators.ToList(t_); - IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_)); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_, "http://hl7.org/fhir/StructureDefinition/Condition")); IEnumerable w_ = NCQAStatus_1_0_0.Active_Condition(v_); bool? x_(Condition PalliativeDiagnosis) { diff --git a/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs b/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs index 7f2da9c3a..0ddca68e6 100644 --- a/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAStatus-1.0.0.g.cs @@ -42,7 +42,7 @@ public NCQAStatus_1_0_0(CqlContext context) private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; diff --git a/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs b/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs index 7e6b219f8..3d38bb808 100644 --- a/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs +++ b/Demo/Measures.Demo/CSharp/PalliativeCareFHIR-0.6.000.g.cs @@ -125,7 +125,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -139,7 +139,7 @@ public Patient Patient() => { CqlCode a_ = this.Functional_Assessment_of_Chronic_Illness_Therapy___Palliative_Care_Questionnaire__FACIT_Pal_(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_)); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); bool? d_(Observation PalliativeAssessment) { Code s_ = PalliativeAssessment?.StatusElement; @@ -174,7 +174,7 @@ public Patient Patient() => IEnumerable e_ = context.Operators.Where(c_, d_); bool? f_ = context.Operators.Exists(e_); CqlValueSet g_ = this.Palliative_Care_Encounter(); - IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default)); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? i_(Encounter PalliativeEncounter) { Code ak_ = PalliativeEncounter?.StatusElement; @@ -192,7 +192,7 @@ public Patient Patient() => bool? k_ = context.Operators.Exists(j_); bool? l_ = context.Operators.Or(f_, k_); CqlValueSet m_ = this.Palliative_Care_Intervention(); - IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default)); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? o_(Procedure PalliativeIntervention) { Code as_ = PalliativeIntervention?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs b/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs index da20104ce..01232184f 100644 --- a/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs +++ b/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs @@ -197,7 +197,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -254,26 +254,26 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounters_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Preventive_Care___Established_Office_Visit__0_to_17(); - IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default)); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Preventive_Care__Initial_Office_Visit__0_to_17(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet h_ = this.Preventive_Care_Services___Established_Office_Visit__18_and_Up(); - IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default)); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default)); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet n_ = this.Clinical_Oral_Evaluation(); - IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default)); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); CqlValueSet r_ = this.Telephone_Visits(); - IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default)); + IEnumerable s_ = context.Operators.Retrieve(new RetrieveParameters(default, r_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet t_ = this.Online_Assessments(); - IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default)); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); IEnumerable v_ = context.Operators.Union(s_, u_); IEnumerable w_ = context.Operators.Union(q_, v_); bool? x_(Encounter ValidEncounter) @@ -420,7 +420,7 @@ public IEnumerable Qualifying_Encounters() => private bool? Numerator_Value() { CqlValueSet a_ = this.Fluoride_Varnish_Application_for_Children(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? c_(Procedure FluorideApplication) { CqlInterval f_ = this.Measurement_Period(); diff --git a/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs b/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs index 3b6f8f6fa..3d5781f76 100644 --- a/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs @@ -179,7 +179,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -226,12 +226,12 @@ private IEnumerable Initial_Population_Value() IEnumerable b_(Encounter InpatientEncounter) { CqlValueSet d_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default)); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable h_ = context.Operators.Union(e_, g_); CqlValueSet i_ = this.Schedule_IV_Benzodiazepines(); - IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default)); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); IEnumerable m_ = context.Operators.Union(j_, l_); bool? n_(MedicationRequest Medications) { @@ -347,7 +347,7 @@ private IEnumerable Numerator_Value() bool? b_(Encounter InpatientEncounter) { CqlValueSet j_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default)); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? l_(MedicationRequest Opioids) { FhirDateTime r_ = Opioids?.AuthoredOnElement; @@ -375,7 +375,7 @@ object n_(MedicationRequest Opioids) IEnumerable e_(Encounter InpatientEncounter) { CqlValueSet x_ = this.Schedule_II_and_III_Opioid_Medications(); - IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default)); + IEnumerable y_ = context.Operators.Retrieve(new RetrieveParameters(default, x_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? z_(MedicationRequest OpioidsDischarge) { FhirDateTime ad_ = OpioidsDischarge?.AuthoredOnElement; @@ -397,7 +397,7 @@ Encounter ab_(MedicationRequest OpioidsDischarge) => IEnumerable g_(Encounter InpatientEncounter) { CqlValueSet ai_ = this.Schedule_IV_Benzodiazepines(); - IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default)); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/MedicationRequest")); bool? ak_(MedicationRequest BenzodiazepinesDischarge) { FhirDateTime ao_ = BenzodiazepinesDischarge?.AuthoredOnElement; @@ -431,7 +431,7 @@ private IEnumerable Denominator_Exclusion_Value() bool? b_(Encounter InpatientEncounter) { CqlValueSet f_ = this.All_Primary_and_Secondary_Cancer(); - IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default)); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? h_(Condition Cancer) { CqlInterval ab_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Prevalence_Period(Cancer); @@ -444,7 +444,7 @@ private IEnumerable Denominator_Exclusion_Value() IEnumerable i_ = context.Operators.Where(g_, h_); bool? j_ = context.Operators.Exists(i_); CqlValueSet k_ = this.Palliative_or_Hospice_Care(); - IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable l_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/StructureDefinition/ServiceRequest")); bool? m_(ServiceRequest PalliativeOrHospiceCareOrder) { FhirDateTime af_ = PalliativeOrHospiceCareOrder?.AuthoredOnElement; @@ -462,7 +462,7 @@ private IEnumerable Denominator_Exclusion_Value() IEnumerable n_ = context.Operators.Where(l_, m_); bool? o_ = context.Operators.Exists(n_); bool? p_ = context.Operators.Or(j_, o_); - IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default)); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, k_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? s_(Procedure PalliativeOrHospiceCarePerformed) { DataType ao_ = PalliativeOrHospiceCarePerformed?.Performed; diff --git a/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs b/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs index 1f59f4422..6055265c4 100644 --- a/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs +++ b/Demo/Measures.Demo/CSharp/SupplementalDataElementsFHIR4-2.0.000.g.cs @@ -88,7 +88,7 @@ public CqlValueSet Race() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -170,7 +170,7 @@ public IEnumerable SDE_Ethnicity() => private IEnumerable<(CodeableConcept code, Period period)?> SDE_Payer_Value() { CqlValueSet a_ = this.Payer(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); (CodeableConcept code, Period period)? c_(Coverage Payer) { CodeableConcept e_ = Payer?.Type; diff --git a/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs b/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs index 3b985c5e9..0ada53fb5 100644 --- a/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs +++ b/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs @@ -228,7 +228,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -241,7 +241,7 @@ public Patient Patient() => private IEnumerable Non_Elective_Inpatient_Encounter_Value() { CqlValueSet a_ = this.Non_Elective_Inpatient(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter NonElectiveEncounter) { Period e_ = NonElectiveEncounter?.Period; @@ -297,7 +297,7 @@ private IEnumerable Encounter_with_Principal_Diagnosis_and_Age_Value( IEnumerable a_ = this.All_Stroke_Encounter(); IEnumerable b_(Encounter AllStrokeEncounter) { - IEnumerable d_ = context.Operators.Retrieve(default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); bool? e_(Patient BirthDate) { Patient i_ = this.Patient(); @@ -395,7 +395,7 @@ public IEnumerable Ischemic_Stroke_Encounters_with_Discharge_Disposit private IEnumerable Intervention_Comfort_Measures_Value() { CqlValueSet a_ = this.Comfort_Measures(); - IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/ServiceRequest")); bool? c_(ServiceRequest P) { Code j_ = P?.IntentElement; @@ -405,7 +405,7 @@ private IEnumerable Intervention_Comfort_Measures_Value() return l_; }; IEnumerable d_ = context.Operators.Where(b_, c_); - IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default)); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Procedure")); bool? g_(Procedure InterventionPerformed) { Code m_ = InterventionPerformed?.StatusElement; diff --git a/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs b/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs index 24434d949..e5ddaac32 100644 --- a/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs +++ b/Demo/Measures.Demo/CSharp/VTEFHIR4-4.8.000.g.cs @@ -68,7 +68,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.Retrieve(default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; From 30c4ac7060b2cec2713b0cc9cb2341c725f5b89b Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Wed, 11 Sep 2024 13:52:12 +0200 Subject: [PATCH 3/7] Upgrade to subrepos with regenerated C#. --- submodules/Firely.Cql.Sdk.Integration.Runner | 2 +- submodules/Ncqa.DQIC | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/Firely.Cql.Sdk.Integration.Runner b/submodules/Firely.Cql.Sdk.Integration.Runner index 6e39fd7c0..99b3b3f61 160000 --- a/submodules/Firely.Cql.Sdk.Integration.Runner +++ b/submodules/Firely.Cql.Sdk.Integration.Runner @@ -1 +1 @@ -Subproject commit 6e39fd7c0fbaa0987f7c1ab12aba1747ac46b4f9 +Subproject commit 99b3b3f61e2e98f4e095d8371f3520b01cdd0ab2 diff --git a/submodules/Ncqa.DQIC b/submodules/Ncqa.DQIC index 198018494..523e69167 160000 --- a/submodules/Ncqa.DQIC +++ b/submodules/Ncqa.DQIC @@ -1 +1 @@ -Subproject commit 198018494d2ed97b90ee910314f26e10cf8bb10d +Subproject commit 523e6916779cecfff33b629bde47c8a656e47044 From 5ccb5e4b72e7754afdae84b75bb8e8cbd8658359 Mon Sep 17 00:00:00 2001 From: Ewout Kramer Date: Wed, 2 Oct 2024 15:08:17 +0200 Subject: [PATCH 4/7] Merged develop2 into PR --- .../CSharpLibrarySetToStreamsWriter.cs | 1 + Cql/CoreTests/CSharp/RR23-1.0.0.g.cs | 7 +- Cql/Cql.Compiler/ExpressionBuilderContext.cs | 1 - .../CSharp/AHAOverall-2.6.000.g.cs | 41 +++--- ...teDXAScansForWomenUnder65FHIR-0.0.000.g.cs | 111 +++++++-------- .../CSharp/CQMCommon-2.0.000.g.cs | 133 +++++++++--------- .../CSharp/PCMaternal-5.16.000.g.cs | 21 +-- .../CSharp/HybridHWMFHIR-0.102.005.g.cs | 37 ++--- .../CSharp/HybridHWRFHIR-1.3.005.g.cs | 43 +++--- ...MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs | 27 ++-- submodules/Ncqa.DQIC | 2 +- 11 files changed, 216 insertions(+), 208 deletions(-) diff --git a/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs b/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs index cde9f50bb..5559ce76c 100644 --- a/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs +++ b/Cql/CodeGeneration.NET/CSharpLibrarySetToStreamsWriter.cs @@ -21,6 +21,7 @@ using System.Text; using Hl7.Cql.Compiler; using Hl7.Cql.Elm; +using Hl7.Cql.Operators; using Microsoft.CodeAnalysis.CSharp; using Microsoft.Extensions.Options; using Expression = System.Linq.Expressions.Expression; diff --git a/Cql/CoreTests/CSharp/RR23-1.0.0.g.cs b/Cql/CoreTests/CSharp/RR23-1.0.0.g.cs index b9400553e..dba414610 100644 --- a/Cql/CoreTests/CSharp/RR23-1.0.0.g.cs +++ b/Cql/CoreTests/CSharp/RR23-1.0.0.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -129,7 +130,7 @@ public object Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -142,7 +143,7 @@ public Patient Patient() => private IEnumerable Injury_due_to_falling_rock_within_measurement_period_Value() { CqlValueSet a_ = this.Injury_due_to_falling_rock(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? c_(Condition C) { DataType e_ = C?.Onset; @@ -194,7 +195,7 @@ public Condition Latest_injury_due_to_falling_rock() => private IEnumerable Tiny_Umbrella_Supply_within_7_days_after_most_recent_injury_due_to_falling_rock_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/SupplyDelivery")); bool? b_(SupplyDelivery SD) { SupplyDelivery.SuppliedItemComponent d_ = SD?.SuppliedItem; diff --git a/Cql/Cql.Compiler/ExpressionBuilderContext.cs b/Cql/Cql.Compiler/ExpressionBuilderContext.cs index e6e95d639..411d820e9 100644 --- a/Cql/Cql.Compiler/ExpressionBuilderContext.cs +++ b/Cql/Cql.Compiler/ExpressionBuilderContext.cs @@ -38,7 +38,6 @@ using Tuple = Hl7.Cql.Elm.Tuple; using TupleTypeSpecifier = Hl7.Cql.Elm.TupleTypeSpecifier; using TypeConverter = Hl7.Cql.Conversion.TypeConverter; -using TypeSpecifier = Hl7.Cql.Elm.TypeSpecifier; namespace Hl7.Cql.Compiler; diff --git a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs index 689dedbc6..9df80bc95 100644 --- a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -263,7 +264,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -327,23 +328,23 @@ public Patient Patient() => private IEnumerable Heart_Failure_Outpatient_Encounter_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable n_ = context.Operators.Union(k_, m_); IEnumerable o_(Encounter QualifyingEncounter) { CqlValueSet s_ = this.Heart_Failure(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? u_(Condition HeartFailure) { CqlInterval y_ = QICoreCommon_2_0_000.prevalenceInterval(HeartFailure); @@ -386,7 +387,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter() => private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() { CqlValueSet a_ = this.Ejection_Fraction(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation EjectionFraction) { DataType n_ = EjectionFraction?.Value; @@ -409,11 +410,11 @@ private IEnumerable Moderate_or_Severe_LVSD_Findings_Value() }; IEnumerable d_ = context.Operators.Where(b_, c_); CqlValueSet e_ = this.Moderate_or_Severe_LVSD(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable g_ = context.Operators.Union(d_ as IEnumerable, f_ as IEnumerable); CqlCode h_ = this.Left_ventricular_systolic_dysfunction__disorder_(); IEnumerable i_ = context.Operators.ToList(h_); - IEnumerable j_ = context.Operators.RetrieveByCodes(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, i_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition LVSDDiagnosis) { CodeableConcept y_ = LVSDDiagnosis?.Severity; @@ -472,7 +473,7 @@ public IEnumerable Heart_Failure_Outpatient_Encounter_with_History_of private bool? Has_Heart_Transplant_Complications_Value() { CqlValueSet a_ = this.Heart_Transplant_Complications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition HeartTransplantComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -517,7 +518,7 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Placement(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure LVADOutpatient) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -564,7 +565,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private bool? Has_Left_Ventricular_Assist_Device_Complications_Value() { CqlValueSet a_ = this.Left_Ventricular_Assist_Device_Complications(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable c_(Condition LVADComplications) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); @@ -609,20 +610,20 @@ Condition k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => private IEnumerable Qualifying_Outpatient_Encounter_During_Measurement_Period_Value() { CqlValueSet a_ = this.Care_Services_in_Long_Term_Residential_Facility(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Home_Healthcare_Services(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Nursing_Facility_Visit(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet h_ = this.Office_Visit(); - IEnumerable i_ = context.Operators.RetrieveByValueSet(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, h_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = context.Operators.Union(e_, j_); CqlValueSet l_ = this.Outpatient_Consultation(); - IEnumerable m_ = context.Operators.RetrieveByValueSet(l_, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, l_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet n_ = this.Patient_Provider_Interaction(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = context.Operators.Union(k_, p_); bool? r_(Encounter ValidEncounter) @@ -695,7 +696,7 @@ Encounter u_(Encounter Encounter2) => private bool? Has_Heart_Transplant_Value() { CqlValueSet a_ = this.Heart_Transplant(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_(Procedure HeartTransplant) { IEnumerable h_ = this.Heart_Failure_Outpatient_Encounter_with_History_of_Moderate_or_Severe_LVSD(); diff --git a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs index 393d95465..21ce4e33c 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -697,7 +698,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -754,11 +755,11 @@ public CqlCode SDE_Sex() => private IEnumerable Qualifying_Encounter_Value() { CqlValueSet a_ = this.Office_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet c_ = this.Preventive_Care_Services_Established_Office_Visit__18_and_Up(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable e_ = context.Operators.Union(b_, d_); - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter E) { List x_ = E?.Type; @@ -784,17 +785,17 @@ CqlConcept y_(CodeableConcept @this) }; IEnumerable h_ = context.Operators.Where(f_, g_); CqlValueSet i_ = this.Preventive_Care_Services_Initial_Office_Visit__18_and_Up(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(e_, k_); CqlValueSet m_ = this.Outpatient_Consultation(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); CqlValueSet o_ = this.Online_Assessments(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Telephone_Visits(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); IEnumerable u_ = context.Operators.Union(r_, t_); bool? v_(Encounter ValidEncounters) { @@ -856,7 +857,7 @@ public IEnumerable Qualifying_Encounter() => private Observation First_BMI_in_Measurement_Period_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/bmi")); IEnumerable b_ = Status_1_6_000.BMI(a_); bool? c_(Observation BMIRatio) { @@ -921,7 +922,7 @@ private Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_T { CqlCode a_ = this.Alcoholic_drinks_per_drinking_day___Reported(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation AverageDrinks) { @@ -977,7 +978,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteoporosis_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteoporosis(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition OsteoporosisDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteoporosisDiagnosis); @@ -1001,7 +1002,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private bool? Has_Osteopenia_Before_Measurement_Period_Value() { CqlValueSet a_ = this.Osteopenia(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? c_(Condition OsteopeniaDiagnosis) { CqlInterval f_ = QICoreCommon_2_0_000.ToPrevalenceInterval(OsteopeniaDiagnosis); @@ -1038,7 +1039,7 @@ public Observation First_Average_Number_of_Drinks_Assessments_Indicating_More_Th private IEnumerable Parent_History_of_Hip_Fracture_Assessment_Value() { CqlValueSet a_ = this.History_of_hip_fracture_in_parent(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable c_ = Status_1_6_000.Final_Survey_Observation(b_); bool? d_(Observation ParentFractureHistory) { @@ -1064,7 +1065,7 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => private bool? Has_Risk_Factor_Any_Time_in_History_Prior_to_Measurement_Period_and_Do_Not_Need_to_be_Active_During_Measurement_Period_Value() { CqlValueSet a_ = this.Gastric_Bypass_Surgery(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = Status_1_6_000.Completed_Procedure(b_); bool? d_(Procedure GastricBypass) { @@ -1080,8 +1081,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable e_ = context.Operators.Where(c_, d_); CqlValueSet f_ = this.Aromatase_Inhibitors(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable i_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable j_ = context.Operators.Union(g_, i_); IEnumerable k_ = Status_1_6_000.Active_Medication(j_); bool? l_(MedicationRequest AromataseInhibitorActive) @@ -1097,8 +1098,8 @@ public IEnumerable Parent_History_of_Hip_Fracture_Assessment() => }; IEnumerable m_ = context.Operators.Where(k_, l_); IEnumerable n_ = context.Operators.Union(e_ as IEnumerable, m_ as IEnumerable); - IEnumerable p_ = context.Operators.RetrieveByValueSet(f_, default); - IEnumerable r_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable s_ = context.Operators.Union(p_, r_); IEnumerable t_ = Status_1_6_000.Active_or_Completed_Medication_Request(s_); bool? u_(MedicationRequest AromataseInhibitorOrder) @@ -1149,8 +1150,8 @@ bool as_() private int? Glucocorticoid_Active_Medication_Duration_in_Days_Value() { CqlValueSet a_ = this.Glucocorticoids__oral_only_(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); - IEnumerable d_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medicationrequest")); IEnumerable e_ = context.Operators.Union(b_, d_); IEnumerable f_ = Status_1_6_000.Active_Medication(e_); bool? g_(MedicationRequest OralGlucocorticoid) @@ -1255,16 +1256,16 @@ public IEnumerable ProcedureInPatientHistory(IEnumerable P private bool? Has_Double_or_Bilateral_Oophorectomy_Value() { CqlValueSet a_ = this.Bilateral_Oophorectomy(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable c_ = this.ProcedureInPatientHistory(b_); bool? d_ = context.Operators.Exists(c_); CqlValueSet e_ = this.Evidence_of_Bilateral_Oophorectomy(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable g_ = this.ProcedureInPatientHistory(f_); bool? h_ = context.Operators.Exists(g_); bool? i_ = context.Operators.Or(d_, h_); CqlValueSet j_ = this.Unilateral_Oophorectomy__Unspecified_Laterality(); - IEnumerable k_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? l_(Procedure UnilateralOophorectomy) { List ad_ = UnilateralOophorectomy?.BodySite; @@ -1290,11 +1291,11 @@ CqlConcept ae_(CodeableConcept @this) }; IEnumerable m_ = context.Operators.Where(k_, l_); CqlValueSet n_ = this.Unilateral_Oophorectomy_Right(); - IEnumerable o_ = context.Operators.RetrieveByValueSet(n_, default); + IEnumerable o_ = context.Operators.Retrieve(new RetrieveParameters(default, n_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable p_ = context.Operators.Union(m_, o_); IEnumerable q_ = this.ProcedureInPatientHistory(p_); bool? r_ = context.Operators.Exists(q_); - IEnumerable t_ = context.Operators.RetrieveByValueSet(j_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, j_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? u_(Procedure UnilateralOophorectomy) { List an_ = UnilateralOophorectomy?.BodySite; @@ -1320,7 +1321,7 @@ CqlConcept ao_(CodeableConcept @this) }; IEnumerable v_ = context.Operators.Where(t_, u_); CqlValueSet w_ = this.Unilateral_Oophorectomy_Left(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable y_ = context.Operators.Union(v_, x_); IEnumerable z_ = this.ProcedureInPatientHistory(y_); bool? aa_ = context.Operators.Exists(z_); @@ -1337,12 +1338,12 @@ CqlConcept ao_(CodeableConcept @this) private bool? Has_Organ_Transplants_Value() { CqlValueSet a_ = this.Major_Transplant(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); CqlValueSet c_ = this.Kidney_Transplant(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable e_ = context.Operators.Union(b_, d_); CqlValueSet f_ = this.Bone_Marrow_Transplant(); - IEnumerable g_ = context.Operators.RetrieveByValueSet(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, f_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable h_ = context.Operators.Union(e_, g_); IEnumerable i_ = this.ProcedureInPatientHistory(h_); bool? j_ = context.Operators.Exists(i_); @@ -1358,69 +1359,69 @@ CqlConcept ao_(CodeableConcept @this) { bool? a_ = this.Has_90_or_More_Active_Glucocorticoid_Medication_Days(); CqlValueSet b_ = this.Osteoporotic_Fractures(); - IEnumerable c_ = context.Operators.RetrieveByValueSet(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, b_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet d_ = this.Malabsorption_Syndromes(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable f_ = context.Operators.Union(c_, e_); CqlValueSet g_ = this.Chronic_Malnutrition(); - IEnumerable h_ = context.Operators.RetrieveByValueSet(g_, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, g_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet i_ = this.Chronic_Liver_Disease(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable k_ = context.Operators.Union(h_, j_); IEnumerable l_ = context.Operators.Union(f_, k_); CqlValueSet m_ = this.Rheumatoid_Arthritis(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet o_ = this.Hyperthyroidism(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable q_ = context.Operators.Union(n_, p_); IEnumerable r_ = context.Operators.Union(l_, q_); CqlValueSet s_ = this.Type_1_Diabetes(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet u_ = this.End_Stage_Renal_Disease(); - IEnumerable v_ = context.Operators.RetrieveByValueSet(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, u_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable w_ = context.Operators.Union(t_, v_); IEnumerable x_ = context.Operators.Union(r_, w_); CqlValueSet y_ = this.Osteogenesis_Imperfecta(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet aa_ = this.Ankylosing_Spondylitis(); - IEnumerable ab_ = context.Operators.RetrieveByValueSet(aa_, default); + IEnumerable ab_ = context.Operators.Retrieve(new RetrieveParameters(default, aa_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ac_ = context.Operators.Union(z_, ab_); IEnumerable ad_ = context.Operators.Union(x_, ac_); CqlValueSet ae_ = this.Psoriatic_Arthritis(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ag_ = this.Ehlers_Danlos_Syndrome(); - IEnumerable ah_ = context.Operators.RetrieveByValueSet(ag_, default); + IEnumerable ah_ = context.Operators.Retrieve(new RetrieveParameters(default, ag_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ai_ = context.Operators.Union(af_, ah_); IEnumerable aj_ = context.Operators.Union(ad_, ai_); CqlValueSet ak_ = this.Cushings_Syndrome(); - IEnumerable al_ = context.Operators.RetrieveByValueSet(ak_, default); + IEnumerable al_ = context.Operators.Retrieve(new RetrieveParameters(default, ak_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet am_ = this.Hyperparathyroidism(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ao_ = context.Operators.Union(al_, an_); IEnumerable ap_ = context.Operators.Union(aj_, ao_); CqlValueSet aq_ = this.Marfans_Syndrome(); - IEnumerable ar_ = context.Operators.RetrieveByValueSet(aq_, default); + IEnumerable ar_ = context.Operators.Retrieve(new RetrieveParameters(default, aq_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet as_ = this.Lupus(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable au_ = context.Operators.Union(ar_, at_); IEnumerable av_ = context.Operators.Union(ap_, au_); CqlValueSet aw_ = this.Multiple_Myeloma(); - IEnumerable ax_ = context.Operators.RetrieveByValueSet(aw_, default); + IEnumerable ax_ = context.Operators.Retrieve(new RetrieveParameters(default, aw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet ay_ = this.Premature_Menopause(); - IEnumerable az_ = context.Operators.RetrieveByValueSet(ay_, default); + IEnumerable az_ = context.Operators.Retrieve(new RetrieveParameters(default, ay_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable ba_ = context.Operators.Union(ax_, az_); IEnumerable bb_ = context.Operators.Union(av_, ba_); CqlValueSet bc_ = this.Eating_Disorders(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); CqlValueSet be_ = this.Amenorrhea(); - IEnumerable bf_ = context.Operators.RetrieveByValueSet(be_, default); + IEnumerable bf_ = context.Operators.Retrieve(new RetrieveParameters(default, be_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); IEnumerable bg_ = context.Operators.Union(bd_, bf_); IEnumerable bh_ = context.Operators.Union(bb_, bg_); IEnumerable bi_ = this.DiagnosisInPatientHistory(bh_); bool? bj_ = context.Operators.Exists(bi_); bool? bk_ = context.Operators.Or(a_, bj_); CqlValueSet bl_ = this.Chemotherapy(); - IEnumerable bm_ = context.Operators.RetrieveByValueSet(bl_, default); + IEnumerable bm_ = context.Operators.Retrieve(new RetrieveParameters(default, bl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); IEnumerable bn_ = this.ProcedureInPatientHistory(bm_); bool? bo_ = context.Operators.Exists(bn_); bool? bp_ = context.Operators.Or(bk_, bo_); @@ -1456,7 +1457,7 @@ CqlConcept ao_(CodeableConcept @this) private IEnumerable DXA_Scan_Order_During_Measurement_Period_Value() { CqlValueSet a_ = this.DXA__Dual_energy_Xray_Absorptiometry__Scan(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-servicerequest")); IEnumerable c_ = Status_1_6_000.Completed_or_Ongoing_Service_Request(b_); bool? d_(ServiceRequest DXA) { @@ -1501,7 +1502,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ { CqlCode a_ = this.Major_osteoporotic_fracture_10_year_probability__Likelihood__Fracture_Risk_Assessment(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable d_ = Status_1_6_000.Final_Survey_Observation(c_); bool? e_(Observation FRAX) { @@ -1515,7 +1516,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable f_ = context.Operators.Where(d_, e_); CqlCode g_ = this.Osteoporosis_Risk_Assessment_Instrument(); IEnumerable h_ = context.Operators.ToList(g_); - IEnumerable i_ = context.Operators.RetrieveByCodes(h_, default); + IEnumerable i_ = context.Operators.Retrieve(new RetrieveParameters(default, default, h_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable j_ = Status_1_6_000.Final_Survey_Observation(i_); bool? k_(Observation ORAI) { @@ -1529,7 +1530,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable m_ = context.Operators.Union(f_, l_); CqlCode n_ = this.Osteoporosis_Index_of_Risk_panel(); IEnumerable o_ = context.Operators.ToList(n_); - IEnumerable p_ = context.Operators.RetrieveByCodes(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, default, o_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable q_ = Status_1_6_000.Final_Survey_Observation(p_); bool? r_(Observation OSIRIS) { @@ -1543,7 +1544,7 @@ private IEnumerable Osteoporosis_Fracture_Risk_Assessment_Prior_to_ IEnumerable s_ = context.Operators.Where(q_, r_); CqlCode t_ = this.Osteoporosis_Self_Assessment_Tool(); IEnumerable u_ = context.Operators.ToList(t_); - IEnumerable v_ = context.Operators.RetrieveByCodes(u_, default); + IEnumerable v_ = context.Operators.Retrieve(new RetrieveParameters(default, default, u_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); IEnumerable w_ = Status_1_6_000.Final_Survey_Observation(v_); bool? x_(Observation OST) { diff --git a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs index 8ee938a86..f623e8d5d 100644 --- a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -119,7 +120,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -132,7 +133,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -200,7 +201,7 @@ public CqlInterval ToDateInterval(CqlInterval period) public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -247,7 +248,7 @@ object e_(Encounter @this) public Encounter edVisit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -613,7 +614,7 @@ object b_(Encounter.LocationComponent @this) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getLocation()` instead.")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -704,14 +705,14 @@ public CqlInterval HospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -722,7 +723,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -768,7 +769,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract(ef_ ?? ei_, ej_); - IEnumerable em_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -813,7 +814,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, eu_ ?? ex_, true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -877,7 +878,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -923,7 +924,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract(bb_ ?? bl_ ?? bo_, bp_); - IEnumerable bs_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -934,7 +935,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -980,7 +981,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract(kj_ ?? km_, kn_); - IEnumerable kq_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1025,7 +1026,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, ky_ ?? lb_, true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1088,7 +1089,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -1133,7 +1134,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, ca_ ?? ck_ ?? cn_, true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -1144,7 +1145,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -1190,7 +1191,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract(qn_ ?? qq_, qr_); - IEnumerable qu_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -1235,7 +1236,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, rc_ ?? rf_, true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -1298,7 +1299,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -1361,7 +1362,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -1372,7 +1373,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -1418,7 +1419,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract(wu_ ?? wx_, wy_); - IEnumerable xb_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -1463,7 +1464,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, xj_ ?? xm_, true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -1527,7 +1528,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -1593,14 +1594,14 @@ public CqlInterval hospitalizationWithObservationAndOutpatientSurge CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Outpatient_Surgery_Service(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastSurgeryOP) { Period ap_ = LastSurgeryOP?.Period; CqlInterval aq_ = FHIRHelpers_4_3_000.ToInterval(ap_); CqlDateTime ar_ = context.Operators.End(aq_); CqlValueSet as_ = this.Emergency_Department_Visit(); - IEnumerable at_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable at_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? au_(Encounter LastED) { Code dp_ = LastED?.StatusElement; @@ -1611,7 +1612,7 @@ CqlInterval b_(Encounter Visit) CqlInterval du_ = FHIRHelpers_4_3_000.ToInterval(dt_); CqlDateTime dv_ = context.Operators.End(du_); CqlValueSet dw_ = this.Observation_Services(); - IEnumerable dx_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable dx_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dy_(Encounter LastObs) { Code fq_ = LastObs?.StatusElement; @@ -1657,7 +1658,7 @@ object ea_(Encounter @this) CqlDateTime ei_ = context.Operators.Start(eh_); CqlQuantity ej_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ek_ = context.Operators.Subtract(ef_ ?? ei_, ej_); - IEnumerable em_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable em_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? en_(Encounter LastObs) { Code gq_ = LastObs?.StatusElement; @@ -1702,7 +1703,7 @@ object ep_(Encounter @this) CqlDateTime ex_ = context.Operators.Start(ew_); CqlInterval ey_ = context.Operators.Interval(ek_, eu_ ?? ex_, true, true); bool? ez_ = context.Operators.In(dv_, ey_, default); - IEnumerable fb_ = context.Operators.RetrieveByValueSet(dw_, default); + IEnumerable fb_ = context.Operators.Retrieve(new RetrieveParameters(default, dw_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? fc_(Encounter LastObs) { Code hq_ = LastObs?.StatusElement; @@ -1766,7 +1767,7 @@ object aw_(Encounter @this) CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); CqlDateTime bb_ = context.Operators.Start(ba_); CqlValueSet bc_ = this.Observation_Services(); - IEnumerable bd_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable bd_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? be_(Encounter LastObs) { Code it_ = LastObs?.StatusElement; @@ -1812,7 +1813,7 @@ object bg_(Encounter @this) CqlDateTime bo_ = context.Operators.Start(bn_); CqlQuantity bp_ = context.Operators.Quantity(1m, "hour"); CqlDateTime bq_ = context.Operators.Subtract(bb_ ?? bl_ ?? bo_, bp_); - IEnumerable bs_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable bs_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bt_(Encounter LastED) { Code jt_ = LastED?.StatusElement; @@ -1823,7 +1824,7 @@ object bg_(Encounter @this) CqlInterval jy_ = FHIRHelpers_4_3_000.ToInterval(jx_); CqlDateTime jz_ = context.Operators.End(jy_); CqlValueSet ka_ = this.Observation_Services(); - IEnumerable kb_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kb_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kc_(Encounter LastObs) { Code lu_ = LastObs?.StatusElement; @@ -1869,7 +1870,7 @@ object ke_(Encounter @this) CqlDateTime km_ = context.Operators.Start(kl_); CqlQuantity kn_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ko_ = context.Operators.Subtract(kj_ ?? km_, kn_); - IEnumerable kq_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable kq_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? kr_(Encounter LastObs) { Code mu_ = LastObs?.StatusElement; @@ -1914,7 +1915,7 @@ object kt_(Encounter @this) CqlDateTime lb_ = context.Operators.Start(la_); CqlInterval lc_ = context.Operators.Interval(ko_, ky_ ?? lb_, true, true); bool? ld_ = context.Operators.In(jz_, lc_, default); - IEnumerable lf_ = context.Operators.RetrieveByValueSet(ka_, default); + IEnumerable lf_ = context.Operators.Retrieve(new RetrieveParameters(default, ka_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? lg_(Encounter LastObs) { Code nu_ = LastObs?.StatusElement; @@ -1977,7 +1978,7 @@ object bv_(Encounter @this) Period by_ = bx_?.Period; CqlInterval bz_ = FHIRHelpers_4_3_000.ToInterval(by_); CqlDateTime ca_ = context.Operators.Start(bz_); - IEnumerable cc_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable cc_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cd_(Encounter LastObs) { Code ox_ = LastObs?.StatusElement; @@ -2022,7 +2023,7 @@ object cf_(Encounter @this) CqlDateTime cn_ = context.Operators.Start(cm_); CqlInterval co_ = context.Operators.Interval(bq_, ca_ ?? ck_ ?? cn_, true, true); bool? cp_ = context.Operators.In(ar_, co_, default); - IEnumerable cr_ = context.Operators.RetrieveByValueSet(as_, default); + IEnumerable cr_ = context.Operators.Retrieve(new RetrieveParameters(default, as_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? cs_(Encounter LastED) { Code px_ = LastED?.StatusElement; @@ -2033,7 +2034,7 @@ object cf_(Encounter @this) CqlInterval qc_ = FHIRHelpers_4_3_000.ToInterval(qb_); CqlDateTime qd_ = context.Operators.End(qc_); CqlValueSet qe_ = this.Observation_Services(); - IEnumerable qf_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qf_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qg_(Encounter LastObs) { Code ry_ = LastObs?.StatusElement; @@ -2079,7 +2080,7 @@ object qi_(Encounter @this) CqlDateTime qq_ = context.Operators.Start(qp_); CqlQuantity qr_ = context.Operators.Quantity(1m, "hour"); CqlDateTime qs_ = context.Operators.Subtract(qn_ ?? qq_, qr_); - IEnumerable qu_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable qu_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? qv_(Encounter LastObs) { Code sy_ = LastObs?.StatusElement; @@ -2124,7 +2125,7 @@ object qx_(Encounter @this) CqlDateTime rf_ = context.Operators.Start(re_); CqlInterval rg_ = context.Operators.Interval(qs_, rc_ ?? rf_, true, true); bool? rh_ = context.Operators.In(qd_, rg_, default); - IEnumerable rj_ = context.Operators.RetrieveByValueSet(qe_, default); + IEnumerable rj_ = context.Operators.Retrieve(new RetrieveParameters(default, qe_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? rk_(Encounter LastObs) { Code ty_ = LastObs?.StatusElement; @@ -2187,7 +2188,7 @@ object cu_(Encounter @this) Period cx_ = cw_?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); - IEnumerable db_ = context.Operators.RetrieveByValueSet(bc_, default); + IEnumerable db_ = context.Operators.Retrieve(new RetrieveParameters(default, bc_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? dc_(Encounter LastObs) { Code vb_ = LastObs?.StatusElement; @@ -2250,7 +2251,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Emergency_Department_Visit(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastED) { Code we_ = LastED?.StatusElement; @@ -2261,7 +2262,7 @@ object i_(Encounter @this) CqlInterval wj_ = FHIRHelpers_4_3_000.ToInterval(wi_); CqlDateTime wk_ = context.Operators.End(wj_); CqlValueSet wl_ = this.Observation_Services(); - IEnumerable wm_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable wm_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? wn_(Encounter LastObs) { Code yf_ = LastObs?.StatusElement; @@ -2307,7 +2308,7 @@ object wp_(Encounter @this) CqlDateTime wx_ = context.Operators.Start(ww_); CqlQuantity wy_ = context.Operators.Quantity(1m, "hour"); CqlDateTime wz_ = context.Operators.Subtract(wu_ ?? wx_, wy_); - IEnumerable xb_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xb_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xc_(Encounter LastObs) { Code zf_ = LastObs?.StatusElement; @@ -2352,7 +2353,7 @@ object xe_(Encounter @this) CqlDateTime xm_ = context.Operators.Start(xl_); CqlInterval xn_ = context.Operators.Interval(wz_, xj_ ?? xm_, true, true); bool? xo_ = context.Operators.In(wk_, xn_, default); - IEnumerable xq_ = context.Operators.RetrieveByValueSet(wl_, default); + IEnumerable xq_ = context.Operators.Retrieve(new RetrieveParameters(default, wl_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? xr_(Encounter LastObs) { Code azf_ = LastObs?.StatusElement; @@ -2416,7 +2417,7 @@ object s_(Encounter @this) CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlDateTime x_ = context.Operators.Start(w_); CqlValueSet y_ = this.Observation_Services(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? aa_(Encounter LastObs) { Code bzi_ = LastObs?.StatusElement; @@ -2483,7 +2484,7 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2494,7 +2495,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2540,7 +2541,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract(av_ ?? ay_, az_); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2585,7 +2586,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, bk_ ?? bn_, true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2649,7 +2650,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -2715,7 +2716,7 @@ public CqlInterval hospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastED) { Code af_ = LastED?.StatusElement; @@ -2726,7 +2727,7 @@ CqlInterval b_(Encounter Visit) CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlDateTime al_ = context.Operators.End(ak_); CqlValueSet am_ = this.Observation_Services(); - IEnumerable an_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable an_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ao_(Encounter LastObs) { Code cg_ = LastObs?.StatusElement; @@ -2772,7 +2773,7 @@ object aq_(Encounter @this) CqlDateTime ay_ = context.Operators.Start(ax_); CqlQuantity az_ = context.Operators.Quantity(1m, "hour"); CqlDateTime ba_ = context.Operators.Subtract(av_ ?? ay_, az_); - IEnumerable bc_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable bc_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bd_(Encounter LastObs) { Code dg_ = LastObs?.StatusElement; @@ -2817,7 +2818,7 @@ object bf_(Encounter @this) CqlDateTime bn_ = context.Operators.Start(bm_); CqlInterval bo_ = context.Operators.Interval(ba_, bk_ ?? bn_, true, true); bool? bp_ = context.Operators.In(al_, bo_, default); - IEnumerable br_ = context.Operators.RetrieveByValueSet(am_, default); + IEnumerable br_ = context.Operators.Retrieve(new RetrieveParameters(default, am_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bs_(Encounter LastObs) { Code eg_ = LastObs?.StatusElement; @@ -2881,7 +2882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Code fj_ = LastObs?.StatusElement; @@ -3053,7 +3054,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3083,7 +3084,7 @@ public IEnumerable encounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -3111,7 +3112,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlTag("deprecated", "This function is deprecated. Use the fluent function `getCondition()` instead")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3133,7 +3134,7 @@ public Condition GetCondition(ResourceReference reference) [CqlTag("description", "Returns the Condition resource for the given reference")] public Condition getCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -3168,7 +3169,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3208,7 +3209,7 @@ public Condition principalDiagnosis(Encounter Encounter) IEnumerable c_ = context.Operators.Where((IEnumerable)a_, b_); Condition d_(Encounter.DiagnosisComponent PD) { - IEnumerable j_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-condition")); bool? k_(Condition C) { Id n_ = C?.IdElement; @@ -3236,7 +3237,7 @@ Condition d_(Encounter.DiagnosisComponent PD) [CqlTag("description", "Returns the Location resource specified by the given reference.")] public Location getLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -3278,7 +3279,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medication")); bool? i_(Medication M) { Id n_ = M?.IdElement; @@ -3327,7 +3328,7 @@ bool b_() } else { - IEnumerable h_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable h_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-medication")); bool? i_(Medication M) { Id n_ = M?.IdElement; diff --git a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs index 65972ceb4..f588e3534 100644 --- a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -149,7 +150,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -196,14 +197,14 @@ public CqlInterval hospitalizationWithEDOBTriageObservation(Encount CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.ED_Visit_and_OB_Triage(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? g_(Encounter LastEDOBTriage) { Period af_ = LastEDOBTriage?.Period; CqlInterval ag_ = FHIRHelpers_4_3_000.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? ak_(Encounter LastObs) { Period cg_ = LastObs?.Period; @@ -249,7 +250,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract(ar_ ?? au_, av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? az_(Encounter LastObs) { Period dg_ = LastObs?.Period; @@ -294,7 +295,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, bg_ ?? bj_, true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? bo_(Encounter LastObs) { Period eg_ = LastObs?.Period; @@ -362,7 +363,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_3_000.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-encounter")); bool? q_(Encounter LastObs) { Period fj_ = LastObs?.Period; @@ -424,7 +425,7 @@ private IEnumerable Delivery_Encounter_with_Age_Range_Value() IEnumerable b_(Encounter EncounterWithAge) { CqlValueSet d_ = this.Delivery_Procedures(); - IEnumerable e_ = context.Operators.RetrieveByValueSet(d_, default); + IEnumerable e_ = context.Operators.Retrieve(new RetrieveParameters(default, d_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-procedure")); bool? f_(Procedure DeliveryProcedure) { Code j_ = DeliveryProcedure?.StatusElement; @@ -462,7 +463,7 @@ public CqlDateTime lastTimeOfDelivery(Encounter TheEncounter) { CqlCode a_ = this.Date_and_time_of_obstetric_delivery(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation TimeOfDelivery) { DataType k_ = TimeOfDelivery?.Value; @@ -613,7 +614,7 @@ public CqlDateTime lastEstimatedDeliveryDate(Encounter TheEncounter) { CqlCode a_ = this.Delivery_date_Estimated(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? d_(Observation EstimatedDateOfDelivery) { DataType k_ = EstimatedDateOfDelivery?.Value; @@ -798,7 +799,7 @@ bool bc_() public CqlQuantity lastEstimatedGestationalAge(Encounter TheEncounter) { CqlValueSet a_ = this.Estimated_Gestational_Age_at_Delivery(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/us/qicore/StructureDefinition/qicore-observation")); bool? c_(Observation EstimatedGestationalAge) { object j_() diff --git a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs index eba9f8ce6..4882c3ae9 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -277,7 +278,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -344,9 +345,9 @@ public CqlCode SDE_Sex() => private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -642,36 +643,36 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlValueSet i_ = this.Body_temperature(); - IEnumerable j_ = context.Operators.RetrieveByValueSet(i_, default); + IEnumerable j_ = context.Operators.Retrieve(new RetrieveParameters(default, i_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable k_ = this.FirstPhysicalExamWithEncounterId(j_, "FirstTemperature"); CqlCode l_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable m_ = context.Operators.ToList(l_); - IEnumerable n_ = context.Operators.RetrieveByCodes(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, default, m_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstO2Saturation"); CqlValueSet p_ = this.Hematocrit_lab_test(); - IEnumerable q_ = context.Operators.RetrieveByValueSet(p_, default); + IEnumerable q_ = context.Operators.Retrieve(new RetrieveParameters(default, p_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable r_ = this.FirstLabTestWithEncounterId(q_, "FirstHematocrit"); CqlValueSet s_ = this.Platelet_count_lab_test(); - IEnumerable t_ = context.Operators.RetrieveByValueSet(s_, default); + IEnumerable t_ = context.Operators.Retrieve(new RetrieveParameters(default, s_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable u_ = this.FirstLabTestWithEncounterId(t_, "FirstPlateletCount"); CqlValueSet v_ = this.White_blood_cells_count_lab_test(); - IEnumerable w_ = context.Operators.RetrieveByValueSet(v_, default); + IEnumerable w_ = context.Operators.Retrieve(new RetrieveParameters(default, v_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable x_ = this.FirstLabTestWithEncounterId(w_, "FirstWhiteBloodCell"); CqlValueSet y_ = this.Sodium_lab_test(); - IEnumerable z_ = context.Operators.RetrieveByValueSet(y_, default); + IEnumerable z_ = context.Operators.Retrieve(new RetrieveParameters(default, y_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable aa_ = this.FirstLabTestWithEncounterId(z_, "FirstSodium"); CqlValueSet ab_ = this.Bicarbonate_lab_test(); - IEnumerable ac_ = context.Operators.RetrieveByValueSet(ab_, default); + IEnumerable ac_ = context.Operators.Retrieve(new RetrieveParameters(default, ab_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ad_ = this.FirstLabTestWithEncounterId(ac_, "FirstBicarbonate"); CqlValueSet ae_ = this.Creatinine_lab_test(); - IEnumerable af_ = context.Operators.RetrieveByValueSet(ae_, default); + IEnumerable af_ = context.Operators.Retrieve(new RetrieveParameters(default, ae_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ag_ = this.FirstLabTestWithEncounterId(af_, "FirstCreatinine"); IEnumerable[] ah_ = [ d_, @@ -735,14 +736,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -783,7 +784,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract(ar_ ?? au_, av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -823,7 +824,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, bg_ ?? bj_, true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -881,7 +882,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; diff --git a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs index 0eba1a747..a65835c93 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -307,7 +308,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -370,14 +371,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -418,7 +419,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract(ar_ ?? au_, av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -458,7 +459,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, bg_ ?? bj_, true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -516,7 +517,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -580,9 +581,9 @@ object s_(Encounter @this) private IEnumerable Inpatient_Encounters_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); CqlValueSet c_ = this.Medicare_payer(); - IEnumerable d_ = context.Operators.RetrieveByValueSet(c_, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, c_, default, "http://hl7.org/fhir/StructureDefinition/Coverage")); IEnumerable> e_ = context.Operators.CrossJoin(b_, d_); (Encounter InpatientEncounter, Coverage Payer)? f_(ValueTuple _valueTuple) { @@ -997,46 +998,46 @@ private IEnumerable Results_Value() { CqlCode a_ = this.Heart_rate(); IEnumerable b_ = context.Operators.ToList(a_); - IEnumerable c_ = context.Operators.RetrieveByCodes(b_, default); + IEnumerable c_ = context.Operators.Retrieve(new RetrieveParameters(default, default, b_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable d_ = this.FirstPhysicalExamWithEncounterId(c_, "FirstHeartRate"); CqlCode e_ = this.Systolic_blood_pressure(); IEnumerable f_ = context.Operators.ToList(e_); - IEnumerable g_ = context.Operators.RetrieveByCodes(f_, default); + IEnumerable g_ = context.Operators.Retrieve(new RetrieveParameters(default, default, f_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable h_ = this.FirstPhysicalExamWithEncounterId(g_, "FirstSystolicBP"); CqlCode i_ = this.Respiratory_rate(); IEnumerable j_ = context.Operators.ToList(i_); - IEnumerable k_ = context.Operators.RetrieveByCodes(j_, default); + IEnumerable k_ = context.Operators.Retrieve(new RetrieveParameters(default, default, j_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable l_ = this.FirstPhysicalExamWithEncounterId(k_, "FirstRespRate"); CqlValueSet m_ = this.Body_temperature(); - IEnumerable n_ = context.Operators.RetrieveByValueSet(m_, default); + IEnumerable n_ = context.Operators.Retrieve(new RetrieveParameters(default, m_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable o_ = this.FirstPhysicalExamWithEncounterId(n_, "FirstTemperature"); CqlCode p_ = this.Oxygen_saturation_in_Arterial_blood_by_Pulse_oximetry(); IEnumerable q_ = context.Operators.ToList(p_); - IEnumerable r_ = context.Operators.RetrieveByCodes(q_, default); + IEnumerable r_ = context.Operators.Retrieve(new RetrieveParameters(default, default, q_, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable s_ = this.FirstPhysicalExamWithEncounterId(r_, "FirstO2Saturation"); CqlValueSet t_ = this.Body_weight(); - IEnumerable u_ = context.Operators.RetrieveByValueSet(t_, default); + IEnumerable u_ = context.Operators.Retrieve(new RetrieveParameters(default, t_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable v_ = this.FirstPhysicalExamWithEncounterIdUsingLabTiming(u_, "FirstWeight"); CqlValueSet w_ = this.Hematocrit_lab_test(); - IEnumerable x_ = context.Operators.RetrieveByValueSet(w_, default); + IEnumerable x_ = context.Operators.Retrieve(new RetrieveParameters(default, w_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable y_ = this.FirstLabTestWithEncounterId(x_, "FirstHematocrit"); CqlValueSet z_ = this.White_blood_cells_count_lab_test(); - IEnumerable aa_ = context.Operators.RetrieveByValueSet(z_, default); + IEnumerable aa_ = context.Operators.Retrieve(new RetrieveParameters(default, z_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ab_ = this.FirstLabTestWithEncounterId(aa_, "FirstWhiteBloodCell"); CqlValueSet ac_ = this.Potassium_lab_test(); - IEnumerable ad_ = context.Operators.RetrieveByValueSet(ac_, default); + IEnumerable ad_ = context.Operators.Retrieve(new RetrieveParameters(default, ac_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ae_ = this.FirstLabTestWithEncounterId(ad_, "FirstPotassium"); CqlValueSet af_ = this.Sodium_lab_test(); - IEnumerable ag_ = context.Operators.RetrieveByValueSet(af_, default); + IEnumerable ag_ = context.Operators.Retrieve(new RetrieveParameters(default, af_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ah_ = this.FirstLabTestWithEncounterId(ag_, "FirstSodium"); CqlValueSet ai_ = this.Bicarbonate_lab_test(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable ak_ = this.FirstLabTestWithEncounterId(aj_, "FirstBicarbonate"); CqlValueSet al_ = this.Creatinine_lab_test(); - IEnumerable am_ = context.Operators.RetrieveByValueSet(al_, default); + IEnumerable am_ = context.Operators.Retrieve(new RetrieveParameters(default, al_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable an_ = this.FirstLabTestWithEncounterId(am_, "FirstCreatinine"); CqlValueSet ao_ = this.Glucose_lab_test(); - IEnumerable ap_ = context.Operators.RetrieveByValueSet(ao_, default); + IEnumerable ap_ = context.Operators.Retrieve(new RetrieveParameters(default, ao_, default, "http://hl7.org/fhir/StructureDefinition/Observation")); IEnumerable aq_ = this.FirstLabTestWithEncounterId(ap_, "FirstGlucose"); IEnumerable[] ar_ = [ d_, diff --git a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs index 3b07b376e..e95a19654 100644 --- a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs +++ b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs @@ -7,6 +7,7 @@ using Hl7.Cql.ValueSets; using Hl7.Cql.Iso8601; using System.Reflection; +using Hl7.Cql.Operators; using Hl7.Fhir.Model; using Range = Hl7.Fhir.Model.Range; using Task = Hl7.Fhir.Model.Task; @@ -473,7 +474,7 @@ public CqlInterval Measurement_Period() => private Patient Patient_Value() { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Patient")); Patient b_ = context.Operators.SingletonFrom(a_); return b_; @@ -496,7 +497,7 @@ public Patient Patient() => private IEnumerable Inpatient_Encounter_Value() { CqlValueSet a_ = this.Encounter_Inpatient(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter EncounterInpatient) { Code e_ = EncounterInpatient?.StatusElement; @@ -528,7 +529,7 @@ public IEnumerable Inpatient_Encounter() => public Encounter ED_Visit(Encounter TheEncounter) { CqlValueSet a_ = this.Emergency_Department_Visit(); - IEnumerable b_ = context.Operators.RetrieveByValueSet(a_, default); + IEnumerable b_ = context.Operators.Retrieve(new RetrieveParameters(default, a_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? c_(Encounter EDVisit) { Code h_ = EDVisit?.StatusElement; @@ -706,14 +707,14 @@ public CqlInterval HospitalizationWithObservation(Encounter TheEnco CqlInterval b_(Encounter Visit) { CqlValueSet e_ = this.Emergency_Department_Visit(); - IEnumerable f_ = context.Operators.RetrieveByValueSet(e_, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, e_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? g_(Encounter LastED) { Period af_ = LastED?.Period; CqlInterval ag_ = FHIRHelpers_4_0_001.ToInterval(af_); CqlDateTime ah_ = context.Operators.End(ag_); CqlValueSet ai_ = this.Observation_Services(); - IEnumerable aj_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable aj_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? ak_(Encounter LastObs) { Period cb_ = LastObs?.Period; @@ -754,7 +755,7 @@ object am_(Encounter @this) CqlDateTime au_ = context.Operators.Start(at_); CqlQuantity av_ = context.Operators.Quantity(1m, "hour"); CqlDateTime aw_ = context.Operators.Subtract(ar_ ?? au_, av_); - IEnumerable ay_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable ay_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? az_(Encounter LastObs) { Period cw_ = LastObs?.Period; @@ -794,7 +795,7 @@ object bb_(Encounter @this) CqlDateTime bj_ = context.Operators.Start(bi_); CqlInterval bk_ = context.Operators.Interval(aw_, bg_ ?? bj_, true, true); bool? bl_ = context.Operators.In(ah_, bk_, default); - IEnumerable bn_ = context.Operators.RetrieveByValueSet(ai_, default); + IEnumerable bn_ = context.Operators.Retrieve(new RetrieveParameters(default, ai_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? bo_(Encounter LastObs) { Period dr_ = LastObs?.Period; @@ -852,7 +853,7 @@ object i_(Encounter @this) CqlInterval m_ = FHIRHelpers_4_0_001.ToInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlValueSet o_ = this.Observation_Services(); - IEnumerable p_ = context.Operators.RetrieveByValueSet(o_, default); + IEnumerable p_ = context.Operators.Retrieve(new RetrieveParameters(default, o_, default, "http://hl7.org/fhir/StructureDefinition/Encounter")); bool? q_(Encounter LastObs) { Period ep_ = LastObs?.Period; @@ -1326,7 +1327,7 @@ public IEnumerable EncounterDiagnosis(Encounter Encounter) List a_ = Encounter?.Diagnosis; Condition b_(Encounter.DiagnosisComponent D) { - IEnumerable d_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable d_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? e_(Condition C) { Id h_ = C?.IdElement; @@ -1352,7 +1353,7 @@ Condition b_(Encounter.DiagnosisComponent D) [CqlDeclaration("GetCondition")] public Condition GetCondition(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? b_(Condition C) { Id e_ = C?.IdElement; @@ -1460,7 +1461,7 @@ public Condition PrincipalDiagnosis(Encounter Encounter) ]; Condition f_(Encounter.DiagnosisComponent PD) { - IEnumerable m_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable m_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Condition")); bool? n_(Condition C) { Id q_ = C?.IdElement; @@ -1487,7 +1488,7 @@ Condition f_(Encounter.DiagnosisComponent PD) [CqlDeclaration("GetLocation")] public Location GetLocation(ResourceReference reference) { - IEnumerable a_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable a_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Location")); bool? b_(Location L) { Id e_ = L?.IdElement; @@ -1591,7 +1592,7 @@ bool b_() } else { - IEnumerable f_ = context.Operators.RetrieveByValueSet(default, default); + IEnumerable f_ = context.Operators.Retrieve(new RetrieveParameters(default, default, default, "http://hl7.org/fhir/StructureDefinition/Medication")); bool? g_(Medication M) { Id k_ = M?.IdElement; diff --git a/submodules/Ncqa.DQIC b/submodules/Ncqa.DQIC index 959f1764b..e551ffec4 160000 --- a/submodules/Ncqa.DQIC +++ b/submodules/Ncqa.DQIC @@ -1 +1 @@ -Subproject commit 959f1764b9c19fb65e055db4f219405c468783a3 +Subproject commit e551ffec49dd65bcf8d7518aa25d7aa8a75ccddb From 7832dff1e7b3650eca140165fce4dda03d2bc969 Mon Sep 17 00:00:00 2001 From: Paul den Boer Date: Tue, 8 Oct 2024 10:35:32 +0200 Subject: [PATCH 5/7] submodule --- submodules/Ncqa.DQIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Ncqa.DQIC b/submodules/Ncqa.DQIC index e551ffec4..868fa1f5f 160000 --- a/submodules/Ncqa.DQIC +++ b/submodules/Ncqa.DQIC @@ -1 +1 @@ -Subproject commit e551ffec49dd65bcf8d7518aa25d7aa8a75ccddb +Subproject commit 868fa1f5f0963924a575354c3213eb1bf28659c5 From 3f6e33b35b6cc483aa8387299ae9dcace43c31c1 Mon Sep 17 00:00:00 2001 From: Paul den Boer Date: Tue, 8 Oct 2024 10:51:07 +0200 Subject: [PATCH 6/7] submodule --- submodules/Ncqa.DQIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Ncqa.DQIC b/submodules/Ncqa.DQIC index 868fa1f5f..a5acfd004 160000 --- a/submodules/Ncqa.DQIC +++ b/submodules/Ncqa.DQIC @@ -1 +1 @@ -Subproject commit 868fa1f5f0963924a575354c3213eb1bf28659c5 +Subproject commit a5acfd0046f6eb0f70006f298668ebd2b309461e From 3322ea6687f07043add008579e761e3b8bb89d2a Mon Sep 17 00:00:00 2001 From: Paul den Boer Date: Tue, 8 Oct 2024 10:53:22 +0200 Subject: [PATCH 7/7] submodule --- submodules/Ncqa.DQIC | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submodules/Ncqa.DQIC b/submodules/Ncqa.DQIC index a5acfd004..a7819e9d4 160000 --- a/submodules/Ncqa.DQIC +++ b/submodules/Ncqa.DQIC @@ -1 +1 @@ -Subproject commit a5acfd0046f6eb0f70006f298668ebd2b309461e +Subproject commit a7819e9d4d2ef78d6dcb6aabbdafa5f4180f4ab9