From 8f918f7fa13be8c6df3ad4bcd0932d976f13e98b Mon Sep 17 00:00:00 2001 From: Paul den Boer Date: Mon, 5 Aug 2024 10:18:37 +0200 Subject: [PATCH] Regenerate C# based on corrections of precisionSpecified fix in PR #441 --- ...ationofCurrentMedicationsFHIR-0.2.000.g.cs | 2 +- .../CSharp/ParametersExample-0.0.1.g.cs | 2 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 8 +- .../CSharp/AHAOverall-2.6.000.g.cs | 16 +-- .../CSharp/ALARACTOQRFHIR-0.1.001.g.cs | 2 +- .../AdultOutpatientEncounters-4.8.000.g.cs | 2 +- .../AdvancedIllnessandFrailty-1.8.000.g.cs | 28 ++--- .../CSharp/AlaraCTFHIR-0.1.001.g.cs | 2 +- .../CSharp/AlaraCTIQRFHIR-0.1.000.g.cs | 2 +- .../CSharp/Antibiotic-1.5.000.g.cs | 4 +- ...ssantMedicationManagementFHIR-0.1.000.g.cs | 8 +- ...teDXAScansForWomenUnder65FHIR-0.0.000.g.cs | 8 +- ...iateTestingforPharyngitisFHIR-0.1.000.g.cs | 10 +- ...ropriateTreatmentforSTEMIFHIR-1.0.000.g.cs | 4 +- ...erRespiratoryInfectionURIFHIR-0.1.000.g.cs | 14 +-- .../CSharp/CQMCommon-2.0.000.g.cs | 6 +- ...ReceiptofSpecialistReportFHIR-0.2.000.g.cs | 8 +- ...racts2040BCVAwithin90DaysFHIR-0.1.000.g.cs | 4 +- .../CervicalCancerScreeningFHIR-0.0.001.g.cs | 10 +- ...rMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs | 4 +- ...ildhoodImmunizationStatusFHIR-0.1.000.g.cs | 110 +++++++++--------- ...HaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs | 4 +- ...ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs | 24 ++-- .../ColonCancerScreeningFHIR-0.1.000.g.cs | 20 ++-- .../CumulativeMedicationDuration-4.0.000.g.cs | 4 +- ...PhysicianManagingDiabetesFHIR-0.1.000.g.cs | 8 +- ...mentiaCognitiveAssessmentFHIR-0.1.000.g.cs | 4 +- .../CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs | 8 +- ...lobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs | 6 +- ...creeningForFutureFallRiskFHIR-0.1.000.g.cs | 6 +- ...escribedADHDMedicationADDFHIR-0.1.000.g.cs | 24 ++-- ...entforTotalHipReplacementFHIR-0.0.008.g.cs | 54 ++++----- ...ssessmentsforHeartFailureFHIR-0.1.000.g.cs | 102 ++++++++-------- ...obalMalnutritionCompositeFHIR-0.1.000.g.cs | 6 +- ...BetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs | 2 +- .../CSharp/HIVRetentionFHIR-0.1.000.g.cs | 12 +- .../HIVViralSuppressionFHIR-0.1.000.g.cs | 6 +- Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs | 12 +- ...pioidRelatedAdverseEventsFHIR-0.1.000.g.cs | 4 +- ...ospitalHarmPressureInjuryFHIR-0.1.000.g.cs | 4 +- ...talHarmSevereHypoglycemiaFHIR-0.1.000.g.cs | 4 +- ...bridHospitalWideMortalityFHIR-0.0.001.g.cs | 4 +- ...idHospitalWideReadmissionFHIR-0.0.001.g.cs | 4 +- ...tteGuerinForBladderCancerFHIR-1.3.000.g.cs | 12 +- .../KidneyHealthEvaluationFHIR-0.1.000.g.cs | 2 +- ...gyPainIntensityQuantifiedFHIR-0.1.000.g.cs | 10 +- .../CSharp/PCMaternal-5.16.000.g.cs | 6 +- .../PCSBPScreeningFollowUpFHIR-0.2.000.g.cs | 70 +++++------ .../POAGOpticNerveEvaluationFHIR-0.1.000.g.cs | 2 +- .../CSharp/PalliativeCare-1.9.000.g.cs | 8 +- ...gAndCessationInterventionFHIR-0.0.001.g.cs | 18 +-- ...entionasOfferedbyDentistsFHIR-0.0.002.g.cs | 12 +- ...aAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs | 4 +- .../CSharp/QICoreCommon-2.0.000.g.cs | 8 +- ...ereObstetricComplicationsFHIR-0.1.000.g.cs | 6 +- .../CSharp/TJCOverall-8.11.000.g.cs | 4 +- ...enignProstaticHyperplasiaFHIR-1.3.000.g.cs | 14 +-- ...skMedicationsintheElderlyFHIR-0.1.000.g.cs | 2 +- Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs | 2 +- ...forChildrenandAdolescentsFHIR-0.1.000.g.cs | 16 +-- ...andFrailtyExclusionECQMFHIR4-5.17.000.g.cs | 10 +- .../CSharp/BCSEHEDISMY2022-1.0.0.g.cs | 4 +- .../BreastCancerScreeningsFHIR-0.0.009.g.cs | 6 +- .../CervicalCancerScreeningFHIR-0.0.005.g.cs | 6 +- ...olorectalCancerScreeningsFHIR-0.0.003.g.cs | 18 +-- ...lativeMedicationDurationFHIR4-1.0.000.g.cs | 4 +- ...PhysicianManagingDiabetesFHIR-0.0.004.g.cs | 2 +- ...lobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs | 4 +- .../CSharp/Exam125FHIR-0.0.009.g.cs | 6 +- .../CSharp/Exam130FHIR-0.0.003.g.cs | 18 +-- .../Measures.Demo/CSharp/FHIR347-0.1.021.g.cs | 4 +- ...miainHospitalizedPatientsFHIR-0.0.006.g.cs | 6 +- ...talHarmSevereHypoglycemiaFHIR-0.0.012.g.cs | 2 +- .../CSharp/HybridHWMFHIR-0.102.005.g.cs | 16 +-- .../CSharp/HybridHWRFHIR-1.3.005.g.cs | 16 +-- ...MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs | 2 +- .../NCQAAdvancedIllnessandFrailty-1.0.0.g.cs | 6 +- .../CSharp/NCQACQLBase-1.0.0.g.cs | 82 ++++++------- ...edbyPCPsincludingDentistsFHIR-0.0.008.g.cs | 12 +- ...oidsConcurrentPrescribingFHIR-0.0.012.g.cs | 2 +- .../CSharp/TJCOverallFHIR-1.8.000.g.cs | 4 +- 81 files changed, 503 insertions(+), 499 deletions(-) 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 8b06b7bf2..f5682f06e 100644 --- a/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/DocumentationofCurrentMedicationsFHIR-0.2.000.g.cs @@ -188,7 +188,7 @@ private IEnumerable Qualifying_Encounter_during_day_of_Measurement_Pe CqlInterval i_ = this.Measurement_Period(); Period j_ = ValidEncounter?.Period; CqlInterval k_ = FHIRHelpers_4_3_000.ToInterval(j_); - bool? l_ = context.Operators.IntervalIncludesInterval(i_, k_, null); + bool? l_ = context.Operators.IntervalIncludesInterval(i_, k_, "day"); bool? m_ = context.Operators.And(h_, l_); return m_; 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 c9c7e6ebf..c65020229 100644 --- a/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs +++ b/Demo/Measures.Authoring/CSharp/ParametersExample-0.0.1.g.cs @@ -147,7 +147,7 @@ public Date Patient_Birthdate() => Date a_ = this.Patient_Birthdate(); CqlDate b_ = FHIRHelpers_4_3_000.ToDate(a_); CqlDate c_ = this.CurrentDate(); - int? d_ = context.Operators.DurationBetween(b_, c_, null); + int? d_ = context.Operators.DurationBetween(b_, c_, "year"); return d_; } 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 bbfedf875..eec2970bd 100644 --- a/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs @@ -2411,7 +2411,7 @@ CqlDateTime f_() { CqlDateTime a_ = context.Operators.Start(Period); CqlDateTime b_ = context.Operators.End(Period); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "day"); CqlInterval d_ = context.Operators.Interval(1, c_, true, true); CqlInterval[] e_ = [ d_, @@ -2434,7 +2434,7 @@ CqlDateTime f_() { CqlDateTime a_ = context.Operators.Start(Period); CqlDateTime b_ = context.Operators.End(Period); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "day"); CqlInterval d_ = context.Operators.Interval(1, c_, true, true); CqlInterval[] e_ = [ d_, @@ -2476,7 +2476,7 @@ bool m_() CqlQuantity r_ = context.Operators.Multiply(o_, q_); CqlDateTime s_ = context.Operators.Add(n_, r_); CqlDateTime t_ = context.Operators.End(Period); - int? u_ = context.Operators.DurationBetween(s_, t_, null); + int? u_ = context.Operators.DurationBetween(s_, t_, "hour"); bool? v_ = context.Operators.Less(u_, 24); return (v_ ?? false); @@ -2537,7 +2537,7 @@ bool m_() CqlQuantity r_ = context.Operators.Multiply(o_, q_); CqlDateTime s_ = context.Operators.Add(n_, r_); CqlDateTime t_ = context.Operators.End(Period); - int? u_ = context.Operators.DurationBetween(s_, t_, null); + int? u_ = context.Operators.DurationBetween(s_, t_, "hour"); bool? v_ = context.Operators.Less(u_, 24); return (v_ ?? false); 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 27b85ef68..b5a1aa506 100644 --- a/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs @@ -654,7 +654,7 @@ public IEnumerable Qualifying_Outpatient_Encounter_During_Measurement CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); IEnumerable j_ = this.Qualifying_Outpatient_Encounter_During_Measurement_Period(); IEnumerable k_(Encounter Encounter1) @@ -749,7 +749,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => CqlDateTime f_ = context.Operators.Convert(e_); Period g_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval h_ = FHIRHelpers_4_3_000.ToInterval(g_); - bool? i_ = context.Operators.In(f_, h_, null); + bool? i_ = context.Operators.In(f_, h_, "day"); Code j_ = Order?.StatusElement; MedicationRequest.MedicationrequestStatus? k_ = j_?.Value; string l_ = context.Operators.Convert(k_); @@ -794,7 +794,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(Diagnosis); Period f_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval g_ = FHIRHelpers_4_3_000.ToInterval(f_); - bool? h_ = context.Operators.Overlaps(e_, g_, null); + bool? h_ = context.Operators.Overlaps(e_, g_, "day"); bool? i_ = this.isConfirmedActiveDiagnosis(Diagnosis); bool? j_ = context.Operators.And(h_, i_); @@ -819,7 +819,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => CqlInterval f_ = QICoreCommon_2_0_000.prevalenceInterval((Event as Condition)); Period g_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval h_ = FHIRHelpers_4_3_000.ToInterval(g_); - bool? i_ = context.Operators.OverlapsAfter(f_, h_, null); + bool? i_ = context.Operators.OverlapsAfter(f_, h_, "day"); bool? j_ = this.isConfirmedActiveDiagnosis((Event as Condition)); bool? k_ = context.Operators.And(i_, j_); @@ -832,7 +832,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => CqlInterval n_ = QICoreCommon_2_0_000.toInterval(m_); Period o_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(o_); - bool? q_ = context.Operators.OverlapsAfter(n_, p_, null); + bool? q_ = context.Operators.OverlapsAfter(n_, p_, "day"); Code r_ = (Event as Procedure)?.StatusElement; EventStatus? s_ = r_?.Value; string t_ = context.Operators.Convert(s_); @@ -852,7 +852,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) => CqlInterval ac_ = context.Operators.Interval(z_, ab_, true, true); Period ad_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval ae_ = FHIRHelpers_4_3_000.ToInterval(ad_); - bool? af_ = context.Operators.OverlapsAfter(ac_, ae_, null); + bool? af_ = context.Operators.OverlapsAfter(ac_, ae_, "day"); CodeableConcept ag_ = (Event as AllergyIntolerance)?.ClinicalStatus; CqlConcept ah_ = FHIRHelpers_4_3_000.ToConcept(ag_); CqlCode ai_ = QICoreCommon_2_0_000.allergy_active(); @@ -962,7 +962,7 @@ object cc_(CqlInterval @this) CqlInterval ce_ = context.Operators.First>(cd_); Period cf_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval cg_ = FHIRHelpers_4_3_000.ToInterval(cf_); - bool? ch_ = context.Operators.OverlapsAfter(ce_, cg_, null); + bool? ch_ = context.Operators.OverlapsAfter(ce_, cg_, "day"); Code ci_ = (Event as MedicationRequest)?.StatusElement; MedicationRequest.MedicationrequestStatus? cj_ = ci_?.Value; string ck_ = context.Operators.Convert(cj_); @@ -999,7 +999,7 @@ object cc_(CqlInterval @this) CqlInterval do_ = QICoreCommon_2_0_000.toInterval(dn_); Period dp_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period; CqlInterval dq_ = FHIRHelpers_4_3_000.ToInterval(dp_); - bool? dr_ = context.Operators.OverlapsAfter(do_, dq_, null); + bool? dr_ = context.Operators.OverlapsAfter(do_, dq_, "day"); Code ds_ = (Event as Observation)?.StatusElement; ObservationStatus? dt_ = ds_?.Value; string du_ = context.Operators.Convert(dt_); 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 27a427a6c..40bd4d97c 100644 --- a/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs @@ -161,7 +161,7 @@ private IEnumerable Qualified_Scan_Value() CqlDate n_ = context.Operators.ConvertStringToDate(m_); CqlDateTime p_ = context.Operators.Start(f_); CqlDate q_ = context.Operators.DateFrom(p_); - int? r_ = context.Operators.CalculateAgeAt(n_, q_, null); + int? r_ = context.Operators.CalculateAgeAt(n_, q_, "year"); bool? s_ = context.Operators.GreaterOrEqual(r_, 18); bool? t_ = context.Operators.And(j_, s_); 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 f37296e09..c9f3e2f10 100644 --- a/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdultOutpatientEncounters-4.8.000.g.cs @@ -167,7 +167,7 @@ private IEnumerable Qualifying_Encounters_Value() Period y_ = ValidEncounter?.Period; CqlInterval z_ = FHIRHelpers_4_3_000.ToInterval(y_); CqlInterval aa_ = QICoreCommon_2_0_000.toInterval((z_ as object)); - bool? ab_ = context.Operators.IntervalIncludesInterval(x_, aa_, null); + bool? ab_ = context.Operators.IntervalIncludesInterval(x_, aa_, "day"); return ab_; }; 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 d311e4f0a..5705b5cda 100644 --- a/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs @@ -270,7 +270,7 @@ public Patient Patient() => FhirDateTime ap_ = FrailtyDeviceOrder?.AuthoredOnElement; CqlDateTime aq_ = context.Operators.Convert(ap_); CqlInterval ar_ = QICoreCommon_2_0_000.toInterval((aq_ as object)); - bool? as_ = context.Operators.IntervalIncludesInterval(ao_, ar_, null); + bool? as_ = context.Operators.IntervalIncludesInterval(ao_, ar_, "day"); bool? at_ = context.Operators.And(an_, as_); return at_; @@ -292,7 +292,7 @@ public Patient Patient() => CqlInterval ba_ = QICoreCommon_2_0_000.toInterval(az_); CqlDateTime bb_ = context.Operators.End(ba_); CqlInterval bc_ = this.Measurement_Period(); - bool? bd_ = context.Operators.In(bb_, bc_, null); + bool? bd_ = context.Operators.In(bb_, bc_, "day"); bool? be_ = context.Operators.And(ax_, bd_); return be_; @@ -306,7 +306,7 @@ public Patient Patient() => { CqlInterval bf_ = QICoreCommon_2_0_000.prevalenceInterval(FrailtyDiagnosis); CqlInterval bg_ = this.Measurement_Period(); - bool? bh_ = context.Operators.Overlaps(bf_, bg_, null); + bool? bh_ = context.Operators.Overlaps(bf_, bg_, "day"); return bh_; }; @@ -322,7 +322,7 @@ public Patient Patient() => CqlInterval bj_ = FHIRHelpers_4_3_000.ToInterval(bi_); CqlInterval bk_ = QICoreCommon_2_0_000.toInterval((bj_ as object)); CqlInterval bl_ = this.Measurement_Period(); - bool? bm_ = context.Operators.Overlaps(bk_, bl_, null); + bool? bm_ = context.Operators.Overlaps(bk_, bl_, "day"); return bm_; }; @@ -338,7 +338,7 @@ public Patient Patient() => object bo_ = FHIRHelpers_4_3_000.ToValue(bn_); CqlInterval bp_ = QICoreCommon_2_0_000.toInterval(bo_); CqlInterval bq_ = this.Measurement_Period(); - bool? br_ = context.Operators.Overlaps(bp_, bq_, null); + bool? br_ = context.Operators.Overlaps(bp_, bq_, "day"); return br_; }; @@ -391,7 +391,7 @@ private IEnumerable Outpatient_Encounters_with_Advanced_Illness_Value CqlDateTime z_ = context.Operators.Subtract(x_, y_); CqlDateTime ab_ = context.Operators.End(w_); CqlInterval ac_ = context.Operators.Interval(z_, ab_, true, true); - bool? ad_ = context.Operators.In(v_, ac_, null); + bool? ad_ = context.Operators.In(v_, ac_, "day"); bool? ae_ = context.Operators.And(r_, ad_); return ae_; @@ -426,7 +426,7 @@ public IEnumerable Outpatient_Encounters_with_Advanced_Illness() => CqlDateTime q_ = context.Operators.End(p_); CqlQuantity r_ = context.Operators.Quantity(1m, "day"); CqlDateTime s_ = context.Operators.Add(q_, r_); - bool? t_ = context.Operators.SameOrAfter(n_, s_, null); + bool? t_ = context.Operators.SameOrAfter(n_, s_, "day"); return t_; }; @@ -472,7 +472,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlDateTime r_ = context.Operators.Subtract(p_, q_); CqlDateTime t_ = context.Operators.End(o_); CqlInterval u_ = context.Operators.Interval(r_, t_, true, true); - bool? v_ = context.Operators.In(n_, u_, null); + bool? v_ = context.Operators.In(n_, u_, "day"); bool? w_ = context.Operators.And(j_, v_); return w_; @@ -514,7 +514,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlDateTime ab_ = context.Operators.Subtract(z_, aa_); CqlDateTime ad_ = context.Operators.End(y_); CqlInterval ae_ = context.Operators.Interval(ab_, ad_, true, true); - bool? af_ = context.Operators.Overlaps(x_, ae_, null); + bool? af_ = context.Operators.Overlaps(x_, ae_, "day"); bool? ag_ = context.Operators.And(m_, af_); return ag_; @@ -538,7 +538,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 66); bool? j_ = this.Has_Criteria_Indicating_Frailty(); bool? k_ = context.Operators.And(i_, j_); @@ -565,7 +565,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(66, 80, true, true); bool? j_ = context.Operators.In(h_, i_, null); bool? k_ = this.Has_Criteria_Indicating_Frailty(); @@ -581,7 +581,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlDate v_ = context.Operators.ConvertStringToDate(u_); CqlDateTime x_ = context.Operators.End(e_); CqlDate y_ = context.Operators.DateFrom(x_); - int? z_ = context.Operators.CalculateAgeAt(v_, y_, null); + int? z_ = context.Operators.CalculateAgeAt(v_, y_, "year"); bool? aa_ = context.Operators.GreaterOrEqual(z_, 81); bool? ac_ = context.Operators.And(aa_, k_); bool? ad_ = context.Operators.Or(r_, ac_); @@ -602,7 +602,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 66); CqlCode j_ = this.Housing_status(); IEnumerable k_ = context.Operators.ToList(j_); @@ -616,7 +616,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t CqlDateTime ab_ = context.Operators.End(aa_); CqlInterval ac_ = this.Measurement_Period(); CqlDateTime ad_ = context.Operators.End(ac_); - bool? ae_ = context.Operators.SameOrBefore(ab_, ad_, null); + bool? ae_ = context.Operators.SameOrBefore(ab_, ad_, "day"); return ae_; }; 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 2cf581e20..603d63502 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs @@ -206,7 +206,7 @@ private IEnumerable Qualifying_CTScan_Value() string m_ = l_?.Value; CqlDateTime n_ = context.Operators.ConvertStringToDateTime(m_); CqlDateTime p_ = context.Operators.Start(f_); - int? q_ = context.Operators.CalculateAgeAt(n_, p_, null); + int? q_ = context.Operators.CalculateAgeAt(n_, p_, "year"); bool? r_ = context.Operators.GreaterOrEqual(q_, 18); bool? s_ = context.Operators.And(j_, r_); 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 2ab96a47d..0e8afc911 100644 --- a/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs @@ -159,7 +159,7 @@ private IEnumerable Qualifying_Inpatient_Encounters_Value() CqlDate l_ = context.Operators.ConvertStringToDate(k_); CqlDateTime n_ = context.Operators.Start(g_); CqlDate o_ = context.Operators.DateFrom(n_); - int? p_ = context.Operators.CalculateAgeAt(l_, o_, null); + int? p_ = context.Operators.CalculateAgeAt(l_, o_, "year"); bool? q_ = context.Operators.GreaterOrEqual(p_, 18); bool? r_ = context.Operators.And(h_, q_); 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 6c9784d45..e0c7d2968 100644 --- a/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs @@ -122,7 +122,7 @@ IEnumerable a_(Encounter eDate) CqlQuantity q_ = context.Operators.Quantity(3m, "days"); CqlDateTime r_ = context.Operators.Add(p_, q_); CqlInterval s_ = context.Operators.Interval(m_, r_, true, true); - bool? t_ = context.Operators.In(j_, s_, null); + bool? t_ = context.Operators.In(j_, s_, "day"); CqlInterval v_ = FHIRHelpers_4_3_000.ToInterval(k_); CqlDateTime w_ = context.Operators.Start(v_); bool? x_ = context.Operators.Not((bool?)(w_ is null)); @@ -228,7 +228,7 @@ Timing j_(Dosage @this) CqlInterval ch_ = context.Operators.Interval(bz_, cg_, true, true); bool? ci_ = ch_?.highClosed; CqlInterval cj_ = context.Operators.Interval(al_, bc_, bs_, ci_); - bool? ck_ = context.Operators.Overlaps(u_, cj_, null); + bool? ck_ = context.Operators.Overlaps(u_, cj_, "day"); return ck_; }; 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 dfe91e550..117466dfa 100644 --- a/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AntidepressantMedicationManagementFHIR-0.1.000.g.cs @@ -239,7 +239,7 @@ private CqlDateTime April_30_of_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); decimal? d_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime e_ = context.Operators.DateTime(c_, 4, 30, 23, 59, 59, 0, d_); @@ -254,7 +254,7 @@ private CqlDateTime May_1_of_the_Year_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 1); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 5, 1, 0, 0, 0, 0, e_); @@ -292,7 +292,7 @@ private CqlDate Earliest_Antidepressant_Dispensed_During_Intake_Period_Value() CqlDate p_ = context.Operators.Start(o_); CqlDateTime q_ = context.Operators.ConvertDateToDateTime(p_); CqlInterval r_ = this.Intake_Period(); - bool? s_ = context.Operators.In(q_, r_, null); + bool? s_ = context.Operators.In(q_, r_, "day"); return s_; }; @@ -423,7 +423,7 @@ public IEnumerable Qualifying_Encounters() => CqlDate d_ = context.Operators.ConvertStringToDate(c_); CqlDateTime e_ = this.April_30_of_the_Measurement_Period(); CqlDate f_ = context.Operators.DateFrom(e_); - int? g_ = context.Operators.CalculateAgeAt(d_, f_, null); + int? g_ = context.Operators.CalculateAgeAt(d_, f_, "year"); bool? h_ = context.Operators.GreaterOrEqual(g_, 18); bool? i_ = this.Has_Initial_Major_Depression_Diagnosis(); bool? j_ = context.Operators.And(h_, i_); 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 85af1a7a8..ea9b19381 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateDXAScansForWomenUnder65FHIR-0.0.000.g.cs @@ -802,7 +802,7 @@ CqlConcept y_(CodeableConcept @this) Period ai_ = ValidEncounters?.Period; CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(ai_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); - bool? al_ = context.Operators.IntervalIncludesInterval(ah_, ak_, null); + bool? al_ = context.Operators.IntervalIncludesInterval(ah_, ak_, "day"); return al_; }; @@ -824,7 +824,7 @@ public IEnumerable Qualifying_Encounter() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(50, 63, true, true); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -1224,7 +1224,7 @@ public IEnumerable DiagnosisInPatientHistory(IEnumerable C CqlDateTime d_ = context.Operators.Start(c_); CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); - bool? g_ = context.Operators.SameOrBefore(d_, f_, null); + bool? g_ = context.Operators.SameOrBefore(d_, f_, "day"); return g_; }; @@ -1245,7 +1245,7 @@ public IEnumerable ProcedureInPatientHistory(IEnumerable P CqlDateTime g_ = context.Operators.End(f_); CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.End(h_); - bool? j_ = context.Operators.SameOrBefore(g_, i_, null); + bool? j_ = context.Operators.SameOrBefore(g_, i_, "day"); return j_; }; 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 2c14cd1ea..b0301970e 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTestingforPharyngitisFHIR-0.1.000.g.cs @@ -636,7 +636,7 @@ private IEnumerable Initial_Population_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 3); return n_; @@ -757,7 +757,7 @@ private IEnumerable Numerator_Value() CqlDateTime v_ = context.Operators.End(u_); CqlDateTime x_ = context.Operators.Add(v_, r_); CqlInterval y_ = context.Operators.Interval(s_, x_, true, true); - bool? z_ = context.Operators.In(n_, y_, null); + bool? z_ = context.Operators.In(n_, y_, "day"); return z_; }; @@ -785,7 +785,7 @@ private IEnumerable Stratification_1_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); CqlInterval n_ = context.Operators.Interval(3, 17, true, true); bool? o_ = context.Operators.In(m_, n_, null); @@ -815,7 +815,7 @@ private IEnumerable Stratification_2_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); CqlInterval n_ = context.Operators.Interval(18, 64, true, true); bool? o_ = context.Operators.In(m_, n_, null); @@ -845,7 +845,7 @@ private IEnumerable Stratification_3_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 65); return n_; 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 a453c27c7..873273ac1 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforSTEMIFHIR-1.0.000.g.cs @@ -584,7 +584,7 @@ IEnumerable c_(Encounter EDEncounter) bool? ae_ = context.Operators.And(y_, ad_); CqlInterval af_ = this.Measurement_Period(); CqlInterval ah_ = FHIRHelpers_4_3_000.ToInterval(ab_); - bool? ai_ = context.Operators.IntervalIncludesInterval(af_, ah_, null); + bool? ai_ = context.Operators.IntervalIncludesInterval(af_, ah_, "day"); bool? aj_ = context.Operators.And(ae_, ai_); return aj_; @@ -631,7 +631,7 @@ private IEnumerable Initial_Population_Value() CqlInterval i_ = FHIRHelpers_4_3_000.ToInterval(h_); CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); - int? l_ = context.Operators.CalculateAgeAt(g_, k_, null); + int? l_ = context.Operators.CalculateAgeAt(g_, k_, "year"); bool? m_ = context.Operators.GreaterOrEqual(l_, 18); return m_; 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 58b7823e3..44b5b970f 100644 --- a/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/AppropriateTreatmentforUpperRespiratoryInfectionURIFHIR-0.1.000.g.cs @@ -448,7 +448,7 @@ CqlConcept ba_(CodeableConcept @this) CqlQuantity br_ = context.Operators.Quantity(3m, "days"); CqlDateTime bs_ = context.Operators.Subtract(bq_, br_); CqlInterval bt_ = context.Operators.Interval(bo_, bs_, true, true); - bool? bu_ = context.Operators.In(bm_, bt_, null); + bool? bu_ = context.Operators.In(bm_, bt_, "day"); return bu_; }; @@ -481,7 +481,7 @@ private IEnumerable Encounter_with_Upper_Respiratory_Infection_Value( Period n_ = tuple_figmirinmncaavfkbmahdktce?.QualifyingEncounters?.Period; CqlInterval o_ = FHIRHelpers_4_3_000.ToInterval(n_); CqlInterval p_ = QICoreCommon_2_0_000.ToInterval((o_ as object)); - bool? q_ = context.Operators.In(m_, p_, null); + bool? q_ = context.Operators.In(m_, p_, "day"); CqlInterval t_ = FHIRHelpers_4_3_000.ToInterval(n_); CqlInterval u_ = QICoreCommon_2_0_000.ToInterval((t_ as object)); bool? v_ = context.Operators.OverlapsBefore(l_, u_, null); @@ -513,7 +513,7 @@ private IEnumerable Initial_Population_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "month"); bool? n_ = context.Operators.GreaterOrEqual(m_, 3); return n_; @@ -649,14 +649,14 @@ private IEnumerable Stratification_1_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "month"); bool? n_ = context.Operators.GreaterOrEqual(m_, 3); Date p_ = f_?.BirthDateElement; string q_ = p_?.Value; CqlDate r_ = context.Operators.ConvertStringToDate(q_); CqlDateTime t_ = context.Operators.Start(j_); CqlDate u_ = context.Operators.DateFrom(t_); - int? v_ = context.Operators.CalculateAgeAt(r_, u_, null); + int? v_ = context.Operators.CalculateAgeAt(r_, u_, "year"); bool? w_ = context.Operators.LessOrEqual(v_, 17); bool? x_ = context.Operators.And(n_, w_); @@ -686,7 +686,7 @@ private IEnumerable Stratification_2_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); CqlInterval n_ = context.Operators.Interval(18, 64, true, true); bool? o_ = context.Operators.In(m_, n_, null); @@ -716,7 +716,7 @@ private IEnumerable Stratification_3_Value() CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 65); return n_; 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 ee849b2df..77236f6d4 100644 --- a/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CQMCommon-2.0.000.g.cs @@ -143,7 +143,7 @@ private IEnumerable Inpatient_Encounter_Value() CqlInterval j_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime k_ = context.Operators.End(j_); CqlInterval l_ = this.Measurement_Period(); - bool? m_ = context.Operators.In(k_, l_, null); + bool? m_ = context.Operators.In(k_, l_, "day"); bool? n_ = context.Operators.And(h_, m_); return n_; @@ -178,7 +178,7 @@ public CqlInterval ToDateInterval(CqlInterval period) { CqlDateTime a_ = context.Operators.Start(Value); CqlDateTime b_ = context.Operators.End(Value); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } @@ -189,7 +189,7 @@ public CqlInterval ToDateInterval(CqlInterval period) { CqlDateTime a_ = context.Operators.Start(Value); CqlDateTime b_ = context.Operators.End(Value); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } 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 a6c09a0df..05ea0d04d 100644 --- a/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CRLReceiptofSpecialistReportFHIR-0.2.000.g.cs @@ -197,7 +197,7 @@ public Patient Patient() => CqlInterval y_ = this.Measurement_Period(); Period z_ = Encounter?.Period; CqlInterval aa_ = FHIRHelpers_4_3_000.ToInterval(z_); - bool? ab_ = context.Operators.IntervalIncludesInterval(y_, aa_, null); + bool? ab_ = context.Operators.IntervalIncludesInterval(y_, aa_, "day"); bool? ac_ = context.Operators.And(x_, ab_); return ac_; @@ -237,11 +237,11 @@ public Patient Patient() => CqlInterval w_ = this.Measurement_Period(); CqlDateTime x_ = context.Operators.Start(w_); CqlDateTime z_ = context.Operators.Start(w_); - int? aa_ = context.Operators.DateTimeComponentFrom(z_, null); + int? aa_ = context.Operators.DateTimeComponentFrom(z_, "year"); CqlDate ab_ = context.Operators.Date(aa_, 10, 31); CqlDateTime ac_ = context.Operators.ConvertDateToDateTime(ab_); CqlInterval ad_ = context.Operators.Interval(x_, ac_, true, true); - bool? ae_ = context.Operators.In(v_, ad_, null); + bool? ae_ = context.Operators.In(v_, ad_, "day"); bool? af_ = context.Operators.And(t_, ae_); return af_; @@ -389,7 +389,7 @@ IEnumerable c_(Task ConsultantReportObtained) CqlInterval aa_ = FHIRHelpers_4_3_000.ToInterval(o_); CqlDateTime ab_ = context.Operators.End(aa_); CqlInterval ac_ = this.Measurement_Period(); - bool? ad_ = context.Operators.In(ab_, ac_, null); + bool? ad_ = context.Operators.In(ab_, ac_, "day"); bool? ae_ = context.Operators.And(y_, ad_); return ae_; 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 9793f8455..da2de6465 100644 --- a/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Cataracts2040BCVAwithin90DaysFHIR-0.1.000.g.cs @@ -739,7 +739,7 @@ private IEnumerable Initial_Population_Value() CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.Start(h_); CqlDate j_ = context.Operators.DateFrom(i_); - int? k_ = context.Operators.CalculateAgeAt(g_, j_, null); + int? k_ = context.Operators.CalculateAgeAt(g_, j_, "year"); bool? l_ = context.Operators.GreaterOrEqual(k_, 18); return l_; @@ -988,7 +988,7 @@ IEnumerable b_(Procedure CataractSurgeryPerformed) CqlQuantity z_ = context.Operators.Quantity(90m, "days"); CqlDateTime aa_ = context.Operators.Add(y_, z_); CqlInterval ab_ = context.Operators.Interval(u_, aa_, false, true); - bool? ac_ = context.Operators.In(q_, ab_, null); + bool? ac_ = context.Operators.In(q_, ab_, "day"); object ae_ = FHIRHelpers_4_3_000.ToValue(r_); CqlInterval af_ = QICoreCommon_2_0_000.toInterval(ae_); CqlDateTime ag_ = context.Operators.End(af_); 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 76b071d91..94e1f745b 100644 --- a/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/CervicalCancerScreeningFHIR-0.0.001.g.cs @@ -225,7 +225,7 @@ private IEnumerable Qualifying_Encounters_Value() Period v_ = ValidEncounters?.Period; CqlInterval w_ = FHIRHelpers_4_3_000.ToInterval(v_); CqlInterval x_ = QICoreCommon_2_0_000.toInterval((w_ as object)); - bool? y_ = context.Operators.IntervalIncludesInterval(u_, x_, null); + bool? y_ = context.Operators.IntervalIncludesInterval(u_, x_, "day"); return y_; }; @@ -247,7 +247,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(24, 64, true, true); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -399,7 +399,7 @@ bool v_() CqlDateTime k_ = context.Operators.Subtract(i_, j_); CqlDateTime m_ = context.Operators.End(h_); CqlInterval n_ = context.Operators.Interval(k_, m_, true, true); - bool? o_ = context.Operators.In(g_, n_, null); + bool? o_ = context.Operators.In(g_, n_, "day"); DataType p_ = CervicalCytology?.Value; object q_ = FHIRHelpers_4_3_000.ToValue(p_); bool? r_ = context.Operators.Not((bool?)(q_ is null)); @@ -481,7 +481,7 @@ bool af_() }; CqlDateTime k_ = QICoreCommon_2_0_000.latest(j_()); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(i_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(i_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 30); object o_() { @@ -542,7 +542,7 @@ bool ax_() CqlDateTime t_ = context.Operators.Subtract(r_, s_); CqlDateTime v_ = context.Operators.End(q_); CqlInterval w_ = context.Operators.Interval(t_, v_, true, true); - bool? x_ = context.Operators.In(p_, w_, null); + bool? x_ = context.Operators.In(p_, w_, "day"); bool? y_ = context.Operators.And(n_, x_); DataType z_ = HPVTest?.Value; object aa_ = FHIRHelpers_4_3_000.ToValue(z_); 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 666d605af..098d40a4d 100644 --- a/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildandAdolescentMajorDepressiveDisorderMDDSuicideRiskAssessmentFHIR-0.1.000.g.cs @@ -391,14 +391,14 @@ private IEnumerable Initial_Population_Value() CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.Start(h_); CqlDate j_ = context.Operators.DateFrom(i_); - int? k_ = context.Operators.CalculateAgeAt(g_, j_, null); + int? k_ = context.Operators.CalculateAgeAt(g_, j_, "year"); bool? l_ = context.Operators.GreaterOrEqual(k_, 6); Date n_ = d_?.BirthDateElement; string o_ = n_?.Value; CqlDate p_ = context.Operators.ConvertStringToDate(o_); CqlDateTime r_ = context.Operators.Start(h_); CqlDate s_ = context.Operators.DateFrom(r_); - int? t_ = context.Operators.CalculateAgeAt(p_, s_, null); + int? t_ = context.Operators.CalculateAgeAt(p_, s_, "year"); bool? u_ = context.Operators.LessOrEqual(t_, 16); bool? v_ = context.Operators.And(l_, u_); 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 08b656f46..c4d599fbd 100644 --- a/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildhoodImmunizationStatusFHIR-0.1.000.g.cs @@ -893,7 +893,7 @@ CqlConcept z_(CodeableConcept @this) Period aj_ = ValidEncounters?.Period; CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlInterval al_ = QICoreCommon_2_0_000.ToInterval((ak_ as object)); - bool? am_ = context.Operators.IntervalIncludesInterval(ai_, al_, null); + bool? am_ = context.Operators.IntervalIncludesInterval(ai_, al_, "day"); return am_; }; @@ -915,7 +915,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.Equal(h_, 2); IEnumerable j_ = this.Qualifying_Encounters(); bool? k_ = context.Operators.Exists(j_); @@ -984,7 +984,7 @@ public CqlInterval First_Two_Years() => CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1009,7 +1009,7 @@ public CqlInterval First_Two_Years() => CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1034,7 +1034,7 @@ public CqlInterval First_Two_Years() => CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1059,7 +1059,7 @@ public CqlInterval First_Two_Years() => CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1084,7 +1084,7 @@ public CqlInterval First_Two_Years() => CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1151,7 +1151,7 @@ private IEnumerable DTaP_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -1179,7 +1179,7 @@ CqlDate f_(Immunization DTaPVaccination) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -1221,12 +1221,12 @@ private IEnumerable Four_DTaP_Vaccinations_Value() { CqlQuantity m_ = context.Operators.Quantity(1m, "day"); CqlDate n_ = context.Operators.Add(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination1, m_); - bool? o_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination2, n_, null); + bool? o_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination2, n_, "day"); CqlDate q_ = context.Operators.Add(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination2, m_); - bool? r_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination3, q_, null); + bool? r_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination3, q_, "day"); bool? s_ = context.Operators.And(o_, r_); CqlDate u_ = context.Operators.Add(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination3, m_); - bool? v_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination4, u_, null); + bool? v_ = context.Operators.SameOrAfter(tuple_emdhflcfhwveravvnflazyxji?.DTaPVaccination4, u_, "day"); bool? w_ = context.Operators.And(s_, v_); return w_; @@ -1257,7 +1257,7 @@ private IEnumerable DTaP_Numerator_Inclusion_Conditions_Value() CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); CqlInterval l_ = this.First_Two_Years(); - bool? m_ = context.Operators.In(k_, l_, null); + bool? m_ = context.Operators.In(k_, l_, "day"); return m_; }; @@ -1282,7 +1282,7 @@ private IEnumerable Polio_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -1310,7 +1310,7 @@ CqlDate f_(Immunization PolioVaccination) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -1352,9 +1352,9 @@ private IEnumerable Three_Polio_Vaccinations_Value() { CqlQuantity l_ = context.Operators.Quantity(1m, "day"); CqlDate m_ = context.Operators.Add(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination1, l_); - bool? n_ = context.Operators.SameOrAfter(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination2, m_, null); + bool? n_ = context.Operators.SameOrAfter(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination2, m_, "day"); CqlDate p_ = context.Operators.Add(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination2, l_); - bool? q_ = context.Operators.SameOrAfter(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination3, p_, null); + bool? q_ = context.Operators.SameOrAfter(tuple_cnghazroxajthpiccbiajbrxv?.PolioVaccination3, p_, "day"); bool? r_ = context.Operators.And(n_, q_); return r_; @@ -1383,7 +1383,7 @@ private IEnumerable Polio_Numerator_Inclusion_Conditions_Value() CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1480,7 +1480,7 @@ private IEnumerable MMR_Numerator_Inclusion_Conditions_Value() CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1504,7 +1504,7 @@ private IEnumerable Measles_Indicators_Value() CqlDateTime g_ = context.Operators.Start(f_); CqlDate h_ = context.Operators.DateFrom(g_); CqlInterval i_ = this.First_Two_Years(); - bool? j_ = context.Operators.In(h_, i_, null); + bool? j_ = context.Operators.In(h_, i_, "day"); return j_; }; @@ -1528,7 +1528,7 @@ private IEnumerable Mumps_Indicators_Value() CqlDateTime g_ = context.Operators.Start(f_); CqlDate h_ = context.Operators.DateFrom(g_); CqlInterval i_ = this.First_Two_Years(); - bool? j_ = context.Operators.In(h_, i_, null); + bool? j_ = context.Operators.In(h_, i_, "day"); return j_; }; @@ -1552,7 +1552,7 @@ private IEnumerable Rubella_Indicators_Value() CqlDateTime g_ = context.Operators.Start(f_); CqlDate h_ = context.Operators.DateFrom(g_); CqlInterval i_ = this.First_Two_Years(); - bool? j_ = context.Operators.In(h_, i_, null); + bool? j_ = context.Operators.In(h_, i_, "day"); return j_; }; @@ -1577,7 +1577,7 @@ private IEnumerable Hib_3_Dose_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -1605,7 +1605,7 @@ CqlDate f_(Immunization ThreeDoseHibVaccine) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -1644,7 +1644,7 @@ private IEnumerable Hib_4_Dose_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -1672,7 +1672,7 @@ CqlDate f_(Immunization HibVaccine) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -1794,7 +1794,7 @@ private IEnumerable Hib_Numerator_Inclusion_Conditions_Value() CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -1819,7 +1819,7 @@ private IEnumerable Hepatitis_B_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -1847,7 +1847,7 @@ CqlDate f_(Immunization HepatitisBVaccination) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -1889,9 +1889,9 @@ private IEnumerable Three_Hepatitis_B_Vaccinations_Value() { CqlQuantity l_ = context.Operators.Quantity(1m, "day"); CqlDate m_ = context.Operators.Add(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination1, l_); - bool? n_ = context.Operators.SameOrAfter(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination2, m_, null); + bool? n_ = context.Operators.SameOrAfter(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination2, m_, "day"); CqlDate p_ = context.Operators.Add(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination2, l_); - bool? q_ = context.Operators.SameOrAfter(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination3, p_, null); + bool? q_ = context.Operators.SameOrAfter(tuple_eztgahauwggsdgadcgqnnipgw?.HepatitisBVaccination3, p_, "day"); bool? r_ = context.Operators.And(n_, q_); return r_; @@ -1934,7 +1934,7 @@ private IEnumerable NewBorn_Vaccine_Requirement_Value() object y_ = FHIRHelpers_4_3_000.ToValue(x_); CqlInterval z_ = QICoreCommon_2_0_000.ToInterval(y_); CqlInterval aa_ = CQMCommon_2_0_000.ToDateInterval(z_); - bool? ab_ = context.Operators.IntervalIncludesInterval(w_, aa_, null); + bool? ab_ = context.Operators.IntervalIncludesInterval(w_, aa_, "day"); return ab_; }; @@ -1974,12 +1974,12 @@ private IEnumerable Meets_HepB_Vaccination_Requirement_Value() { CqlQuantity l_ = context.Operators.Quantity(1m, "day"); CqlDate m_ = context.Operators.Add(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination1, l_); - bool? n_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination2, m_, null); + bool? n_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination2, m_, "day"); CqlDate p_ = context.Operators.Add(tuple_hdfambzgbwdpfetgqnfbceeeg?.NewBornVaccine3, l_); - bool? q_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination1, p_, null); + bool? q_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination1, p_, "day"); bool? r_ = context.Operators.And(n_, q_); CqlDate t_ = context.Operators.Add(tuple_hdfambzgbwdpfetgqnfbceeeg?.NewBornVaccine3, l_); - bool? u_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination2, t_, null); + bool? u_ = context.Operators.SameOrAfter(tuple_hdfambzgbwdpfetgqnfbceeeg?.HepatitisBVaccination2, t_, "day"); bool? v_ = context.Operators.And(r_, u_); return v_; @@ -2011,7 +2011,7 @@ private IEnumerable Hepatitis_B_Numerator_Inclusion_Conditions_Value( CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); CqlInterval m_ = this.First_Two_Years(); - bool? n_ = context.Operators.In(l_, m_, null); + bool? n_ = context.Operators.In(l_, m_, "day"); return n_; }; @@ -2080,7 +2080,7 @@ private IEnumerable Varicella_Zoster_Numerator_Inclusion_Conditions_V CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); CqlInterval m_ = this.First_Two_Years(); - bool? n_ = context.Operators.In(l_, m_, null); + bool? n_ = context.Operators.In(l_, m_, "day"); return n_; }; @@ -2105,7 +2105,7 @@ private IEnumerable Pneumococcal_Conjugate_Immunizations_or_Procedures_ CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -2133,7 +2133,7 @@ CqlDate f_(Immunization PneumococcalVaccination) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -2175,12 +2175,12 @@ private IEnumerable Four_Pneumococcal_Conjugate_Vaccinations_Value() { CqlQuantity m_ = context.Operators.Quantity(1m, "day"); CqlDate n_ = context.Operators.Add(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination1, m_); - bool? o_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination2, n_, null); + bool? o_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination2, n_, "day"); CqlDate q_ = context.Operators.Add(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination2, m_); - bool? r_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination3, q_, null); + bool? r_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination3, q_, "day"); bool? s_ = context.Operators.And(o_, r_); CqlDate u_ = context.Operators.Add(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination3, m_); - bool? v_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination4, u_, null); + bool? v_ = context.Operators.SameOrAfter(tuple_ddpdeojhpyesfhgcocbnoippp?.PneumococcalVaccination4, u_, "day"); bool? w_ = context.Operators.And(s_, v_); return w_; @@ -2209,7 +2209,7 @@ private IEnumerable Pneumococcal_Conjugate_Numerator_Inclusion_Condit CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -2278,7 +2278,7 @@ private IEnumerable Hepatitis_A_Numerator_Inclusion_Conditions_Value( CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); CqlInterval m_ = this.First_Two_Years(); - bool? n_ = context.Operators.In(l_, m_, null); + bool? n_ = context.Operators.In(l_, m_, "day"); return n_; }; @@ -2304,7 +2304,7 @@ private IEnumerable Rotavirus_2_Dose_Immunizations_or_Procedures_Value( CqlDateTime s_ = context.Operators.LateBoundProperty(r_, "value"); CqlInterval t_ = QICoreCommon_2_0_000.ToInterval((s_ as object)); CqlInterval u_ = CQMCommon_2_0_000.ToDateInterval(t_); - bool? v_ = context.Operators.IntervalIncludesInterval(q_, u_, null); + bool? v_ = context.Operators.IntervalIncludesInterval(q_, u_, "day"); return v_; }; @@ -2332,7 +2332,7 @@ CqlDate g_(Immunization TwoDoseRotavirusVaccine) object af_ = FHIRHelpers_4_3_000.ToValue(ae_); CqlInterval ag_ = QICoreCommon_2_0_000.ToInterval(af_); CqlInterval ah_ = CQMCommon_2_0_000.ToDateInterval(ag_); - bool? ai_ = context.Operators.IntervalIncludesInterval(ad_, ah_, null); + bool? ai_ = context.Operators.IntervalIncludesInterval(ad_, ah_, "day"); return ai_; }; @@ -2371,7 +2371,7 @@ private IEnumerable Rotavirus_3_Dose_Immunizations_or_Procedures_Value( CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -2399,7 +2399,7 @@ CqlDate f_(Immunization ThreeDoseRotavirusVaccine) object ae_ = FHIRHelpers_4_3_000.ToValue(ad_); CqlInterval af_ = QICoreCommon_2_0_000.ToInterval(ae_); CqlInterval ag_ = CQMCommon_2_0_000.ToDateInterval(af_); - bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, null); + bool? ah_ = context.Operators.IntervalIncludesInterval(ac_, ag_, "day"); return ah_; }; @@ -2521,7 +2521,7 @@ private IEnumerable Rotavirus_Numerator_Inclusion_Conditions_Value() CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; @@ -2566,7 +2566,7 @@ private IEnumerable Influenza_Immunizations_or_Procedures_Value() CqlDateTime r_ = context.Operators.LateBoundProperty(q_, "value"); CqlInterval s_ = QICoreCommon_2_0_000.ToInterval((r_ as object)); CqlInterval t_ = CQMCommon_2_0_000.ToDateInterval(s_); - bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, null); + bool? u_ = context.Operators.IntervalIncludesInterval(p_, t_, "day"); return u_; }; @@ -2600,7 +2600,7 @@ CqlDate f_(Immunization InfluenzaVaccine) DataType an_ = InfluenzaAdministration?.Performed; object ao_ = FHIRHelpers_4_3_000.ToValue(an_); CqlInterval ap_ = QICoreCommon_2_0_000.ToInterval(ao_); - bool? aq_ = context.Operators.IntervalIncludesInterval(am_, ap_, null); + bool? aq_ = context.Operators.IntervalIncludesInterval(am_, ap_, "day"); return aq_; }; @@ -2642,7 +2642,7 @@ private IEnumerable Two_Influenza_Vaccinations_Value() { CqlQuantity k_ = context.Operators.Quantity(1m, "day"); CqlDate l_ = context.Operators.Add(tuple_bzhflerdagbpqmnhevjcunfnq?.FluVaccination1, k_); - bool? m_ = context.Operators.SameOrAfter(tuple_bzhflerdagbpqmnhevjcunfnq?.FluVaccination2, l_, null); + bool? m_ = context.Operators.SameOrAfter(tuple_bzhflerdagbpqmnhevjcunfnq?.FluVaccination2, l_, "day"); return m_; }; @@ -2671,7 +2671,7 @@ private IEnumerable LAIV_Vaccinations_Value() CqlDateTime t_ = context.Operators.LateBoundProperty(s_, "value"); CqlInterval u_ = QICoreCommon_2_0_000.ToInterval((t_ as object)); CqlInterval v_ = CQMCommon_2_0_000.ToDateInterval(u_); - bool? w_ = context.Operators.IntervalIncludesInterval(r_, v_, null); + bool? w_ = context.Operators.IntervalIncludesInterval(r_, v_, "day"); return w_; }; @@ -2700,7 +2700,7 @@ CqlDate f_(Immunization LAIVVaccine) object ai_ = FHIRHelpers_4_3_000.ToValue(ah_); CqlInterval aj_ = QICoreCommon_2_0_000.ToInterval(ai_); CqlInterval ak_ = CQMCommon_2_0_000.ToDateInterval(aj_); - bool? al_ = context.Operators.IntervalIncludesInterval(ag_, ak_, null); + bool? al_ = context.Operators.IntervalIncludesInterval(ag_, ak_, "day"); return al_; }; @@ -2754,7 +2754,7 @@ private IEnumerable Influenza_Numerator_Inclusion_Conditions_Value() CqlDateTime h_ = context.Operators.Start(g_); CqlDate i_ = context.Operators.DateFrom(h_); CqlInterval j_ = this.First_Two_Years(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; 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 72d4a6c62..09d3c3a83 100644 --- a/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/ChildrenWhoHaveDentalDecayOrCavitiesFHIR-0.0.001.g.cs @@ -229,7 +229,7 @@ private IEnumerable Qualifying_Encounters_Value() CqlInterval f_ = this.Measurement_Period(); Period g_ = ValidEncounter?.Period; CqlInterval h_ = FHIRHelpers_4_3_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, "day"); return i_; }; @@ -251,7 +251,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(1, 20, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = this.Qualifying_Encounters(); 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 ab4e10a27..17ad3b355 100644 --- a/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ChlamydiaScreeninginWomenFHIR-0.1.000.g.cs @@ -475,7 +475,7 @@ private IEnumerable Qualifying_Encounters_Value() Period ab_ = ValidEncounters?.Period; CqlInterval ac_ = FHIRHelpers_4_3_000.ToInterval(ab_); CqlInterval ad_ = QICoreCommon_2_0_000.ToInterval((ac_ as object)); - bool? ae_ = context.Operators.IntervalIncludesInterval(aa_, ad_, null); + bool? ae_ = context.Operators.IntervalIncludesInterval(aa_, ad_, "day"); return ae_; }; @@ -615,7 +615,7 @@ bool s_() FhirDateTime k_ = OrderedContraceptives?.AuthoredOnElement; CqlDateTime l_ = context.Operators.Convert(k_); CqlInterval m_ = QICoreCommon_2_0_000.ToInterval((l_ as object)); - bool? n_ = context.Operators.IntervalIncludesInterval(j_, m_, null); + bool? n_ = context.Operators.IntervalIncludesInterval(j_, m_, "day"); return n_; }; @@ -646,7 +646,7 @@ bool s_() FhirDateTime n_ = LabOrders?.AuthoredOnElement; CqlDateTime o_ = context.Operators.Convert(n_); CqlInterval p_ = QICoreCommon_2_0_000.ToInterval((o_ as object)); - bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, null); + bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, "day"); return q_; }; @@ -671,7 +671,7 @@ bool s_() FhirDateTime j_ = PregnancyTest?.AuthoredOnElement; CqlDateTime k_ = context.Operators.Convert(j_); CqlInterval l_ = QICoreCommon_2_0_000.ToInterval((k_ as object)); - bool? m_ = context.Operators.IntervalIncludesInterval(i_, l_, null); + bool? m_ = context.Operators.IntervalIncludesInterval(i_, l_, "day"); return m_; }; @@ -698,7 +698,7 @@ bool s_() FhirDateTime h_ = SexualActivityDiagnostics?.AuthoredOnElement; CqlDateTime i_ = context.Operators.Convert(h_); CqlInterval j_ = QICoreCommon_2_0_000.ToInterval((i_ as object)); - bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, null); + bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, "day"); return k_; }; @@ -723,7 +723,7 @@ bool s_() DataType h_ = ProceduresForSexualActivity?.Performed; object i_ = FHIRHelpers_4_3_000.ToValue(h_); CqlInterval j_ = QICoreCommon_2_0_000.ToInterval(i_); - bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, null); + bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, "day"); return k_; }; @@ -746,7 +746,7 @@ bool s_() CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(16, 24, true, true); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -816,7 +816,7 @@ IEnumerable d_(ServiceRequest PregnancyTest) CqlQuantity af_ = context.Operators.Quantity(6m, "days"); CqlDateTime ag_ = context.Operators.Add(ae_, af_); CqlInterval ah_ = context.Operators.Interval(aa_, ag_, true, true); - bool? ai_ = context.Operators.In(w_, ah_, null); + bool? ai_ = context.Operators.In(w_, ah_, "day"); CqlDateTime ak_ = context.Operators.Convert(x_); CqlInterval al_ = QICoreCommon_2_0_000.ToInterval((ak_ as object)); CqlDateTime am_ = context.Operators.End(al_); @@ -863,7 +863,7 @@ IEnumerable i_(ServiceRequest PregnancyTestOrder) CqlQuantity br_ = context.Operators.Quantity(6m, "days"); CqlDateTime bs_ = context.Operators.Add(bq_, br_); CqlInterval bt_ = context.Operators.Interval(bm_, bs_, true, true); - bool? bu_ = context.Operators.In(bi_, bt_, null); + bool? bu_ = context.Operators.In(bi_, bt_, "day"); CqlDateTime bw_ = context.Operators.Convert(bj_); CqlInterval bx_ = QICoreCommon_2_0_000.ToInterval((bw_ as object)); CqlDateTime by_ = context.Operators.End(bx_); @@ -990,7 +990,7 @@ bool q_() }; CqlDateTime h_ = QICoreCommon_2_0_000.Latest(g_()); CqlInterval i_ = this.Measurement_Period(); - bool? j_ = context.Operators.In(h_, i_, null); + bool? j_ = context.Operators.In(h_, i_, "day"); DataType k_ = ChlamydiaTest?.Value; object l_ = FHIRHelpers_4_3_000.ToValue(k_); bool? m_ = context.Operators.Not((bool?)(l_ is null)); @@ -1017,7 +1017,7 @@ bool q_() CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(16, 20, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -1037,7 +1037,7 @@ bool q_() CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(21, 24, true, true); bool? j_ = context.Operators.In(h_, i_, null); 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 0849a3dcd..5e228a266 100644 --- a/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ColonCancerScreeningFHIR-0.1.000.g.cs @@ -238,7 +238,7 @@ public CqlCode SDE_Sex() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(46, 75, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = AdultOutpatientEncounters_4_8_000.Qualifying_Encounters(); @@ -274,7 +274,7 @@ private IEnumerable Malignant_Neoplasm_Value() CqlDateTime g_ = context.Operators.Start(f_); CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.End(h_); - bool? j_ = context.Operators.SameOrBefore(g_, i_, null); + bool? j_ = context.Operators.SameOrBefore(g_, i_, "day"); return j_; }; @@ -300,7 +300,7 @@ private IEnumerable Total_Colectomy_Performed_Value() CqlDateTime i_ = context.Operators.End(h_); CqlInterval j_ = this.Measurement_Period(); CqlDateTime k_ = context.Operators.End(j_); - bool? l_ = context.Operators.SameOrBefore(i_, k_, null); + bool? l_ = context.Operators.SameOrBefore(i_, k_, "day"); return l_; }; @@ -400,7 +400,7 @@ bool p_() }; CqlDateTime j_ = QICoreCommon_2_0_000.Latest(i_()); CqlInterval k_ = this.Measurement_Period(); - bool? l_ = context.Operators.In(j_, k_, null); + bool? l_ = context.Operators.In(j_, k_, "day"); bool? m_ = context.Operators.And(h_, l_); return m_; @@ -483,7 +483,7 @@ bool v_() CqlDateTime n_ = context.Operators.Subtract(l_, m_); CqlDateTime p_ = context.Operators.End(k_); CqlInterval q_ = context.Operators.Interval(n_, p_, true, true); - bool? r_ = context.Operators.In(j_, q_, null); + bool? r_ = context.Operators.In(j_, q_, "day"); bool? s_ = context.Operators.And(h_, r_); return s_; @@ -514,7 +514,7 @@ private IEnumerable Flexible_Sigmoidoscopy_Performed_Value() CqlDateTime m_ = context.Operators.Subtract(k_, l_); CqlDateTime o_ = context.Operators.End(j_); CqlInterval p_ = context.Operators.Interval(m_, o_, true, true); - bool? q_ = context.Operators.In(i_, p_, null); + bool? q_ = context.Operators.In(i_, p_, "day"); return q_; }; @@ -544,7 +544,7 @@ private IEnumerable CT_Colonography_Performed_Value() CqlDateTime m_ = context.Operators.Subtract(k_, l_); CqlDateTime o_ = context.Operators.End(j_); CqlInterval p_ = context.Operators.Interval(m_, o_, true, true); - bool? q_ = context.Operators.In(i_, p_, null); + bool? q_ = context.Operators.In(i_, p_, "day"); return q_; }; @@ -574,7 +574,7 @@ private IEnumerable Colonoscopy_Performed_Value() CqlDateTime m_ = context.Operators.Subtract(k_, l_); CqlDateTime o_ = context.Operators.End(j_); CqlInterval p_ = context.Operators.Interval(m_, o_, true, true); - bool? q_ = context.Operators.In(i_, p_, null); + bool? q_ = context.Operators.In(i_, p_, "day"); return q_; }; @@ -620,7 +620,7 @@ public IEnumerable Colonoscopy_Performed() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(46, 49, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -640,7 +640,7 @@ public IEnumerable Colonoscopy_Performed() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(50, 75, true, true); bool? j_ = context.Operators.In(h_, i_, null); 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 0fe648d67..611c6f621 100644 --- a/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/CumulativeMedicationDuration-4.0.000.g.cs @@ -2049,7 +2049,7 @@ bool f_() { CqlDate f_ = context.Operators.Start(X); CqlDate g_ = context.Operators.End(X); - int? h_ = context.Operators.DifferenceBetween(f_, g_, null); + int? h_ = context.Operators.DifferenceBetween(f_, g_, "day"); int? i_ = context.Operators.Add(h_, 1); return i_; @@ -2096,7 +2096,7 @@ CqlInterval d_(CqlInterval X) ]; CqlDate v_ = context.Operators.Max((u_ as IEnumerable)); CqlDate x_ = context.Operators.End(X); - int? y_ = context.Operators.DurationBetween(m_, x_, null); + int? y_ = context.Operators.DurationBetween(m_, x_, "day"); decimal? z_ = context.Operators.ConvertIntegerToDecimal((y_ ?? 0)); CqlQuantity aa_ = this.Quantity(z_, "day"); CqlDate ab_ = context.Operators.Add(v_, aa_); 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 cf4b4cd6e..eb363fc82 100644 --- a/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.1.000.g.cs @@ -472,7 +472,7 @@ public IEnumerable Diabetic_Retinopathy_Encounter() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); IEnumerable j_ = this.Diabetic_Retinopathy_Encounter(); bool? k_ = context.Operators.Exists(j_); @@ -572,7 +572,7 @@ IEnumerable d_(Communication LevelOfSeverityCommunicated) bool? r_ = context.Operators.After(n_, q_, null); CqlDateTime t_ = context.Operators.Convert(m_); CqlInterval u_ = this.Measurement_Period(); - bool? v_ = context.Operators.In(t_, u_, null); + bool? v_ = context.Operators.In(t_, u_, "day"); bool? w_ = context.Operators.And(r_, v_); return w_; @@ -621,7 +621,7 @@ IEnumerable d_(Communication MacularEdemaAbsentCommunicated) bool? r_ = context.Operators.After(n_, q_, null); CqlDateTime t_ = context.Operators.Convert(m_); CqlInterval u_ = this.Measurement_Period(); - bool? v_ = context.Operators.In(t_, u_, null); + bool? v_ = context.Operators.In(t_, u_, "day"); bool? w_ = context.Operators.And(r_, v_); return w_; @@ -670,7 +670,7 @@ IEnumerable d_(Communication MacularEdemaPresentCommunicated) bool? r_ = context.Operators.After(n_, q_, null); CqlDateTime t_ = context.Operators.Convert(m_); CqlInterval u_ = this.Measurement_Period(); - bool? v_ = context.Operators.In(t_, u_, null); + bool? v_ = context.Operators.In(t_, u_, "day"); bool? w_ = context.Operators.And(r_, v_); return w_; 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 f5bc44e12..d7709d60e 100644 --- a/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DementiaCognitiveAssessmentFHIR-0.1.000.g.cs @@ -310,7 +310,7 @@ IEnumerable b_(Encounter EncounterAssessCognition) bool? m_ = context.Operators.IntervalIncludesInterval(j_, l_, null); CqlInterval n_ = QICoreCommon_2_0_000.prevalenceInterval(Dementia); CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(k_); - bool? q_ = context.Operators.Overlaps(n_, p_, null); + bool? q_ = context.Operators.Overlaps(n_, p_, "day"); bool? r_ = context.Operators.And(m_, q_); bool? s_ = QICoreCommon_2_0_000.isActive(Dementia); bool? t_ = context.Operators.And(r_, s_); @@ -430,7 +430,7 @@ IEnumerable f_(Observation CognitiveAssessment) CqlInterval y_ = FHIRHelpers_4_3_000.ToInterval(s_); CqlDateTime z_ = context.Operators.End(y_); CqlInterval aa_ = context.Operators.Interval(w_, z_, true, true); - bool? ab_ = context.Operators.In(r_, aa_, null); + bool? ab_ = context.Operators.In(r_, aa_, "day"); CqlInterval ad_ = FHIRHelpers_4_3_000.ToInterval(s_); CqlDateTime ae_ = context.Operators.End(ad_); bool? af_ = context.Operators.Not((bool?)(ae_ is null)); 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 709212838..3c0529fd0 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesEyeExamFHIR-0.0.001.g.cs @@ -271,7 +271,7 @@ private IEnumerable Qualifying_Encounters_Value() CqlInterval x_ = this.Measurement_Period(); Period y_ = ValidEncounters?.Period; CqlInterval z_ = FHIRHelpers_4_3_000.ToInterval(y_); - bool? aa_ = context.Operators.IntervalIncludesInterval(x_, z_, null); + bool? aa_ = context.Operators.IntervalIncludesInterval(x_, z_, "day"); return aa_; }; @@ -293,7 +293,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(18, 75, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = this.Qualifying_Encounters(); @@ -381,7 +381,7 @@ private IEnumerable Retinal_Exam_in_Measurement_Period_Value() DataType g_ = RetinalExam?.Effective; object h_ = FHIRHelpers_4_3_000.ToValue(g_); CqlInterval i_ = QICoreCommon_2_0_000.toInterval(h_); - bool? j_ = context.Operators.IntervalIncludesInterval(f_, i_, null); + bool? j_ = context.Operators.IntervalIncludesInterval(f_, i_, "day"); return j_; }; @@ -410,7 +410,7 @@ private IEnumerable Retinal_Exam_in_Measurement_Period_or_Year_Prio DataType m_ = RetinalExam?.Effective; object n_ = FHIRHelpers_4_3_000.ToValue(m_); CqlInterval o_ = QICoreCommon_2_0_000.toInterval(n_); - bool? p_ = context.Operators.IntervalIncludesInterval(l_, o_, null); + bool? p_ = context.Operators.IntervalIncludesInterval(l_, o_, "day"); return p_; }; 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 dca2ab18b..ada203f9d 100644 --- a/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.1.000.g.cs @@ -180,7 +180,7 @@ public CqlCode SDE_Sex() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(18, 75, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = AdultOutpatientEncounters_4_8_000.Qualifying_Encounters(); @@ -296,7 +296,7 @@ bool o_() }; CqlDateTime j_ = QICoreCommon_2_0_000.Latest(i_()); CqlInterval k_ = this.Measurement_Period(); - bool? l_ = context.Operators.In(j_, k_, null); + bool? l_ = context.Operators.In(j_, k_, "day"); return l_; }; @@ -411,7 +411,7 @@ bool n_() }; CqlDateTime i_ = QICoreCommon_2_0_000.Latest(h_()); CqlInterval j_ = this.Measurement_Period(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; 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 cd817a8ad..25d11f661 100644 --- a/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FallsScreeningForFutureFallRiskFHIR-0.1.000.g.cs @@ -350,7 +350,7 @@ private IEnumerable Qualifying_Encounter_Value() Period aw_ = ValidEncounter?.Period; CqlInterval ax_ = FHIRHelpers_4_3_000.ToInterval(aw_); CqlInterval ay_ = QICoreCommon_2_0_000.ToInterval((ax_ as object)); - bool? az_ = context.Operators.IntervalIncludesInterval(av_, ay_, null); + bool? az_ = context.Operators.IntervalIncludesInterval(av_, ay_, "day"); return az_; }; @@ -372,7 +372,7 @@ public IEnumerable Qualifying_Encounter() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 65); IEnumerable j_ = this.Qualifying_Encounter(); bool? k_ = context.Operators.Exists(j_); @@ -418,7 +418,7 @@ public IEnumerable Qualifying_Encounter() => DataType h_ = FallsScreening?.Effective; object i_ = FHIRHelpers_4_3_000.ToValue(h_); CqlInterval j_ = QICoreCommon_2_0_000.ToInterval(i_); - bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, null); + bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, "day"); return k_; }; 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 210a4a8cd..821a986f7 100644 --- a/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FollowUpCareforChildrenPrescribedADHDMedicationADDFHIR-0.1.000.g.cs @@ -423,7 +423,7 @@ private CqlDateTime March_1_of_Year_Prior_to_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 1); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 3, 1, 0, 0, 0, 0, e_); @@ -439,7 +439,7 @@ private CqlDateTime Last_Calendar_Day_of_February_of_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); decimal? d_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime e_ = context.Operators.DateTime(c_, 3, 1, 23, 59, 59, 0, d_); CqlQuantity f_ = context.Operators.Quantity(1m, "day"); @@ -729,7 +729,7 @@ private IEnumerable Qualifying_Encounter_Value() Period ao_ = ValidEncounters?.Period; CqlInterval ap_ = FHIRHelpers_4_3_000.ToInterval(ao_); CqlInterval aq_ = QICoreCommon_2_0_000.ToInterval((ap_ as object)); - bool? ar_ = context.Operators.IntervalIncludesInterval(an_, aq_, null); + bool? ar_ = context.Operators.IntervalIncludesInterval(an_, aq_, "day"); return ar_; }; @@ -823,7 +823,7 @@ private IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_I CqlQuantity j_ = context.Operators.Quantity(30m, "days"); CqlDate k_ = context.Operators.Add(h_, j_); CqlInterval l_ = context.Operators.Interval(h_, k_, false, true); - bool? m_ = context.Operators.In(g_, l_, null); + bool? m_ = context.Operators.In(g_, l_, "day"); bool? o_ = context.Operators.Not((bool?)(h_ is null)); bool? p_ = context.Operators.And(m_, o_); @@ -847,14 +847,14 @@ public IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_In CqlInterval e_ = this.Intake_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 6); Date k_ = a_?.BirthDateElement; string l_ = k_?.Value; CqlDate m_ = context.Operators.ConvertStringToDate(l_); CqlDateTime o_ = context.Operators.End(e_); CqlDate p_ = context.Operators.DateFrom(o_); - int? q_ = context.Operators.CalculateAgeAt(m_, p_, null); + int? q_ = context.Operators.CalculateAgeAt(m_, p_, "year"); bool? r_ = context.Operators.LessOrEqual(q_, 12); bool? s_ = context.Operators.And(i_, r_); IEnumerable t_ = this.Qualifying_Encounter(); @@ -1010,7 +1010,7 @@ private IEnumerable Encounter_During_Initiation_Phase_Value() CqlQuantity j_ = context.Operators.Quantity(30m, "days"); CqlDate k_ = context.Operators.Add(h_, j_); CqlInterval l_ = context.Operators.Interval(h_, k_, false, true); - bool? m_ = context.Operators.In(g_, l_, null); + bool? m_ = context.Operators.In(g_, l_, "day"); bool? o_ = context.Operators.Not((bool?)(h_ is null)); bool? p_ = context.Operators.And(m_, o_); @@ -1392,7 +1392,7 @@ private IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_C CqlQuantity j_ = context.Operators.Quantity(300m, "days"); CqlDate k_ = context.Operators.Add(h_, j_); CqlInterval l_ = context.Operators.Interval(h_, k_, false, true); - bool? m_ = context.Operators.In(g_, l_, null); + bool? m_ = context.Operators.In(g_, l_, "day"); bool? o_ = context.Operators.Not((bool?)(h_ is null)); bool? p_ = context.Operators.And(m_, o_); @@ -1416,14 +1416,14 @@ public IEnumerable Inpatient_Stay_with_Qualifying_Diagnosis_During_Co CqlInterval e_ = this.Intake_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 6); Date k_ = a_?.BirthDateElement; string l_ = k_?.Value; CqlDate m_ = context.Operators.ConvertStringToDate(l_); CqlDateTime o_ = context.Operators.End(e_); CqlDate p_ = context.Operators.DateFrom(o_); - int? q_ = context.Operators.CalculateAgeAt(m_, p_, null); + int? q_ = context.Operators.CalculateAgeAt(m_, p_, "year"); bool? r_ = context.Operators.LessOrEqual(q_, 12); bool? s_ = context.Operators.And(i_, r_); IEnumerable t_ = this.Qualifying_Encounter(); @@ -1472,7 +1472,7 @@ private IEnumerable Encounter_31_to_300_Days_into_Continuation_and_Main CqlQuantity n_ = context.Operators.Quantity(300m, "days"); CqlDate o_ = context.Operators.Add(j_, n_); CqlInterval p_ = context.Operators.Interval(l_, o_, true, true); - bool? q_ = context.Operators.In(i_, p_, null); + bool? q_ = context.Operators.In(i_, p_, "day"); return q_; }; @@ -1524,7 +1524,7 @@ private IEnumerable Online_Assessment_31_to_300_Days_into_Continuation_ CqlQuantity o_ = context.Operators.Quantity(300m, "days"); CqlDate p_ = context.Operators.Add(k_, o_); CqlInterval q_ = context.Operators.Interval(m_, p_, true, true); - bool? r_ = context.Operators.In(j_, q_, null); + bool? r_ = context.Operators.In(j_, q_, "day"); return r_; }; 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 e3a07041f..a5295bbb2 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentforTotalHipReplacementFHIR-0.0.008.g.cs @@ -605,7 +605,7 @@ private CqlDateTime November_1_Year_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 1); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 11, 1, 0, 0, 0, 0, e_); @@ -666,7 +666,7 @@ CqlConcept u_(CodeableConcept @this) Period ah_ = ValidEncounters?.Period; CqlInterval ai_ = FHIRHelpers_4_3_000.ToInterval(ah_); CqlInterval aj_ = QICoreCommon_2_0_000.toInterval((ai_ as object)); - bool? ak_ = context.Operators.IntervalIncludesInterval(ag_, aj_, null); + bool? ak_ = context.Operators.IntervalIncludesInterval(ag_, aj_, "day"); return ak_; }; @@ -684,7 +684,7 @@ private CqlDateTime November_1_Two_Years_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 2); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 11, 1, 0, 0, 0, 0, e_); @@ -700,7 +700,7 @@ private CqlDateTime October_31_Year_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 1); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 10, 31, 23, 59, 59, 0, e_); @@ -726,7 +726,7 @@ private IEnumerable Total_Hip_Arthroplasty_Procedure_Value() CqlDateTime j_ = this.November_1_Two_Years_Prior_to_the_Measurement_Period(); CqlDateTime k_ = this.October_31_Year_Prior_to_the_Measurement_Period(); CqlInterval l_ = context.Operators.Interval(j_, k_, true, true); - bool? m_ = context.Operators.In(i_, l_, null); + bool? m_ = context.Operators.In(i_, l_, "day"); return m_; }; @@ -752,7 +752,7 @@ public IEnumerable Total_Hip_Arthroplasty_Procedure() => CqlInterval i_ = this.Measurement_Period(); CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); - int? l_ = context.Operators.CalculateAgeAt(h_, k_, null); + int? l_ = context.Operators.CalculateAgeAt(h_, k_, "year"); bool? m_ = context.Operators.GreaterOrEqual(l_, 19); bool? n_ = context.Operators.And(d_, m_); @@ -860,7 +860,7 @@ IEnumerable d_(Procedure PartialTHAProcedure) DataType o_ = PartialTHAProcedure?.Performed; object p_ = FHIRHelpers_4_3_000.ToValue(o_); CqlInterval q_ = QICoreCommon_2_0_000.toInterval(p_); - bool? r_ = context.Operators.IntervalIncludesInterval(n_, q_, null); + bool? r_ = context.Operators.IntervalIncludesInterval(n_, q_, "day"); return r_; }; @@ -897,7 +897,7 @@ IEnumerable b_(Procedure THAProcedure) DataType o_ = RevisionTHAProcedure?.Performed; object p_ = FHIRHelpers_4_3_000.ToValue(o_); CqlInterval q_ = QICoreCommon_2_0_000.toInterval(p_); - bool? r_ = context.Operators.IntervalIncludesInterval(n_, q_, null); + bool? r_ = context.Operators.IntervalIncludesInterval(n_, q_, "day"); return r_; }; @@ -1017,7 +1017,7 @@ IEnumerable b_(Procedure THAProcedure) CqlDateTime ae_ = context.Operators.Start(ad_); CqlDateTime ag_ = context.Operators.Add(ae_, z_); CqlInterval ah_ = context.Operators.Interval(aa_, ag_, true, true); - bool? ai_ = context.Operators.In(u_, ah_, null); + bool? ai_ = context.Operators.In(u_, ah_, "day"); bool? aj_ = context.Operators.And(q_, ai_); return aj_; @@ -1060,7 +1060,7 @@ Procedure j_(Procedure ElectiveTHAProcedure) => CqlQuantity s_ = context.Operators.Quantity(300m, "days"); CqlDate t_ = context.Operators.Add(r_, s_); CqlInterval u_ = context.Operators.Interval(m_, t_, true, true); - bool? v_ = context.Operators.In(h_, u_, null); + bool? v_ = context.Operators.In(h_, u_, "day"); return v_; }; @@ -1143,7 +1143,7 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() CqlInterval aj_ = QICoreCommon_2_0_000.toInterval(ai_); CqlDateTime ak_ = context.Operators.Start(aj_); CqlDate al_ = context.Operators.DateFrom(ak_); - bool? am_ = context.Operators.SameAs(ag_, al_, null); + bool? am_ = context.Operators.SameAs(ag_, al_, "day"); DataType an_ = tuple_eipfmazvhfscjijaofhicpvmb?.HOOSSport?.Value; object ao_ = FHIRHelpers_4_3_000.ToValue(an_); bool? ap_ = context.Operators.Not((bool?)(ao_ is null)); @@ -1157,7 +1157,7 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() CqlInterval ay_ = QICoreCommon_2_0_000.toInterval(ax_); CqlDateTime az_ = context.Operators.Start(ay_); CqlDate ba_ = context.Operators.DateFrom(az_); - bool? bb_ = context.Operators.SameAs(av_, ba_, null); + bool? bb_ = context.Operators.SameAs(av_, ba_, "day"); bool? bc_ = context.Operators.And(aq_, bb_); DataType bd_ = tuple_eipfmazvhfscjijaofhicpvmb?.HOOSActivityScore?.Value; object be_ = FHIRHelpers_4_3_000.ToValue(bd_); @@ -1172,7 +1172,7 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() CqlInterval bo_ = QICoreCommon_2_0_000.toInterval(bn_); CqlDateTime bp_ = context.Operators.Start(bo_); CqlDate bq_ = context.Operators.DateFrom(bp_); - bool? br_ = context.Operators.SameAs(bl_, bq_, null); + bool? br_ = context.Operators.SameAs(bl_, bq_, "day"); bool? bs_ = context.Operators.And(bg_, br_); DataType bt_ = tuple_eipfmazvhfscjijaofhicpvmb?.HOOSSymptoms?.Value; object bu_ = FHIRHelpers_4_3_000.ToValue(bt_); @@ -1187,7 +1187,7 @@ private IEnumerable Date_HOOS_Total_Assessment_Completed_Value() CqlInterval ce_ = QICoreCommon_2_0_000.toInterval(cd_); CqlDateTime cf_ = context.Operators.Start(ce_); CqlDate cg_ = context.Operators.DateFrom(cf_); - bool? ch_ = context.Operators.SameAs(cb_, cg_, null); + bool? ch_ = context.Operators.SameAs(cb_, cg_, "day"); bool? ci_ = context.Operators.And(bw_, ch_); DataType cj_ = tuple_eipfmazvhfscjijaofhicpvmb?.HOOSPain?.Value; object ck_ = FHIRHelpers_4_3_000.ToValue(cj_); @@ -1282,7 +1282,7 @@ IEnumerable> d_(CqlInterval TotalHip) CqlInterval ah_ = context.Operators.Interval(InitialHipAssessmentHOOS, ag_, true, true); bool? ai_ = ah_?.highClosed; CqlInterval aj_ = context.Operators.Interval(v_, aa_, ae_, ai_); - bool? ak_ = context.Operators.In(q_, aj_, null); + bool? ak_ = context.Operators.In(q_, aj_, "day"); bool? al_ = context.Operators.Not((bool?)(InitialHipAssessmentHOOS is null)); bool? am_ = context.Operators.And(ak_, al_); @@ -1311,7 +1311,7 @@ IEnumerable> f_(CqlInterval TotalHip) CqlQuantity ba_ = context.Operators.Quantity(425m, "days"); CqlDate bb_ = context.Operators.Add(az_, ba_); CqlInterval bc_ = context.Operators.Interval(ax_, bb_, true, true); - bool? bd_ = context.Operators.In(at_, bc_, null); + bool? bd_ = context.Operators.In(at_, bc_, "day"); return bd_; }; @@ -1399,7 +1399,7 @@ IEnumerable> d_(CqlInterval TotalHip) CqlInterval ah_ = context.Operators.Interval(InitialHipAssessment, ag_, true, true); bool? ai_ = ah_?.highClosed; CqlInterval aj_ = context.Operators.Interval(v_, aa_, ae_, ai_); - bool? ak_ = context.Operators.In(q_, aj_, null); + bool? ak_ = context.Operators.In(q_, aj_, "day"); bool? al_ = context.Operators.Not((bool?)(InitialHipAssessment is null)); bool? am_ = context.Operators.And(ak_, al_); @@ -1428,7 +1428,7 @@ IEnumerable> f_(CqlInterval TotalHip) CqlQuantity ba_ = context.Operators.Quantity(425m, "days"); CqlDate bb_ = context.Operators.Add(az_, ba_); CqlInterval bc_ = context.Operators.Interval(ax_, bb_, true, true); - bool? bd_ = context.Operators.In(at_, bc_, null); + bool? bd_ = context.Operators.In(at_, bc_, "day"); return bd_; }; @@ -1477,7 +1477,7 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() CqlInterval v_ = QICoreCommon_2_0_000.toInterval(u_); CqlDateTime w_ = context.Operators.Start(v_); CqlDate x_ = context.Operators.DateFrom(w_); - bool? y_ = context.Operators.SameAs(s_, x_, null); + bool? y_ = context.Operators.SameAs(s_, x_, "day"); DataType z_ = tuple_ddtaodcfiesjbggrllzpybgqb?.PROMIS10PhysicalScore?.Value; object aa_ = FHIRHelpers_4_3_000.ToValue(z_); bool? ab_ = context.Operators.Not((bool?)(aa_ is null)); @@ -1553,7 +1553,7 @@ IEnumerable> d_(CqlInterval TotalHip) CqlInterval ah_ = context.Operators.Interval(InitialHipAssessmentPROMIS10, ag_, true, true); bool? ai_ = ah_?.highClosed; CqlInterval aj_ = context.Operators.Interval(v_, aa_, ae_, ai_); - bool? ak_ = context.Operators.In(q_, aj_, null); + bool? ak_ = context.Operators.In(q_, aj_, "day"); bool? al_ = context.Operators.Not((bool?)(InitialHipAssessmentPROMIS10 is null)); bool? am_ = context.Operators.And(ak_, al_); @@ -1582,7 +1582,7 @@ IEnumerable> f_(CqlInterval TotalHip) CqlQuantity ba_ = context.Operators.Quantity(425m, "days"); CqlDate bb_ = context.Operators.Add(az_, ba_); CqlInterval bc_ = context.Operators.Interval(ax_, bb_, true, true); - bool? bd_ = context.Operators.In(at_, bc_, null); + bool? bd_ = context.Operators.In(at_, bc_, "day"); return bd_; }; @@ -1631,7 +1631,7 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( CqlInterval v_ = QICoreCommon_2_0_000.toInterval(u_); CqlDateTime w_ = context.Operators.Start(v_); CqlDate x_ = context.Operators.DateFrom(w_); - bool? y_ = context.Operators.SameAs(s_, x_, null); + bool? y_ = context.Operators.SameAs(s_, x_, "day"); DataType z_ = tuple_gadrfkrahuugjcvhwqwrujhrh?.VR12MentalAssessment?.Value; object aa_ = FHIRHelpers_4_3_000.ToValue(z_); bool? ab_ = context.Operators.Not((bool?)(aa_ is null)); @@ -1707,7 +1707,7 @@ IEnumerable> d_(CqlInterval TotalHip) CqlInterval ah_ = context.Operators.Interval(InitialHipAssessmentOblique, ag_, true, true); bool? ai_ = ah_?.highClosed; CqlInterval aj_ = context.Operators.Interval(v_, aa_, ae_, ai_); - bool? ak_ = context.Operators.In(q_, aj_, null); + bool? ak_ = context.Operators.In(q_, aj_, "day"); bool? al_ = context.Operators.Not((bool?)(InitialHipAssessmentOblique is null)); bool? am_ = context.Operators.And(ak_, al_); @@ -1736,7 +1736,7 @@ IEnumerable> f_(CqlInterval TotalHip) CqlQuantity ba_ = context.Operators.Quantity(425m, "days"); CqlDate bb_ = context.Operators.Add(az_, ba_); CqlInterval bc_ = context.Operators.Interval(ax_, bb_, true, true); - bool? bd_ = context.Operators.In(at_, bc_, null); + bool? bd_ = context.Operators.In(at_, bc_, "day"); return bd_; }; @@ -1785,7 +1785,7 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val CqlInterval v_ = QICoreCommon_2_0_000.toInterval(u_); CqlDateTime w_ = context.Operators.Start(v_); CqlDate x_ = context.Operators.DateFrom(w_); - bool? y_ = context.Operators.SameAs(s_, x_, null); + bool? y_ = context.Operators.SameAs(s_, x_, "day"); DataType z_ = tuple_gadrfkrahuugjcvhwqwrujhrh?.VR12MentalAssessment?.Value; object aa_ = FHIRHelpers_4_3_000.ToValue(z_); bool? ab_ = context.Operators.Not((bool?)(aa_ is null)); @@ -1861,7 +1861,7 @@ IEnumerable> d_(CqlInterval TotalHip) CqlInterval ah_ = context.Operators.Interval(InitialHipAssessmentOrthogonal, ag_, true, true); bool? ai_ = ah_?.highClosed; CqlInterval aj_ = context.Operators.Interval(v_, aa_, ae_, ai_); - bool? ak_ = context.Operators.In(q_, aj_, null); + bool? ak_ = context.Operators.In(q_, aj_, "day"); bool? al_ = context.Operators.Not((bool?)(InitialHipAssessmentOrthogonal is null)); bool? am_ = context.Operators.And(ak_, al_); @@ -1890,7 +1890,7 @@ IEnumerable> f_(CqlInterval TotalHip) CqlQuantity ba_ = context.Operators.Quantity(425m, "days"); CqlDate bb_ = context.Operators.Add(az_, ba_); CqlInterval bc_ = context.Operators.Interval(ax_, bb_, true, true); - bool? bd_ = context.Operators.In(at_, bc_, null); + bool? bd_ = context.Operators.In(at_, bc_, "day"); return bd_; }; 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 e1c0ed4e1..97027e87c 100644 --- a/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/FunctionalStatusAssessmentsforHeartFailureFHIR-0.1.000.g.cs @@ -564,7 +564,7 @@ private IEnumerable Qualifying_Encounters_Value() Period m_ = ValidEncounter?.Period; CqlInterval n_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval o_ = QICoreCommon_2_0_000.ToInterval((n_ as object)); - bool? p_ = context.Operators.IntervalIncludesInterval(l_, o_, null); + bool? p_ = context.Operators.IntervalIncludesInterval(l_, o_, "day"); return p_; }; @@ -600,7 +600,7 @@ private IEnumerable Two_Outpatient_Encounters_during_Measurement_Peri CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(1m, "day"); CqlDateTime t_ = context.Operators.Add(r_, s_); - bool? u_ = context.Operators.SameOrAfter(n_, t_, null); + bool? u_ = context.Operators.SameOrAfter(n_, t_, "day"); return u_; }; @@ -625,7 +625,7 @@ public IEnumerable Two_Outpatient_Encounters_during_Measurement_Perio CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + 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_, null); @@ -717,7 +717,7 @@ private IEnumerable Date_PROMIS10_Total_Assessment_Completed_Value() CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_ddtaodcfiesjbggrllzpybgqb?.PROMIS10MentalScore?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -781,7 +781,7 @@ public IEnumerable Date_PROMIS10_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_dzhwgxhmbfavmzfaszbeksohj?.InitialPROMIS10Date); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -792,7 +792,7 @@ public IEnumerable Date_PROMIS10_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -807,7 +807,7 @@ public IEnumerable Date_PROMIS10_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -875,7 +875,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval ar_ = QICoreCommon_2_0_000.ToInterval(aq_); CqlDateTime as_ = context.Operators.Start(ar_); CqlDate at_ = context.Operators.DateFrom(as_); - bool? au_ = context.Operators.SameAs(ao_, at_, null); + bool? au_ = context.Operators.SameAs(ao_, at_, "day"); DataType av_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29SocialRoles?.Value; object aw_ = FHIRHelpers_4_3_000.ToValue(av_); bool? ax_ = context.Operators.Not((bool?)(aw_ is null)); @@ -889,7 +889,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval bg_ = QICoreCommon_2_0_000.ToInterval(bf_); CqlDateTime bh_ = context.Operators.Start(bg_); CqlDate bi_ = context.Operators.DateFrom(bh_); - bool? bj_ = context.Operators.SameAs(bd_, bi_, null); + bool? bj_ = context.Operators.SameAs(bd_, bi_, "day"); bool? bk_ = context.Operators.And(ay_, bj_); DataType bl_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29Physical?.Value; object bm_ = FHIRHelpers_4_3_000.ToValue(bl_); @@ -904,7 +904,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval bw_ = QICoreCommon_2_0_000.ToInterval(bv_); CqlDateTime bx_ = context.Operators.Start(bw_); CqlDate by_ = context.Operators.DateFrom(bx_); - bool? bz_ = context.Operators.SameAs(bt_, by_, null); + bool? bz_ = context.Operators.SameAs(bt_, by_, "day"); bool? ca_ = context.Operators.And(bo_, bz_); DataType cb_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29Pain?.Value; object cc_ = FHIRHelpers_4_3_000.ToValue(cb_); @@ -919,7 +919,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval cm_ = QICoreCommon_2_0_000.ToInterval(cl_); CqlDateTime cn_ = context.Operators.Start(cm_); CqlDate co_ = context.Operators.DateFrom(cn_); - bool? cp_ = context.Operators.SameAs(cj_, co_, null); + bool? cp_ = context.Operators.SameAs(cj_, co_, "day"); bool? cq_ = context.Operators.And(ce_, cp_); DataType cr_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29Fatigue?.Value; object cs_ = FHIRHelpers_4_3_000.ToValue(cr_); @@ -934,7 +934,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval dc_ = QICoreCommon_2_0_000.ToInterval(db_); CqlDateTime dd_ = context.Operators.Start(dc_); CqlDate de_ = context.Operators.DateFrom(dd_); - bool? df_ = context.Operators.SameAs(cz_, de_, null); + bool? df_ = context.Operators.SameAs(cz_, de_, "day"); bool? dg_ = context.Operators.And(cu_, df_); DataType dh_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29Depression?.Value; object di_ = FHIRHelpers_4_3_000.ToValue(dh_); @@ -949,7 +949,7 @@ private IEnumerable Date_PROMIS29_Total_Assessment_Completed_Value() CqlInterval ds_ = QICoreCommon_2_0_000.ToInterval(dr_); CqlDateTime dt_ = context.Operators.Start(ds_); CqlDate du_ = context.Operators.DateFrom(dt_); - bool? dv_ = context.Operators.SameAs(dp_, du_, null); + bool? dv_ = context.Operators.SameAs(dp_, du_, "day"); bool? dw_ = context.Operators.And(dk_, dv_); DataType dx_ = tuple_cbgpsarvwrsewlglehinjanim?.Promis29Anxiety?.Value; object dy_ = FHIRHelpers_4_3_000.ToValue(dx_); @@ -1044,7 +1044,7 @@ public IEnumerable Date_PROMIS29_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_kmpntxjuhkpbcwgftqigieao?.InitialPROMIS29Date); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1055,7 +1055,7 @@ public IEnumerable Date_PROMIS29_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1070,7 +1070,7 @@ public IEnumerable Date_PROMIS29_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1118,7 +1118,7 @@ private IEnumerable Date_VR12_Oblique_Total_Assessment_Completed_Value( CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_gadrfkrahuugjcvhwqwrujhrh?.VR12MentalAssessment?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1182,7 +1182,7 @@ public IEnumerable Date_VR12_Oblique_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_fppktdiagiekhptnsbacpswh?.InitialVR12ObliqueDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1193,7 +1193,7 @@ public IEnumerable Date_VR12_Oblique_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1208,7 +1208,7 @@ public IEnumerable Date_VR12_Oblique_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1256,7 +1256,7 @@ private IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed_Val CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_gadrfkrahuugjcvhwqwrujhrh?.VR12MentalAssessment?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1320,7 +1320,7 @@ public IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_fansvmjaedmvsdoyrozxdlsai?.InitialVR12OrthogonalDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1331,7 +1331,7 @@ public IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1346,7 +1346,7 @@ public IEnumerable Date_VR12_Orthogonal_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1394,7 +1394,7 @@ private IEnumerable Date_VR36_Oblique_Total_Assessment_Completed_Value( CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_ducftclcqewdggqdfcwthfauk?.VR36MentalAssessment?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1458,7 +1458,7 @@ public IEnumerable Date_VR36_Oblique_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_elxicyhrdpyzpqyjphdifbiga?.InitialVR36ObliqueDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1469,7 +1469,7 @@ public IEnumerable Date_VR36_Oblique_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1484,7 +1484,7 @@ public IEnumerable Date_VR36_Oblique_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1532,7 +1532,7 @@ private IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed_Val CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_ducftclcqewdggqdfcwthfauk?.VR36MentalAssessment?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1596,7 +1596,7 @@ public IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_fucqujadjizabihdffformht?.InitialVR36OrthogonalDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1607,7 +1607,7 @@ public IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1622,7 +1622,7 @@ public IEnumerable Date_VR36_Orthogonal_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1670,7 +1670,7 @@ private IEnumerable Date_MLHFQ_Total_Assessment_Completed_Value() CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_fnofxckadaeusjerhbdqfoshe?.MLHFQPhysical?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1734,7 +1734,7 @@ public IEnumerable Date_MLHFQ_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_ncdawctnmbfmtibmihsfbaig?.InitialMLHFQDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1745,7 +1745,7 @@ public IEnumerable Date_MLHFQ_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1760,7 +1760,7 @@ public IEnumerable Date_MLHFQ_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1808,7 +1808,7 @@ private IEnumerable Date_KCCQ12_Total_Assessment_Completed_Value() CqlInterval x_ = QICoreCommon_2_0_000.ToInterval(w_); CqlDateTime y_ = context.Operators.Start(x_); CqlDate z_ = context.Operators.DateFrom(y_); - bool? aa_ = context.Operators.SameAs(u_, z_, null); + bool? aa_ = context.Operators.SameAs(u_, z_, "day"); DataType ab_ = tuple_dfkxorghhyafccusbqamfntdj?.KCCQ12Item?.Value; object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); bool? ad_ = context.Operators.Not((bool?)(ac_ is null)); @@ -1872,7 +1872,7 @@ public IEnumerable Date_KCCQ12_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_eoahgtwwdfqijhcjzqnvidvuo?.InitialKCCQ12Date); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -1883,7 +1883,7 @@ public IEnumerable Date_KCCQ12_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -1898,7 +1898,7 @@ public IEnumerable Date_KCCQ12_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -1962,7 +1962,7 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() CqlInterval an_ = QICoreCommon_2_0_000.ToInterval(am_); CqlDateTime ao_ = context.Operators.Start(an_); CqlDate ap_ = context.Operators.DateFrom(ao_); - bool? aq_ = context.Operators.SameAs(ak_, ap_, null); + bool? aq_ = context.Operators.SameAs(ak_, ap_, "day"); DataType ar_ = tuple_etfcawdpmcqfbnayqdmdqqsdn?.KCCQSymptomStability?.Value; object as_ = FHIRHelpers_4_3_000.ToValue(ar_); bool? at_ = context.Operators.Not((bool?)(as_ is null)); @@ -1976,7 +1976,7 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() CqlInterval bc_ = QICoreCommon_2_0_000.ToInterval(bb_); CqlDateTime bd_ = context.Operators.Start(bc_); CqlDate be_ = context.Operators.DateFrom(bd_); - bool? bf_ = context.Operators.SameAs(az_, be_, null); + bool? bf_ = context.Operators.SameAs(az_, be_, "day"); bool? bg_ = context.Operators.And(au_, bf_); DataType bh_ = tuple_etfcawdpmcqfbnayqdmdqqsdn?.KCCQSelfEfficacy?.Value; object bi_ = FHIRHelpers_4_3_000.ToValue(bh_); @@ -1991,7 +1991,7 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() CqlInterval bs_ = QICoreCommon_2_0_000.ToInterval(br_); CqlDateTime bt_ = context.Operators.Start(bs_); CqlDate bu_ = context.Operators.DateFrom(bt_); - bool? bv_ = context.Operators.SameAs(bp_, bu_, null); + bool? bv_ = context.Operators.SameAs(bp_, bu_, "day"); bool? bw_ = context.Operators.And(bk_, bv_); DataType bx_ = tuple_etfcawdpmcqfbnayqdmdqqsdn?.KCCQSymptoms?.Value; object by_ = FHIRHelpers_4_3_000.ToValue(bx_); @@ -2006,7 +2006,7 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() CqlInterval ci_ = QICoreCommon_2_0_000.ToInterval(ch_); CqlDateTime cj_ = context.Operators.Start(ci_); CqlDate ck_ = context.Operators.DateFrom(cj_); - bool? cl_ = context.Operators.SameAs(cf_, ck_, null); + bool? cl_ = context.Operators.SameAs(cf_, ck_, "day"); bool? cm_ = context.Operators.And(ca_, cl_); DataType cn_ = tuple_etfcawdpmcqfbnayqdmdqqsdn?.KCCQPhysicalLimits?.Value; object co_ = FHIRHelpers_4_3_000.ToValue(cn_); @@ -2021,7 +2021,7 @@ private IEnumerable Date_KCCQ_Domain_Assessment_Completed_Value() CqlInterval cy_ = QICoreCommon_2_0_000.ToInterval(cx_); CqlDateTime cz_ = context.Operators.Start(cy_); CqlDate da_ = context.Operators.DateFrom(cz_); - bool? db_ = context.Operators.SameAs(cv_, da_, null); + bool? db_ = context.Operators.SameAs(cv_, da_, "day"); bool? dc_ = context.Operators.And(cq_, db_); DataType dd_ = tuple_etfcawdpmcqfbnayqdmdqqsdn?.KCCQSocialLimits?.Value; object de_ = FHIRHelpers_4_3_000.ToValue(dd_); @@ -2110,7 +2110,7 @@ public IEnumerable Date_KCCQ_Domain_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_hrluhbcfcsvnvrrnjajahdcea?.InitialKCCQAssessmentDate); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -2121,7 +2121,7 @@ public IEnumerable Date_KCCQ_Domain_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -2136,7 +2136,7 @@ public IEnumerable Date_KCCQ_Domain_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; @@ -2214,7 +2214,7 @@ public IEnumerable Date_KCCQ_Total_Assessment_Completed() => CqlDateTime r_ = context.Operators.End(q_); CqlQuantity s_ = context.Operators.Quantity(180m, "days"); CqlDateTime t_ = context.Operators.Subtract(r_, s_); - bool? u_ = context.Operators.SameOrBefore(p_, t_, null); + bool? u_ = context.Operators.SameOrBefore(p_, t_, "day"); CqlDateTime v_ = context.Operators.ConvertDateToDateTime(tuple_dgrojeekdvizsvyisepdjhjgj?.InitialKCCQTotalScore); CqlInterval x_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval y_ = QICoreCommon_2_0_000.ToInterval((x_ as object)); @@ -2225,7 +2225,7 @@ public IEnumerable Date_KCCQ_Total_Assessment_Completed() => CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval((ad_ as object)); CqlDateTime af_ = context.Operators.End(ae_); CqlInterval ag_ = context.Operators.Interval(ab_, af_, true, true); - bool? ah_ = context.Operators.In(v_, ag_, null); + bool? ah_ = context.Operators.In(v_, ag_, "day"); CqlInterval aj_ = FHIRHelpers_4_3_000.ToInterval(m_); CqlInterval ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object)); CqlDateTime al_ = context.Operators.End(ak_); @@ -2240,7 +2240,7 @@ public IEnumerable Date_KCCQ_Total_Assessment_Completed() => CqlDate aw_ = context.Operators.DateFrom(v_); CqlDate ay_ = context.Operators.Add(aw_, s_); CqlInterval az_ = context.Operators.Interval(au_, ay_, true, true); - bool? ba_ = context.Operators.In(aq_, az_, null); + bool? ba_ = context.Operators.In(aq_, az_, "day"); bool? bb_ = context.Operators.And(ao_, ba_); return bb_; 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 8195e1c08..d252a661d 100644 --- a/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/GlobalMalnutritionCompositeFHIR-0.1.000.g.cs @@ -365,7 +365,7 @@ private IEnumerable Qualifying_Encounter_Value() CqlInterval f_ = FHIRHelpers_4_3_000.ToInterval(e_); CqlDateTime g_ = context.Operators.End(f_); CqlInterval h_ = this.Measurement_Period(); - bool? i_ = context.Operators.In(g_, h_, null); + bool? i_ = context.Operators.In(g_, h_, "day"); Patient j_ = this.Patient(); Date k_ = j_?.BirthDateElement; string l_ = k_?.Value; @@ -373,14 +373,14 @@ private IEnumerable Qualifying_Encounter_Value() CqlInterval o_ = FHIRHelpers_4_3_000.ToInterval(e_); CqlDateTime p_ = context.Operators.Start(o_); CqlDate q_ = context.Operators.DateFrom(p_); - int? r_ = context.Operators.CalculateAgeAt(m_, q_, null); + int? r_ = context.Operators.CalculateAgeAt(m_, q_, "year"); bool? s_ = context.Operators.GreaterOrEqual(r_, 65); bool? t_ = context.Operators.And(i_, s_); CqlInterval v_ = FHIRHelpers_4_3_000.ToInterval(e_); CqlDateTime w_ = context.Operators.Start(v_); CqlInterval y_ = FHIRHelpers_4_3_000.ToInterval(e_); CqlDateTime z_ = context.Operators.End(y_); - int? aa_ = context.Operators.DurationBetween(w_, z_, null); + int? aa_ = context.Operators.DurationBetween(w_, z_, "hour"); bool? ab_ = context.Operators.GreaterOrEqual(aa_, 24); bool? ac_ = context.Operators.And(t_, ab_); Code ad_ = EncounterInpatient?.StatusElement; 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 161b349d0..ab77ab195 100644 --- a/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HFBetaBlockerTherapyforLVSDFHIR-1.3.000.g.cs @@ -290,7 +290,7 @@ public Patient Patient() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); IEnumerable j_ = AHAOverall_2_6_000.Qualifying_Outpatient_Encounter_During_Measurement_Period(); int? k_ = context.Operators.Count(j_); 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 9db50998b..36c133af8 100644 --- a/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVRetentionFHIR-0.1.000.g.cs @@ -593,7 +593,7 @@ public CqlCode SDE_Sex() => CqlInterval ap_ = context.Operators.Interval(ak_, ao_, true, true); Period aq_ = QualifyingEncounter?.Period; CqlInterval ar_ = FHIRHelpers_4_3_000.ToInterval(aq_); - bool? as_ = context.Operators.IntervalIncludesInterval(ap_, ar_, null); + bool? as_ = context.Operators.IntervalIncludesInterval(ap_, ar_, "day"); return as_; }; @@ -699,7 +699,7 @@ bool az_() } }; CqlInterval au_ = FHIRHelpers_4_3_000.ToInterval(ap_); - bool? av_ = context.Operators.SameOrBefore(as_(), au_, null); + bool? av_ = context.Operators.SameOrBefore(as_(), au_, "day"); bool? aw_ = context.Operators.And(ar_, av_); bool? ax_ = QICoreCommon_2_0_000.isActive(HIVDiagnosis); bool? ay_ = context.Operators.And(aw_, ax_); @@ -732,7 +732,7 @@ public IEnumerable Encounter_During_Measurement_Period_With_HIV() => DataType g_ = ViralLoadTest?.Effective; object h_ = FHIRHelpers_4_3_000.ToValue(g_); CqlInterval i_ = QICoreCommon_2_0_000.ToInterval(h_); - bool? j_ = context.Operators.IntervalIncludesInterval(f_, i_, null); + bool? j_ = context.Operators.IntervalIncludesInterval(f_, i_, "day"); return j_; }; @@ -768,14 +768,14 @@ IEnumerable b_(Encounter EncounterWithHIV) CqlDateTime v_ = context.Operators.End(u_); CqlQuantity w_ = context.Operators.Quantity(90m, "days"); CqlDateTime x_ = context.Operators.Add(v_, w_); - bool? y_ = context.Operators.SameOrAfter(s_, x_, null); + bool? y_ = context.Operators.SameOrAfter(s_, x_, "day"); CqlInterval aa_ = FHIRHelpers_4_3_000.ToInterval(t_); CqlDateTime ab_ = context.Operators.Start(aa_); object ad_ = FHIRHelpers_4_3_000.ToValue(l_); CqlInterval ae_ = QICoreCommon_2_0_000.ToInterval(ad_); CqlDateTime af_ = context.Operators.End(ae_); CqlDateTime ah_ = context.Operators.Add(af_, w_); - bool? ai_ = context.Operators.SameOrAfter(ab_, ah_, null); + bool? ai_ = context.Operators.SameOrAfter(ab_, ah_, "day"); bool? aj_ = context.Operators.Or(y_, ai_); bool? ak_ = context.Operators.And(o_, aj_); @@ -816,7 +816,7 @@ IEnumerable b_(Encounter EncounterWithHIV) CqlDateTime q_ = context.Operators.End(p_); CqlQuantity r_ = context.Operators.Quantity(90m, "days"); CqlDateTime s_ = context.Operators.Add(q_, r_); - bool? t_ = context.Operators.SameOrAfter(n_, s_, null); + bool? t_ = context.Operators.SameOrAfter(n_, s_, "day"); bool? u_ = context.Operators.And(k_, t_); return u_; 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 f3b096044..4c6ebf6fc 100644 --- a/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HIVViralSuppressionFHIR-0.1.000.g.cs @@ -291,7 +291,7 @@ public Patient Patient() => CqlDateTime i_ = context.Operators.Start(h_); CqlQuantity j_ = context.Operators.Quantity(90m, "days"); CqlDateTime k_ = context.Operators.Add(i_, j_); - bool? l_ = context.Operators.Before(g_, k_, null); + bool? l_ = context.Operators.Before(g_, k_, "day"); return l_; }; @@ -349,7 +349,7 @@ public Patient Patient() => CqlInterval ap_ = context.Operators.Interval(ak_, ao_, true, true); Period aq_ = QualifyingEncounter?.Period; CqlInterval ar_ = FHIRHelpers_4_3_000.ToInterval(aq_); - bool? as_ = context.Operators.IntervalIncludesInterval(ap_, ar_, null); + bool? as_ = context.Operators.IntervalIncludesInterval(ap_, ar_, "day"); return as_; }; @@ -491,7 +491,7 @@ bool n_() }; CqlDateTime i_ = QICoreCommon_2_0_000.Latest(h_()); CqlInterval j_ = this.Measurement_Period(); - bool? k_ = context.Operators.In(i_, j_, null); + bool? k_ = context.Operators.In(i_, j_, "day"); return k_; }; 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 f3fc15e84..0957a98ce 100644 --- a/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/Hospice-6.9.000.g.cs @@ -203,7 +203,7 @@ public Patient Patient() => CqlInterval be_ = QICoreCommon_2_0_000.toInterval((bd_ as object)); CqlDateTime bf_ = context.Operators.End(be_); CqlInterval bg_ = this.Measurement_Period(); - bool? bh_ = context.Operators.In(bf_, bg_, null); + bool? bh_ = context.Operators.In(bf_, bg_, "day"); bool? bi_ = context.Operators.And(bb_, bh_); return bi_; @@ -219,7 +219,7 @@ public Patient Patient() => CqlInterval bk_ = FHIRHelpers_4_3_000.ToInterval(bj_); CqlInterval bl_ = QICoreCommon_2_0_000.toInterval((bk_ as object)); CqlInterval bm_ = this.Measurement_Period(); - bool? bn_ = context.Operators.Overlaps(bl_, bm_, null); + bool? bn_ = context.Operators.Overlaps(bl_, bm_, "day"); return bn_; }; @@ -241,7 +241,7 @@ public Patient Patient() => object bu_ = FHIRHelpers_4_3_000.ToValue(bt_); CqlInterval bv_ = QICoreCommon_2_0_000.toInterval(bu_); CqlInterval bw_ = this.Measurement_Period(); - bool? bx_ = context.Operators.Overlaps(bv_, bw_, null); + bool? bx_ = context.Operators.Overlaps(bv_, bw_, "day"); bool? by_ = context.Operators.And(bs_, bx_); return by_; @@ -258,7 +258,7 @@ public Patient Patient() => FhirDateTime ca_ = HospiceOrder?.AuthoredOnElement; CqlDateTime cb_ = context.Operators.Convert(ca_); CqlInterval cc_ = QICoreCommon_2_0_000.toInterval((cb_ as object)); - bool? cd_ = context.Operators.IntervalIncludesInterval(bz_, cc_, null); + bool? cd_ = context.Operators.IntervalIncludesInterval(bz_, cc_, "day"); return cd_; }; @@ -273,7 +273,7 @@ public Patient Patient() => object cf_ = FHIRHelpers_4_3_000.ToValue(ce_); CqlInterval cg_ = QICoreCommon_2_0_000.toInterval(cf_); CqlInterval ch_ = this.Measurement_Period(); - bool? ci_ = context.Operators.Overlaps(cg_, ch_, null); + bool? ci_ = context.Operators.Overlaps(cg_, ch_, "day"); return ci_; }; @@ -286,7 +286,7 @@ public Patient Patient() => { CqlInterval cj_ = QICoreCommon_2_0_000.prevalenceInterval(HospiceCareDiagnosis); CqlInterval ck_ = this.Measurement_Period(); - bool? cl_ = context.Operators.Overlaps(cj_, ck_, null); + bool? cl_ = context.Operators.Overlaps(cj_, ck_, "day"); return cl_; }; 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 11d605162..28e70d6af 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmOpioidRelatedAdverseEventsFHIR-0.1.000.g.cs @@ -217,12 +217,12 @@ private IEnumerable Qualifying_Encounter_Value() CqlInterval j_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(h_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(h_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 18); CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime q_ = context.Operators.End(p_); CqlInterval r_ = this.Measurement_Period(); - bool? s_ = context.Operators.In(q_, r_, null); + bool? s_ = context.Operators.In(q_, r_, "day"); bool? t_ = context.Operators.And(n_, s_); Code u_ = InpatientEncounter?.StatusElement; Encounter.EncounterStatus? v_ = u_?.Value; 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 3e4ea9ee2..096f7d306 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmPressureInjuryFHIR-0.1.000.g.cs @@ -253,12 +253,12 @@ private IEnumerable Encounter_with_Age_18_and_Older_Value() CqlInterval j_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(h_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(h_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 18); CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime q_ = context.Operators.End(p_); CqlInterval r_ = this.Measurement_Period(); - bool? s_ = context.Operators.In(q_, r_, null); + bool? s_ = context.Operators.In(q_, r_, "day"); bool? t_ = context.Operators.And(n_, s_); Code u_ = InpatientEncounter?.StatusElement; Encounter.EncounterStatus? v_ = u_?.Value; 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 453862276..e724382ee 100644 --- a/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.1.000.g.cs @@ -173,12 +173,12 @@ private IEnumerable Qualifying_Encounter_Value() CqlInterval j_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime k_ = context.Operators.Start(j_); CqlDate l_ = context.Operators.DateFrom(k_); - int? m_ = context.Operators.CalculateAgeAt(h_, l_, null); + int? m_ = context.Operators.CalculateAgeAt(h_, l_, "year"); bool? n_ = context.Operators.GreaterOrEqual(m_, 18); CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(i_); CqlDateTime q_ = context.Operators.End(p_); CqlInterval r_ = this.Measurement_Period(); - bool? s_ = context.Operators.In(q_, r_, null); + bool? s_ = context.Operators.In(q_, r_, "day"); bool? t_ = context.Operators.And(n_, s_); Code u_ = InpatientEncounter?.StatusElement; Encounter.EncounterStatus? v_ = u_?.Value; 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 e57e1c423..df239ef41 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideMortalityFHIR-0.0.001.g.cs @@ -306,14 +306,14 @@ IEnumerable c_(Encounter InpatientEncounter) CqlInterval aa_ = FHIRHelpers_4_3_000.ToInterval(z_); CqlDateTime ab_ = context.Operators.Start(aa_); CqlDate ac_ = context.Operators.DateFrom(ab_); - int? ad_ = context.Operators.CalculateAgeAt(y_, ac_, null); + int? ad_ = context.Operators.CalculateAgeAt(y_, ac_, "year"); CqlInterval ae_ = context.Operators.Interval(65, 94, true, true); bool? af_ = context.Operators.In(ad_, ae_, null); bool? ag_ = context.Operators.And(u_, af_); CqlInterval ai_ = FHIRHelpers_4_3_000.ToInterval(z_); CqlDateTime aj_ = context.Operators.End(ai_); CqlInterval ak_ = this.Measurement_Period(); - bool? al_ = context.Operators.In(aj_, ak_, null); + bool? al_ = context.Operators.In(aj_, ak_, "day"); bool? am_ = context.Operators.And(ag_, al_); return am_; 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 affc2a5bf..74cce66e2 100644 --- a/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/HybridHospitalWideReadmissionFHIR-0.0.001.g.cs @@ -322,13 +322,13 @@ IEnumerable c_(Encounter InpatientEncounter) CqlInterval aa_ = FHIRHelpers_4_3_000.ToInterval(z_); CqlDateTime ab_ = context.Operators.Start(aa_); CqlDate ac_ = context.Operators.DateFrom(ab_); - int? ad_ = context.Operators.CalculateAgeAt(y_, ac_, null); + int? ad_ = context.Operators.CalculateAgeAt(y_, ac_, "year"); bool? ae_ = context.Operators.GreaterOrEqual(ad_, 65); bool? af_ = context.Operators.And(u_, ae_); CqlInterval ah_ = FHIRHelpers_4_3_000.ToInterval(z_); CqlDateTime ai_ = context.Operators.End(ah_); CqlInterval aj_ = this.Measurement_Period(); - bool? ak_ = context.Operators.In(ai_, aj_, null); + bool? ak_ = context.Operators.In(ai_, aj_, "day"); bool? al_ = context.Operators.And(af_, ak_); return al_; 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 b2a03f2ac..e40ff669f 100644 --- a/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/IntravesicalBacillusCalmetteGuerinForBladderCancerFHIR-1.3.000.g.cs @@ -456,10 +456,10 @@ IEnumerable d_(Procedure BladderCancerStaging) CqlDateTime s_ = context.Operators.Start(r_); CqlInterval t_ = QICoreCommon_2_0_000.prevalenceInterval(BladderCancer); CqlDateTime u_ = context.Operators.Start(t_); - bool? v_ = context.Operators.SameOrBefore(s_, u_, null); + bool? v_ = context.Operators.SameOrBefore(s_, u_, "day"); object x_ = FHIRHelpers_4_3_000.ToValue(p_); CqlInterval y_ = QICoreCommon_2_0_000.toInterval(x_); - bool? aa_ = context.Operators.Overlaps(y_, t_, null); + bool? aa_ = context.Operators.Overlaps(y_, t_, "day"); bool? ab_ = context.Operators.And(v_, aa_); return ab_; @@ -505,7 +505,7 @@ private CqlDateTime July_1_of_Year_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 1); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 7, 1, 0, 0, 0, 0, e_); @@ -521,7 +521,7 @@ private CqlDateTime June_30_of_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); decimal? d_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime e_ = context.Operators.DateTime(c_, 6, 30, 23, 59, 59, 0, d_); @@ -546,7 +546,7 @@ private Procedure First_Qualifying_Bladder_Cancer_Staging_Procedure_Value() DataType i_ = FirstBladderCancerStaging?.Performed; object j_ = FHIRHelpers_4_3_000.ToValue(i_); CqlInterval k_ = QICoreCommon_2_0_000.toInterval(j_); - bool? l_ = context.Operators.IntervalIncludesInterval(h_, k_, null); + bool? l_ = context.Operators.IntervalIncludesInterval(h_, k_, "day"); return l_; }; @@ -574,7 +574,7 @@ private Procedure First_Bladder_Cancer_Staging_Procedure_during_6_Months_Prior_t DataType i_ = FirstBladderCancerStaging?.Performed; object j_ = FHIRHelpers_4_3_000.ToValue(i_); CqlInterval k_ = QICoreCommon_2_0_000.toInterval(j_); - bool? l_ = context.Operators.IntervalIncludesInterval(h_, k_, null); + bool? l_ = context.Operators.IntervalIncludesInterval(h_, k_, "day"); return l_; }; 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 a1031b955..3caae45ff 100644 --- a/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/KidneyHealthEvaluationFHIR-0.1.000.g.cs @@ -424,7 +424,7 @@ public Patient Patient() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(18, 85, true, true); bool? j_ = context.Operators.In(h_, i_, null); bool? k_ = this.Has_Active_Diabetes_Overlaps_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 bde8e383b..17a031bbf 100644 --- a/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/OncologyPainIntensityQuantifiedFHIR-0.1.000.g.cs @@ -237,7 +237,7 @@ private IEnumerable Face_to_Face_or_Telehealth_Encounter_with_Ongoing CqlInterval af_ = FHIRHelpers_4_3_000.ToInterval(r_); CqlDateTime ag_ = context.Operators.End(af_); CqlInterval ah_ = context.Operators.Interval(ad_, ag_, true, true); - bool? ai_ = context.Operators.In(y_, ah_, null); + bool? ai_ = context.Operators.In(y_, ah_, "day"); CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(r_); CqlDateTime al_ = context.Operators.End(ak_); bool? am_ = context.Operators.Not((bool?)(al_ is null)); @@ -253,7 +253,7 @@ private IEnumerable Face_to_Face_or_Telehealth_Encounter_with_Ongoing CqlDateTime ay_ = context.Operators.End(ax_); CqlDateTime ba_ = context.Operators.Add(ay_, ac_); CqlInterval bb_ = context.Operators.Interval(av_, ba_, true, true); - bool? bc_ = context.Operators.In(as_, bb_, null); + bool? bc_ = context.Operators.In(as_, bb_, "day"); CqlInterval be_ = FHIRHelpers_4_3_000.ToInterval(r_); CqlDateTime bf_ = context.Operators.End(be_); bool? bg_ = context.Operators.Not((bool?)(bf_ is null)); @@ -263,7 +263,7 @@ private IEnumerable Face_to_Face_or_Telehealth_Encounter_with_Ongoing CqlInterval bl_ = QICoreCommon_2_0_000.toInterval(bk_); object bn_ = FHIRHelpers_4_3_000.ToValue(v_); CqlInterval bo_ = QICoreCommon_2_0_000.toInterval(bn_); - bool? bp_ = context.Operators.SameAs(bl_, bo_, null); + bool? bp_ = context.Operators.SameAs(bl_, bo_, "day"); bool? bq_ = context.Operators.Not(bp_); bool? br_ = context.Operators.And(bi_, bq_); CqlInterval bs_ = this.Measurement_Period(); @@ -460,7 +460,7 @@ CqlConcept v_(CodeableConcept @this) CqlInterval ao_ = FHIRHelpers_4_3_000.ToInterval(ai_); CqlDateTime ap_ = context.Operators.Start(ao_); CqlInterval aq_ = context.Operators.Interval(am_, ap_, true, true); - bool? ar_ = context.Operators.In(ah_, aq_, null); + bool? ar_ = context.Operators.In(ah_, aq_, "day"); CqlInterval at_ = FHIRHelpers_4_3_000.ToInterval(ai_); CqlDateTime au_ = context.Operators.Start(at_); bool? av_ = context.Operators.Not((bool?)(au_ is null)); @@ -475,7 +475,7 @@ CqlConcept v_(CodeableConcept @this) DataType az_ = PainAssessed?.Effective; object ba_ = FHIRHelpers_4_3_000.ToValue(az_); CqlInterval bb_ = QICoreCommon_2_0_000.toInterval(ba_); - bool? bc_ = context.Operators.IntervalIncludesInterval(ay_, bb_, null); + bool? bc_ = context.Operators.IntervalIncludesInterval(ay_, bb_, "day"); return bc_; } 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 fa27f19d5..81a1ebe24 100644 --- a/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCMaternal-5.16.000.g.cs @@ -172,7 +172,7 @@ private IEnumerable Encounter_with_Age_Range_Value() CqlInterval i_ = FHIRHelpers_4_3_000.ToInterval(h_); CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); - int? l_ = context.Operators.CalculateAgeAt(g_, k_, null); + int? l_ = context.Operators.CalculateAgeAt(g_, k_, "year"); CqlInterval m_ = context.Operators.Interval(8, 65, true, false); bool? n_ = context.Operators.In(l_, m_, null); @@ -766,7 +766,7 @@ bool bc_() { CqlDateTime a_ = this.lastTimeOfDelivery(TheEncounter); CqlDateTime b_ = this.lastEstimatedDeliveryDate(TheEncounter); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); int? d_ = context.Operators.Subtract(280, c_); int? e_ = context.Operators.TruncatedDivide(d_, 7); @@ -929,7 +929,7 @@ bool bn_() } }; CqlDateTime ag_ = QICoreCommon_2_0_000.earliest(af_()); - bool? ai_ = context.Operators.SameAs(ag_, l_, null); + bool? ai_ = context.Operators.SameAs(ag_, l_, "day"); object aj_() { bool cd_() 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 13d25a210..ad6e3b119 100644 --- a/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PCSBPScreeningFollowUpFHIR-0.2.000.g.cs @@ -398,7 +398,7 @@ private IEnumerable Qualifying_Encounter_during_Measurement_Period_Va CqlInterval e_ = this.Measurement_Period(); Period f_ = ValidEncounter?.Period; CqlInterval g_ = FHIRHelpers_4_3_000.ToInterval(f_); - bool? h_ = context.Operators.IntervalIncludesInterval(e_, g_, null); + bool? h_ = context.Operators.IntervalIncludesInterval(e_, g_, "day"); Code i_ = ValidEncounter?.StatusElement; Encounter.EncounterStatus? j_ = i_?.Value; Code k_ = context.Operators.Convert>(j_); @@ -433,7 +433,7 @@ private IEnumerable Initial_Population_Value() CqlDateTime g_ = context.Operators.ConvertStringToDateTime(f_); CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.Start(h_); - int? j_ = context.Operators.CalculateAgeAt(g_, i_, null); + int? j_ = context.Operators.CalculateAgeAt(g_, i_, "year"); bool? k_ = context.Operators.GreaterOrEqual(j_, 18); return k_; @@ -497,7 +497,7 @@ bool t_() }; Period p_ = QualifyingEncounter?.Period; CqlInterval q_ = FHIRHelpers_4_3_000.ToInterval(p_); - bool? r_ = context.Operators.SameOrBefore(o_(), q_, null); + bool? r_ = context.Operators.SameOrBefore(o_(), q_, "day"); bool? s_ = context.Operators.And(n_, r_); return s_; @@ -901,7 +901,7 @@ IEnumerable b_(Encounter ElevatedEncounter) CqlDateTime p_ = context.Operators.Convert(o_); Period q_ = ElevatedEncounter?.Period; CqlInterval r_ = FHIRHelpers_4_3_000.ToInterval(q_); - bool? s_ = context.Operators.In(p_, r_, null); + bool? s_ = context.Operators.In(p_, r_, "day"); return s_; }; @@ -922,7 +922,7 @@ IEnumerable d_(Encounter ElevatedEncounter) CqlDateTime z_ = context.Operators.Convert(y_); Period aa_ = ElevatedEncounter?.Period; CqlInterval ab_ = FHIRHelpers_4_3_000.ToInterval(aa_); - bool? ac_ = context.Operators.In(z_, ab_, null); + bool? ac_ = context.Operators.In(z_, ab_, "day"); return ac_; }; @@ -943,7 +943,7 @@ IEnumerable g_(Encounter ElevatedEncounter) CqlDateTime aj_ = context.Operators.Convert(ai_); Period ak_ = ElevatedEncounter?.Period; CqlInterval al_ = FHIRHelpers_4_3_000.ToInterval(ak_); - bool? am_ = context.Operators.In(aj_, al_, null); + bool? am_ = context.Operators.In(aj_, al_, "day"); return am_; }; @@ -1270,7 +1270,7 @@ private IEnumerable Encounter_with_First_Hypertensive_Reading_SBP_Gre CqlDateTime bp_ = context.Operators.End(bo_); Period bq_ = QualifyingEncounter?.Period; CqlInterval br_ = FHIRHelpers_4_3_000.ToInterval(bq_); - bool? bs_ = context.Operators.In(bp_, br_, null); + bool? bs_ = context.Operators.In(bp_, br_, "day"); return bs_; }; @@ -1318,7 +1318,7 @@ object i_(Observation @this) CqlDateTime cn_ = context.Operators.End(cm_); Period co_ = QualifyingEncounter?.Period; CqlInterval cp_ = FHIRHelpers_4_3_000.ToInterval(co_); - bool? cq_ = context.Operators.In(cn_, cp_, null); + bool? cq_ = context.Operators.In(cn_, cp_, "day"); return cq_; }; @@ -1366,7 +1366,7 @@ object w_(Observation @this) CqlDateTime dl_ = context.Operators.End(dk_); Period dm_ = QualifyingEncounter?.Period; CqlInterval dn_ = FHIRHelpers_4_3_000.ToInterval(dm_); - bool? do_ = context.Operators.In(dl_, dn_, null); + bool? do_ = context.Operators.In(dl_, dn_, "day"); return do_; }; @@ -1414,7 +1414,7 @@ object al_(Observation @this) CqlDateTime ej_ = context.Operators.End(ei_); Period ek_ = QualifyingEncounter?.Period; CqlInterval el_ = FHIRHelpers_4_3_000.ToInterval(ek_); - bool? em_ = context.Operators.In(ej_, el_, null); + bool? em_ = context.Operators.In(ej_, el_, "day"); return em_; }; @@ -1482,10 +1482,10 @@ IEnumerable c_(ServiceRequest FourWeekRescreen) FhirDateTime l_ = FourWeekRescreen?.AuthoredOnElement; CqlDateTime m_ = context.Operators.Convert(l_); CqlInterval n_ = this.Measurement_Period(); - bool? o_ = context.Operators.In(m_, n_, null); + bool? o_ = context.Operators.In(m_, n_, "day"); FhirDateTime p_ = NonPharmInterventionsHTN?.AuthoredOnElement; CqlDateTime q_ = context.Operators.Convert(p_); - bool? s_ = context.Operators.In(q_, n_, null); + bool? s_ = context.Operators.In(q_, n_, "day"); bool? t_ = context.Operators.And(o_, s_); Code u_ = FourWeekRescreen?.IntentElement; RequestIntent? v_ = u_?.Value; @@ -1525,7 +1525,7 @@ IEnumerable b_(Encounter FirstHTNEncounter) CqlDateTime j_ = context.Operators.Convert(i_); Period k_ = FirstHTNEncounter?.Period; CqlInterval l_ = FHIRHelpers_4_3_000.ToInterval(k_); - bool? m_ = context.Operators.In(j_, l_, null); + bool? m_ = context.Operators.In(j_, l_, "day"); return m_; }; @@ -1559,7 +1559,7 @@ private IEnumerable Encounter_with_Second_Hypertensive_Reading_SBP_13 CqlDateTime bv_ = context.Operators.End(bu_); Period bw_ = QualifyingEncounter?.Period; CqlInterval bx_ = FHIRHelpers_4_3_000.ToInterval(bw_); - bool? by_ = context.Operators.In(bv_, bx_, null); + bool? by_ = context.Operators.In(bv_, bx_, "day"); Code bz_ = BloodPressure?.StatusElement; ObservationStatus? ca_ = bz_?.Value; string cb_ = context.Operators.Convert(ca_); @@ -1619,7 +1619,7 @@ object g_(Observation @this) CqlDateTime cz_ = context.Operators.End(cy_); Period da_ = QualifyingEncounter?.Period; CqlInterval db_ = FHIRHelpers_4_3_000.ToInterval(da_); - bool? dc_ = context.Operators.In(cz_, db_, null); + bool? dc_ = context.Operators.In(cz_, db_, "day"); Code dd_ = BloodPressure?.StatusElement; ObservationStatus? de_ = dd_?.Value; string df_ = context.Operators.Convert(de_); @@ -1680,7 +1680,7 @@ object w_(Observation @this) CqlDateTime ed_ = context.Operators.End(ec_); Period ee_ = QualifyingEncounter?.Period; CqlInterval ef_ = FHIRHelpers_4_3_000.ToInterval(ee_); - bool? eg_ = context.Operators.In(ed_, ef_, null); + bool? eg_ = context.Operators.In(ed_, ef_, "day"); Code eh_ = BloodPressure?.StatusElement; ObservationStatus? ei_ = eh_?.Value; string ej_ = context.Operators.Convert(ei_); @@ -1738,7 +1738,7 @@ object an_(Observation @this) CqlDateTime fh_ = context.Operators.End(fg_); Period fi_ = QualifyingEncounter?.Period; CqlInterval fj_ = FHIRHelpers_4_3_000.ToInterval(fi_); - bool? fk_ = context.Operators.In(fh_, fj_, null); + bool? fk_ = context.Operators.In(fh_, fj_, "day"); Code fl_ = BloodPressure?.StatusElement; ObservationStatus? fm_ = fl_?.Value; string fn_ = context.Operators.Convert(fm_); @@ -1847,10 +1847,10 @@ IEnumerable b_(ServiceRequest Rescreen2to6) FhirDateTime k_ = Rescreen2to6?.AuthoredOnElement; CqlDateTime l_ = context.Operators.Convert(k_); CqlInterval m_ = this.Measurement_Period(); - bool? n_ = context.Operators.In(l_, m_, null); + bool? n_ = context.Operators.In(l_, m_, "day"); FhirDateTime o_ = LabECGIntervention?.AuthoredOnElement; CqlDateTime p_ = context.Operators.Convert(o_); - bool? r_ = context.Operators.In(p_, m_, null); + bool? r_ = context.Operators.In(p_, m_, "day"); bool? s_ = context.Operators.And(n_, r_); return s_; @@ -1871,7 +1871,7 @@ IEnumerable d_(ServiceRequest Rescreen2to6) FhirDateTime y_ = NonPharmSecondIntervention?.AuthoredOnElement; CqlDateTime z_ = context.Operators.Convert(y_); CqlInterval aa_ = this.Measurement_Period(); - bool? ab_ = context.Operators.In(z_, aa_, null); + bool? ab_ = context.Operators.In(z_, aa_, "day"); return ab_; }; @@ -1903,7 +1903,7 @@ IEnumerable b_(Encounter SecondHTNEncounterReading) CqlDateTime n_ = context.Operators.Convert(m_); Period o_ = SecondHTNEncounterReading?.Period; CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(o_); - bool? q_ = context.Operators.In(n_, p_, null); + bool? q_ = context.Operators.In(n_, p_, "day"); return q_; }; @@ -1924,7 +1924,7 @@ IEnumerable e_(Encounter SecondHTNEncounterReading) CqlDateTime x_ = context.Operators.Convert(w_); Period y_ = SecondHTNEncounterReading?.Period; CqlInterval z_ = FHIRHelpers_4_3_000.ToInterval(y_); - bool? aa_ = context.Operators.In(x_, z_, null); + bool? aa_ = context.Operators.In(x_, z_, "day"); return aa_; }; @@ -2212,10 +2212,10 @@ IEnumerable c_(ServiceRequest WeeksRescreen) FhirDateTime n_ = WeeksRescreen?.AuthoredOnElement; CqlDateTime o_ = context.Operators.Convert(n_); CqlInterval p_ = this.Measurement_Period(); - bool? q_ = context.Operators.In(o_, p_, null); + bool? q_ = context.Operators.In(o_, p_, "day"); FhirDateTime r_ = ECGLabTest?.AuthoredOnElement; CqlDateTime s_ = context.Operators.Convert(r_); - bool? u_ = context.Operators.In(s_, p_, null); + bool? u_ = context.Operators.In(s_, p_, "day"); bool? v_ = context.Operators.And(q_, u_); Code w_ = WeeksRescreen?.IntentElement; RequestIntent? x_ = w_?.Value; @@ -2246,7 +2246,7 @@ IEnumerable e_(ServiceRequest WeeksRescreen) FhirDateTime al_ = HTNInterventions?.AuthoredOnElement; CqlDateTime am_ = context.Operators.Convert(al_); CqlInterval an_ = this.Measurement_Period(); - bool? ao_ = context.Operators.In(am_, an_, null); + bool? ao_ = context.Operators.In(am_, an_, "day"); return ao_; }; @@ -2269,7 +2269,7 @@ IEnumerable g_(ServiceRequest WeeksRescreen) FhirDateTime ay_ = Medications?.AuthoredOnElement; CqlDateTime az_ = context.Operators.Convert(ay_); CqlInterval ba_ = this.Measurement_Period(); - bool? bb_ = context.Operators.In(az_, ba_, null); + bool? bb_ = context.Operators.In(az_, ba_, "day"); Code bc_ = Medications?.StatusElement; MedicationRequest.MedicationrequestStatus? bd_ = bc_?.Value; string be_ = context.Operators.Convert(bd_); @@ -2306,7 +2306,7 @@ IEnumerable b_(Encounter SecondHTNEncounterReading140Over90) CqlDateTime n_ = context.Operators.Convert(m_); Period o_ = SecondHTNEncounterReading140Over90?.Period; CqlInterval p_ = FHIRHelpers_4_3_000.ToInterval(o_); - bool? q_ = context.Operators.In(n_, p_, null); + bool? q_ = context.Operators.In(n_, p_, "day"); return q_; }; @@ -2327,7 +2327,7 @@ IEnumerable e_(Encounter SecondHTNEncounterReading140Over90) CqlDateTime x_ = context.Operators.Convert(w_); Period y_ = SecondHTNEncounterReading140Over90?.Period; CqlInterval z_ = FHIRHelpers_4_3_000.ToInterval(y_); - bool? aa_ = context.Operators.In(x_, z_, null); + bool? aa_ = context.Operators.In(x_, z_, "day"); return aa_; }; @@ -2386,7 +2386,7 @@ IEnumerable b_(Encounter QualifyingEncounter) CqlDateTime q_ = context.Operators.Convert(p_); Period r_ = QualifyingEncounter?.Period; CqlInterval s_ = FHIRHelpers_4_3_000.ToInterval(r_); - bool? t_ = context.Operators.In(q_, s_, null); + bool? t_ = context.Operators.In(q_, s_, "day"); bool? u_(Extension @this) { string at_ = @this?.Url; @@ -2763,7 +2763,7 @@ DataType aq_(Extension @this) CqlDateTime ay_ = context.Operators.Convert(ax_); Period az_ = ElevatedBPEncounter?.Period; CqlInterval ba_ = FHIRHelpers_4_3_000.ToInterval(az_); - bool? bb_ = context.Operators.In(ay_, ba_, null); + bool? bb_ = context.Operators.In(ay_, ba_, "day"); bool? bc_ = context.Operators.And(aw_, bb_); Code bd_ = ElevatedBPDeclinedInterventions?.StatusElement; RequestStatus? be_ = bd_?.Value; @@ -2790,7 +2790,7 @@ IEnumerable e_(Encounter ElevatedBPEncounter) CqlDateTime bt_ = context.Operators.Convert(bs_); Period bu_ = ElevatedBPEncounter?.Period; CqlInterval bv_ = FHIRHelpers_4_3_000.ToInterval(bu_); - bool? bw_ = context.Operators.In(bt_, bv_, null); + bool? bw_ = context.Operators.In(bt_, bv_, "day"); return bw_; }; @@ -2845,7 +2845,7 @@ DataType co_(Extension @this) CqlDateTime cw_ = context.Operators.Convert(cv_); Period cx_ = FirstHTNEncounter?.Period; CqlInterval cy_ = FHIRHelpers_4_3_000.ToInterval(cx_); - bool? cz_ = context.Operators.In(cw_, cy_, null); + bool? cz_ = context.Operators.In(cw_, cy_, "day"); bool? da_ = context.Operators.And(cu_, cz_); Code db_ = FirstHTNDeclinedInterventions?.StatusElement; RequestStatus? dc_ = db_?.Value; @@ -2872,7 +2872,7 @@ IEnumerable l_(Encounter FirstHTNEncounter) CqlDateTime dr_ = context.Operators.Convert(dq_); Period ds_ = FirstHTNEncounter?.Period; CqlInterval dt_ = FHIRHelpers_4_3_000.ToInterval(ds_); - bool? du_ = context.Operators.In(dr_, dt_, null); + bool? du_ = context.Operators.In(dr_, dt_, "day"); return du_; }; @@ -2896,7 +2896,7 @@ IEnumerable q_(Encounter SecondHTNEncounter) CqlDateTime eb_ = context.Operators.Convert(ea_); Period ec_ = SecondHTNEncounter?.Period; CqlInterval ed_ = FHIRHelpers_4_3_000.ToInterval(ec_); - bool? ee_ = context.Operators.In(eb_, ed_, null); + bool? ee_ = context.Operators.In(eb_, ed_, "day"); return ee_; }; @@ -2918,7 +2918,7 @@ IEnumerable t_(Encounter SecondHTN140Over90Encounter) CqlDateTime el_ = context.Operators.LateBoundProperty(ek_, "value"); Period em_ = SecondHTN140Over90Encounter?.Period; CqlInterval en_ = FHIRHelpers_4_3_000.ToInterval(em_); - bool? eo_ = context.Operators.In(el_, en_, null); + bool? eo_ = context.Operators.In(el_, en_, "day"); return eo_; }; 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 ef370967a..3424e23b5 100644 --- a/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/POAGOpticNerveEvaluationFHIR-0.1.000.g.cs @@ -380,7 +380,7 @@ public IEnumerable Primary_Open_Angle_Glaucoma_Encounter() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 18); IEnumerable j_ = this.Primary_Open_Angle_Glaucoma_Encounter(); bool? k_ = context.Operators.Exists(j_); 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 3a598ece1..50732ccaf 100644 --- a/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs +++ b/Demo/Measures.CMS/CSharp/PalliativeCare-1.9.000.g.cs @@ -134,7 +134,7 @@ public Patient Patient() => object ac_ = FHIRHelpers_4_3_000.ToValue(ab_); CqlInterval ad_ = QICoreCommon_2_0_000.toInterval(ac_); CqlInterval ae_ = this.Measurement_Period(); - bool? af_ = context.Operators.Overlaps(ad_, ae_, null); + bool? af_ = context.Operators.Overlaps(ad_, ae_, "day"); return af_; }; @@ -146,7 +146,7 @@ public Patient Patient() => { CqlInterval ag_ = QICoreCommon_2_0_000.prevalenceInterval(PalliativeDiagnosis); CqlInterval ah_ = this.Measurement_Period(); - bool? ai_ = context.Operators.Overlaps(ag_, ah_, null); + bool? ai_ = context.Operators.Overlaps(ag_, ah_, "day"); return ai_; }; @@ -162,7 +162,7 @@ public Patient Patient() => CqlInterval ak_ = FHIRHelpers_4_3_000.ToInterval(aj_); CqlInterval al_ = QICoreCommon_2_0_000.toInterval((ak_ as object)); CqlInterval am_ = this.Measurement_Period(); - bool? an_ = context.Operators.Overlaps(al_, am_, null); + bool? an_ = context.Operators.Overlaps(al_, am_, "day"); return an_; }; @@ -178,7 +178,7 @@ public Patient Patient() => object ap_ = FHIRHelpers_4_3_000.ToValue(ao_); CqlInterval aq_ = QICoreCommon_2_0_000.toInterval(ap_); CqlInterval ar_ = this.Measurement_Period(); - bool? as_ = context.Operators.Overlaps(aq_, ar_, null); + bool? as_ = context.Operators.Overlaps(aq_, ar_, "day"); return as_; }; 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 052d6a4da..201f26dce 100644 --- a/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs +++ b/Demo/Measures.CMS/CSharp/PreventiveCareAndScreeningTobaccoUseScreeningAndCessationInterventionFHIR-0.0.001.g.cs @@ -525,7 +525,7 @@ CqlConcept bc_(CodeableConcept @this) Period bm_ = OfficeBasedEncounter?.Period; CqlInterval bn_ = FHIRHelpers_4_3_000.ToInterval(bm_); CqlInterval bo_ = QICoreCommon_2_0_000.toInterval((bn_ as object)); - bool? bp_ = context.Operators.IntervalIncludesInterval(bl_, bo_, null); + bool? bp_ = context.Operators.IntervalIncludesInterval(bl_, bo_, "day"); return bp_; }; @@ -615,7 +615,7 @@ CqlConcept an_(CodeableConcept @this) Period ax_ = PreventiveEncounter?.Period; CqlInterval ay_ = FHIRHelpers_4_3_000.ToInterval(ax_); CqlInterval az_ = QICoreCommon_2_0_000.toInterval((ay_ as object)); - bool? ba_ = context.Operators.IntervalIncludesInterval(aw_, az_, null); + bool? ba_ = context.Operators.IntervalIncludesInterval(aw_, az_, "day"); return ba_; }; @@ -637,7 +637,7 @@ public IEnumerable Preventive_Visit_During_Measurement_Period() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 12); IEnumerable j_ = this.Qualifying_Visit_During_Measurement_Period(); int? k_ = context.Operators.Count(j_); @@ -676,7 +676,7 @@ private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_User_Val DataType n_ = TobaccoUseScreening?.Effective; object o_ = FHIRHelpers_4_3_000.ToValue(n_); CqlInterval p_ = QICoreCommon_2_0_000.toInterval(o_); - bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, null); + bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, "day"); return q_; }; @@ -750,7 +750,7 @@ private Observation Most_Recent_Tobacco_Use_Screening_Indicates_Tobacco_Non_User DataType n_ = TobaccoUseScreening?.Effective; object o_ = FHIRHelpers_4_3_000.ToValue(n_); CqlInterval p_ = QICoreCommon_2_0_000.toInterval(o_); - bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, null); + bool? q_ = context.Operators.IntervalIncludesInterval(m_, p_, "day"); return q_; }; @@ -819,7 +819,7 @@ private IEnumerable Tobacco_Cessation_Counseling_Given_Value() DataType s_ = TobaccoCessationCounseling?.Performed; object t_ = FHIRHelpers_4_3_000.ToValue(s_); CqlInterval u_ = QICoreCommon_2_0_000.toInterval(t_); - bool? v_ = context.Operators.IntervalIncludesInterval(r_, u_, null); + bool? v_ = context.Operators.IntervalIncludesInterval(r_, u_, "day"); return v_; }; @@ -837,7 +837,7 @@ private IEnumerable Tobacco_Cessation_Counseling_Given_Value() CqlDateTime ab_ = context.Operators.Subtract(z_, aa_); CqlDateTime ad_ = context.Operators.End(y_); CqlInterval ae_ = context.Operators.Interval(ab_, ad_, true, true); - bool? af_ = context.Operators.In(x_, ae_, null); + bool? af_ = context.Operators.In(x_, ae_, "day"); return af_; }; @@ -868,7 +868,7 @@ private IEnumerable Tobacco_Cessation_Pharmacotherapy_Ordered CqlDateTime n_ = context.Operators.Subtract(l_, m_); CqlDateTime p_ = context.Operators.End(k_); CqlInterval q_ = context.Operators.Interval(n_, p_, true, true); - bool? r_ = context.Operators.In(j_, q_, null); + bool? r_ = context.Operators.In(j_, q_, "day"); return r_; }; @@ -898,7 +898,7 @@ private IEnumerable Active_Pharmacotherapy_for_Tobacco_Cessat CqlDateTime n_ = context.Operators.Subtract(l_, m_); CqlDateTime p_ = context.Operators.End(k_); CqlInterval q_ = context.Operators.Interval(n_, p_, true, true); - bool? r_ = context.Operators.In(j_, q_, null); + bool? r_ = context.Operators.In(j_, q_, "day"); return r_; }; 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 841c2ce4e..6d2ca5368 100644 --- a/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs +++ b/Demo/Measures.CMS/CSharp/PrimaryCariesPreventionasOfferedbyDentistsFHIR-0.0.002.g.cs @@ -167,7 +167,7 @@ private IEnumerable Qualifying_Encounters_Value() CqlInterval f_ = this.Measurement_Period(); Period g_ = ValidEncounter?.Period; CqlInterval h_ = FHIRHelpers_4_3_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, "day"); return i_; }; @@ -189,7 +189,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(1, 20, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = this.Qualifying_Encounters(); @@ -237,7 +237,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval l_ = QICoreCommon_2_0_000.toInterval(k_); CqlDateTime m_ = context.Operators.End(l_); CqlInterval n_ = this.Measurement_Period(); - bool? o_ = context.Operators.In(m_, n_, null); + bool? o_ = context.Operators.In(m_, n_, "day"); return o_; }; @@ -272,7 +272,7 @@ CqlDate f_(Procedure FluorideApplication) CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(1, 5, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -292,7 +292,7 @@ CqlDate f_(Procedure FluorideApplication) CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(6, 12, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -312,7 +312,7 @@ CqlDate f_(Procedure FluorideApplication) CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(13, 20, true, true); bool? j_ = context.Operators.In(h_, i_, null); 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 1b9aad992..70e8fbbe7 100644 --- a/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs +++ b/Demo/Measures.CMS/CSharp/ProstateCaAvoidanceBoneScanOveruseFHIR-0.2.000.g.cs @@ -313,7 +313,7 @@ private IEnumerable Prostate_Cancer_Diagnosis_Value() { CqlInterval e_ = QICoreCommon_2_0_000.prevalenceInterval(ProstateCancer); CqlInterval f_ = this.Measurement_Period(); - bool? g_ = context.Operators.Overlaps(e_, f_, null); + bool? g_ = context.Operators.Overlaps(e_, f_, "day"); bool? h_ = QICoreCommon_2_0_000.isProblemListItem(ProstateCancer); bool? i_ = QICoreCommon_2_0_000.isHealthConcern(ProstateCancer); bool? j_ = context.Operators.Or(h_, i_); @@ -497,7 +497,7 @@ private Procedure First_Prostate_Cancer_Treatment_during_day_of_Measurement_Peri CqlInterval j_ = QICoreCommon_2_0_000.toInterval(i_); CqlDateTime k_ = context.Operators.End(j_); CqlInterval l_ = this.Measurement_Period(); - bool? m_ = context.Operators.In(k_, l_, null); + bool? m_ = context.Operators.In(k_, l_, "day"); Code n_ = ProstateCancerTreatment?.StatusElement; EventStatus? o_ = n_?.Value; string p_ = context.Operators.Convert(o_); 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 bbfedf875..eec2970bd 100644 --- a/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs +++ b/Demo/Measures.CMS/CSharp/QICoreCommon-2.0.000.g.cs @@ -2411,7 +2411,7 @@ CqlDateTime f_() { CqlDateTime a_ = context.Operators.Start(Period); CqlDateTime b_ = context.Operators.End(Period); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "day"); CqlInterval d_ = context.Operators.Interval(1, c_, true, true); CqlInterval[] e_ = [ d_, @@ -2434,7 +2434,7 @@ CqlDateTime f_() { CqlDateTime a_ = context.Operators.Start(Period); CqlDateTime b_ = context.Operators.End(Period); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "day"); CqlInterval d_ = context.Operators.Interval(1, c_, true, true); CqlInterval[] e_ = [ d_, @@ -2476,7 +2476,7 @@ bool m_() CqlQuantity r_ = context.Operators.Multiply(o_, q_); CqlDateTime s_ = context.Operators.Add(n_, r_); CqlDateTime t_ = context.Operators.End(Period); - int? u_ = context.Operators.DurationBetween(s_, t_, null); + int? u_ = context.Operators.DurationBetween(s_, t_, "hour"); bool? v_ = context.Operators.Less(u_, 24); return (v_ ?? false); @@ -2537,7 +2537,7 @@ bool m_() CqlQuantity r_ = context.Operators.Multiply(o_, q_); CqlDateTime s_ = context.Operators.Add(n_, r_); CqlDateTime t_ = context.Operators.End(Period); - int? u_ = context.Operators.DurationBetween(s_, t_, null); + int? u_ = context.Operators.DurationBetween(s_, t_, "hour"); bool? v_ = context.Operators.Less(u_, 24); return (v_ ?? false); 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 016a89b51..c70823503 100644 --- a/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/SevereObstetricComplicationsFHIR-0.1.000.g.cs @@ -880,7 +880,7 @@ DataType v_(Extension @this) CqlInterval ao_ = QICoreCommon_2_0_000.toInterval(an_); CqlDateTime ap_ = context.Operators.Start(ao_); CqlInterval aq_ = PCMaternal_5_16_000.hospitalizationWithEDOBTriageObservation(TwentyWeeksPlusEncounter); - bool? ar_ = context.Operators.In(ap_, aq_, null); + bool? ar_ = context.Operators.In(ap_, aq_, "day"); bool? as_ = context.Operators.And(al_, ar_); return as_; @@ -940,7 +940,7 @@ IEnumerable b_(Encounter TwentyWeeksPlusEncounter) CqlInterval p_ = QICoreCommon_2_0_000.toInterval(o_); CqlDateTime q_ = context.Operators.Start(p_); CqlInterval r_ = PCMaternal_5_16_000.hospitalizationWithEDOBTriageObservation(TwentyWeeksPlusEncounter); - bool? s_ = context.Operators.In(q_, r_, null); + bool? s_ = context.Operators.In(q_, r_, "day"); bool? t_ = context.Operators.And(m_, s_); return t_; @@ -1028,7 +1028,7 @@ private IEnumerable Delivery_Encounters_with_COVID_and_Respiratory_Co CqlInterval ag_ = QICoreCommon_2_0_000.toInterval(af_); CqlDateTime ah_ = context.Operators.Start(ag_); CqlInterval ai_ = PCMaternal_5_16_000.hospitalizationWithEDOBTriageObservation(TwentyWeeksPlusEncounter); - bool? aj_ = context.Operators.In(ah_, ai_, null); + bool? aj_ = context.Operators.In(ah_, ai_, "day"); bool? ak_ = context.Operators.And(ad_, aj_); return ak_; 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 ffcce4921..6118ace59 100644 --- a/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs +++ b/Demo/Measures.CMS/CSharp/TJCOverall-8.11.000.g.cs @@ -182,7 +182,7 @@ private IEnumerable Non_Elective_Inpatient_Encounter_Value() CqlInterval f_ = FHIRHelpers_4_3_000.ToInterval(e_); CqlDateTime g_ = context.Operators.End(f_); CqlInterval h_ = this.Measurement_Period(); - bool? i_ = context.Operators.In(g_, h_, null); + bool? i_ = context.Operators.In(g_, h_, "day"); return i_; }; @@ -235,7 +235,7 @@ private IEnumerable Encounter_with_Principal_Diagnosis_and_Age_Value( CqlInterval i_ = FHIRHelpers_4_3_000.ToInterval(h_); CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); - int? l_ = context.Operators.CalculateAgeAt(g_, k_, null); + int? l_ = context.Operators.CalculateAgeAt(g_, k_, "year"); bool? m_ = context.Operators.GreaterOrEqual(l_, 18); return m_; 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 6a48c39a1..285a75f18 100644 --- a/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UrinarySymptomScoreChangeAfterBenignProstaticHyperplasiaFHIR-1.3.000.g.cs @@ -297,7 +297,7 @@ public Patient Patient() => CqlInterval f_ = this.Measurement_Period(); Period g_ = ValidEncounter?.Period; CqlInterval h_ = FHIRHelpers_4_3_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(f_, h_, "day"); Coding j_ = ValidEncounter?.Class; CqlCode k_ = FHIRHelpers_4_3_000.ToCode(j_); CqlCode l_ = this.@virtual(); @@ -377,7 +377,7 @@ private Condition Initial_BPH_Diagnosis_Starts_Within_6_Months_Before_or_After_S CqlDateTime n_ = context.Operators.Subtract(l_, m_); CqlDateTime p_ = context.Operators.End(k_); CqlInterval q_ = context.Operators.Interval(n_, p_, true, true); - bool? r_ = context.Operators.In(j_, q_, null); + bool? r_ = context.Operators.In(j_, q_, "day"); bool? s_ = this.isConfirmedActiveDiagnosis(NewBPHDiagnosis); bool? t_ = context.Operators.And(r_, s_); @@ -722,7 +722,7 @@ bool db_() } }; CqlDateTime bn_ = QICoreCommon_2_0_000.earliest(bm_()); - bool? bo_ = context.Operators.SameAs(bl_, bn_, null); + bool? bo_ = context.Operators.SameAs(bl_, bn_, "day"); List bp_ = QOLAssessment?.Category; CqlConcept bq_(CodeableConcept @this) { @@ -868,7 +868,7 @@ bool dz_() CqlQuantity r_ = context.Operators.Quantity(1m, "month"); CqlDateTime s_ = context.Operators.Add(q_, r_); CqlInterval t_ = context.Operators.Interval(o_, s_, true, true); - bool? u_ = context.Operators.In(m_, t_, null); + bool? u_ = context.Operators.In(m_, t_, "day"); CqlDateTime w_ = context.Operators.Start(n_); bool? x_ = context.Operators.Not((bool?)(w_ is null)); bool? y_ = context.Operators.And(u_, x_); @@ -913,7 +913,7 @@ object d_((CqlDateTime effectiveDatetime, int? valueInteger)? @this) CqlInterval m_ = QICoreCommon_2_0_000.prevalenceInterval(InitialBPHDiagnosis); CqlDateTime n_ = context.Operators.Start(m_); CqlDateTime o_ = USSAssessment?.effectiveDatetime; - int? p_ = context.Operators.DurationBetween(n_, o_, null); + int? p_ = context.Operators.DurationBetween(n_, o_, "month"); CqlInterval q_ = context.Operators.Interval(6, 12, true, true); bool? r_ = context.Operators.In(p_, q_, null); @@ -995,7 +995,7 @@ IEnumerable c_(Condition UrinaryRetention) CqlQuantity s_ = context.Operators.Quantity(1m, "year"); CqlDateTime t_ = context.Operators.Add(r_, s_); CqlInterval u_ = context.Operators.Interval(p_, t_, true, true); - bool? v_ = context.Operators.In(n_, u_, null); + bool? v_ = context.Operators.In(n_, u_, "day"); CqlDateTime x_ = context.Operators.Start(o_); bool? y_ = context.Operators.Not((bool?)(x_ is null)); bool? z_ = context.Operators.And(v_, y_); @@ -1143,7 +1143,7 @@ IEnumerable b_(Observation BMIExam) object y_ = FHIRHelpers_4_3_000.ToValue(x_); CqlDateTime z_ = QICoreCommon_2_0_000.earliest(y_); CqlInterval aa_ = this.Measurement_Period(); - bool? ab_ = context.Operators.In(z_, aa_, null); + bool? ab_ = context.Operators.In(z_, aa_, "day"); bool? ac_ = context.Operators.And(w_, ab_); object ae_ = FHIRHelpers_4_3_000.ToValue(x_); CqlDateTime af_ = QICoreCommon_2_0_000.earliest(ae_); 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 0607312df..1ae932922 100644 --- a/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/UseofHighRiskMedicationsintheElderlyFHIR-0.1.000.g.cs @@ -820,7 +820,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 65); IEnumerable j_ = this.Qualifying_Encounters(); bool? k_ = context.Operators.Exists(j_); 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 075cc75f8..dab357e83 100644 --- a/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs +++ b/Demo/Measures.CMS/CSharp/VTE-8.6.000.g.cs @@ -151,7 +151,7 @@ private IEnumerable Encounter_with_Age_Range_and_without_VTE_Diagnosi CqlInterval k_ = FHIRHelpers_4_3_000.ToInterval(j_); CqlDateTime l_ = context.Operators.Start(k_); CqlDate m_ = context.Operators.DateFrom(l_); - int? n_ = context.Operators.CalculateAgeAt(i_, m_, null); + int? n_ = context.Operators.CalculateAgeAt(i_, m_, "year"); bool? o_ = context.Operators.GreaterOrEqual(n_, 18); return o_; 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 897f8e6ed..559bb18ed 100644 --- a/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs +++ b/Demo/Measures.CMS/CSharp/WeightAssessmentandCounselingforNutritionandPhysicalActivityforChildrenandAdolescentsFHIR-0.1.000.g.cs @@ -524,7 +524,7 @@ public IEnumerable Qualifying_Encounter() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(3, 17, true, true); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = this.Qualifying_Encounter(); @@ -595,7 +595,7 @@ private IEnumerable BMI_Percentile_in_Measurement_Period_Value() DataType f_ = BMIPercentile?.Effective; object g_ = FHIRHelpers_4_3_000.ToValue(f_); CqlInterval h_ = QICoreCommon_2_0_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, "day"); DataType j_ = BMIPercentile?.Value; Quantity k_ = context.Operators.Convert(j_); CqlQuantity l_ = FHIRHelpers_4_3_000.ToQuantity(k_); @@ -623,7 +623,7 @@ private IEnumerable Height_in_Measurement_Period_Value() DataType f_ = Height?.Effective; object g_ = FHIRHelpers_4_3_000.ToValue(f_); CqlInterval h_ = QICoreCommon_2_0_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, "day"); DataType j_ = Height?.Value; Quantity k_ = context.Operators.Convert(j_); CqlQuantity l_ = FHIRHelpers_4_3_000.ToQuantity(k_); @@ -651,7 +651,7 @@ private IEnumerable Weight_in_Measurement_Period_Value() DataType f_ = Weight?.Effective; object g_ = FHIRHelpers_4_3_000.ToValue(f_); CqlInterval h_ = QICoreCommon_2_0_000.ToInterval(g_); - bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, null); + bool? i_ = context.Operators.IntervalIncludesInterval(e_, h_, "day"); DataType j_ = Weight?.Value; Quantity k_ = context.Operators.Convert(j_); CqlQuantity l_ = FHIRHelpers_4_3_000.ToQuantity(k_); @@ -698,7 +698,7 @@ public IEnumerable Weight_in_Measurement_Period() => DataType h_ = NutritionCounseling?.Performed; object i_ = FHIRHelpers_4_3_000.ToValue(h_); CqlInterval j_ = QICoreCommon_2_0_000.ToInterval(i_); - bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, null); + bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, "day"); return k_; }; @@ -723,7 +723,7 @@ public IEnumerable Weight_in_Measurement_Period() => DataType h_ = ActivityCounseling?.Performed; object i_ = FHIRHelpers_4_3_000.ToValue(h_); CqlInterval j_ = QICoreCommon_2_0_000.ToInterval(i_); - bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, null); + bool? k_ = context.Operators.IntervalIncludesInterval(g_, j_, "day"); return k_; }; @@ -746,7 +746,7 @@ public IEnumerable Weight_in_Measurement_Period() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(3, 11, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -766,7 +766,7 @@ public IEnumerable Weight_in_Measurement_Period() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(12, 17, true, true); bool? j_ = context.Operators.In(h_, i_, null); 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 c3d5ea5a3..466b05446 100644 --- a/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs +++ b/Demo/Measures.Demo/CSharp/AdvancedIllnessandFrailtyExclusionECQMFHIR4-5.17.000.g.cs @@ -379,7 +379,7 @@ private IEnumerable Two_Outpatient_Encounters_with_Advanced_Illness_o CqlDateTime p_ = context.Operators.End(o_); CqlQuantity q_ = context.Operators.Quantity(1m, "day"); CqlDateTime r_ = context.Operators.Add(p_, q_); - bool? s_ = context.Operators.SameOrAfter(m_, r_, null); + bool? s_ = context.Operators.SameOrAfter(m_, r_, "day"); return s_; }; @@ -460,7 +460,7 @@ public IEnumerable> Long_Term_Care_Adjacent_Periods() = { CqlDateTime h_ = context.Operators.Start(LTCPeriods); CqlDateTime i_ = context.Operators.End(LTCPeriods); - int? j_ = context.Operators.DurationBetween(h_, i_, null); + int? j_ = context.Operators.DurationBetween(h_, i_, "day"); return j_; }; @@ -652,7 +652,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(65, 79, true, true); bool? j_ = context.Operators.In(h_, i_, null); bool? k_ = this.Has_Criteria_Indicating_Frailty(); @@ -671,7 +671,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => CqlDate y_ = context.Operators.ConvertStringToDate(x_); CqlDateTime aa_ = context.Operators.Start(e_); CqlDate ab_ = context.Operators.DateFrom(aa_); - int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, null); + int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, "year"); bool? ad_ = context.Operators.GreaterOrEqual(ac_, 80); bool? af_ = context.Operators.And(ad_, k_); bool? ag_ = context.Operators.Or(u_, af_); @@ -692,7 +692,7 @@ public IEnumerable Inpatient_Encounter_with_Advanced_Illness() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 65); bool? j_ = this.Has_Criteria_Indicating_Frailty(); bool? k_ = context.Operators.And(i_, j_); 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 3b3c279e0..6dc72ae7e 100644 --- a/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/BCSEHEDISMY2022-1.0.0.g.cs @@ -258,7 +258,7 @@ private CqlDateTime October_1_Two_Years_Prior_to_the_Measurement_Period_Value() { CqlInterval a_ = this.Measurement_Period(); CqlDateTime b_ = context.Operators.Start(a_); - int? c_ = context.Operators.DateTimeComponentFrom(b_, null); + int? c_ = context.Operators.DateTimeComponentFrom(b_, "year"); int? d_ = context.Operators.Subtract(c_, 2); decimal? e_ = context.Operators.ConvertIntegerToDecimal(0); CqlDateTime f_ = context.Operators.DateTime(d_, 10, 1, 0, 0, 0, 0, e_); @@ -357,7 +357,7 @@ public IEnumerable Member_Coverage() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(52, 74, true, true); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; 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 19cb60697..a9e865751 100644 --- a/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/BreastCancerScreeningsFHIR-0.0.009.g.cs @@ -323,7 +323,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); return h_; } @@ -341,7 +341,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(51, 74, true, false); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -593,7 +593,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => CqlInterval z_ = this.Measurement_Period(); CqlDateTime aa_ = context.Operators.Start(z_); CqlDate ab_ = context.Operators.DateFrom(aa_); - int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, null); + int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, "year"); bool? ad_ = context.Operators.GreaterOrEqual(ac_, 65); bool? ae_ = AdvancedIllnessandFrailtyExclusionECQMFHIR4_5_17_000.Has_Long_Term_Care_Periods_Longer_Than_90_Consecutive_Days(); bool? af_ = context.Operators.And(ad_, ae_); 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 283a5a0f2..9ccba68ff 100644 --- a/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs +++ b/Demo/Measures.Demo/CSharp/CervicalCancerScreeningFHIR-0.0.005.g.cs @@ -319,7 +319,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(23, 64, true, false); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -496,7 +496,7 @@ private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Ol CqlInterval s_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Normalize_Interval(r_); CqlDateTime t_ = context.Operators.Start(s_); CqlDate u_ = context.Operators.DateFrom(t_); - int? v_ = context.Operators.CalculateAgeAt(q_, u_, null); + int? v_ = context.Operators.CalculateAgeAt(q_, u_, "year"); bool? w_ = context.Operators.GreaterOrEqual(v_, 30); bool? x_ = context.Operators.And(m_, w_); CqlDateTime z_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(r_); @@ -645,7 +645,7 @@ private IEnumerable HPV_Test_Within_5_Years_for_Women_Age_30_and_Ol CqlInterval m_ = this.toInterval(l_); CqlDateTime n_ = context.Operators.Start(m_); CqlDate o_ = context.Operators.DateFrom(n_); - int? p_ = context.Operators.CalculateAgeAt(k_, o_, null); + int? p_ = context.Operators.CalculateAgeAt(k_, o_, "year"); bool? q_ = context.Operators.GreaterOrEqual(p_, 30); bool? r_ = context.Operators.And(g_, q_); CqlDateTime t_ = this.latest(l_); 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 1d0c64a6b..5e7a16f07 100644 --- a/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/ColorectalCancerScreeningsFHIR-0.0.003.g.cs @@ -561,7 +561,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); return h_; } @@ -579,7 +579,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(51, 75, true, false); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = AdultOutpatientEncountersFHIR4_2_2_000.Qualifying_Encounters(); @@ -701,7 +701,7 @@ public IEnumerable Total_Colectomy_Condition() => CqlInterval q_ = this.Measurement_Period(); CqlDateTime r_ = context.Operators.Start(q_); CqlDate s_ = context.Operators.DateFrom(r_); - int? t_ = context.Operators.CalculateAgeAt(p_, s_, null); + int? t_ = context.Operators.CalculateAgeAt(p_, s_, "year"); bool? u_ = context.Operators.GreaterOrEqual(t_, 65); bool? v_ = AdvancedIllnessandFrailtyExclusionECQMFHIR4_5_17_000.Has_Long_Term_Care_Periods_Longer_Than_90_Consecutive_Days(); bool? w_ = context.Operators.And(u_, v_); @@ -959,7 +959,7 @@ string ac_(Code @this) DataType q_ = FecalOccult?.Effective; CqlDateTime r_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(q_); CqlInterval s_ = this.Measurement_Period(); - bool? t_ = context.Operators.In(r_, s_, null); + bool? t_ = context.Operators.In(r_, s_, "day"); bool? u_ = context.Operators.And(p_, t_); return u_; @@ -1029,7 +1029,7 @@ string x_(Code @this) DataType l_ = FecalOccult?.Effective; CqlDateTime m_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(l_); CqlInterval n_ = this.Measurement_Period(); - bool? o_ = context.Operators.In(m_, n_, null); + bool? o_ = context.Operators.In(m_, n_, "day"); bool? p_ = context.Operators.And(k_, o_); return p_; @@ -1064,7 +1064,7 @@ private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appro DataType m_ = FecalOccult?.Effective; CqlDateTime n_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(m_); CqlInterval o_ = this.Measurement_Period(); - bool? p_ = context.Operators.In(n_, o_, null); + bool? p_ = context.Operators.In(n_, o_, "day"); bool? q_ = context.Operators.And(l_, p_); return q_; @@ -1337,7 +1337,7 @@ string am_(Code @this) CqlDateTime v_ = context.Operators.Subtract(t_, u_); CqlDateTime x_ = context.Operators.End(s_); CqlInterval y_ = context.Operators.Interval(v_, x_, true, true); - bool? z_ = context.Operators.In(r_, y_, null); + bool? z_ = context.Operators.In(r_, y_, "day"); CqlDateTime ab_ = context.Operators.End(s_); bool? ac_ = context.Operators.Not((bool?)(ab_ is null)); bool? ad_ = context.Operators.And(z_, ac_); @@ -1415,7 +1415,7 @@ string ah_(Code @this) CqlDateTime q_ = context.Operators.Subtract(o_, p_); CqlDateTime s_ = context.Operators.End(n_); CqlInterval t_ = context.Operators.Interval(q_, s_, true, true); - bool? u_ = context.Operators.In(m_, t_, null); + bool? u_ = context.Operators.In(m_, t_, "day"); CqlDateTime w_ = context.Operators.End(n_); bool? x_ = context.Operators.Not((bool?)(w_ is null)); bool? y_ = context.Operators.And(u_, x_); @@ -1458,7 +1458,7 @@ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without CqlDateTime r_ = context.Operators.Subtract(p_, q_); CqlDateTime t_ = context.Operators.End(o_); CqlInterval u_ = context.Operators.Interval(r_, t_, true, true); - bool? v_ = context.Operators.In(n_, u_, null); + bool? v_ = context.Operators.In(n_, u_, "day"); CqlDateTime x_ = context.Operators.End(o_); bool? y_ = context.Operators.Not((bool?)(x_ is null)); bool? z_ = context.Operators.And(v_, y_); 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 0da7ae79c..7dc2bda1e 100644 --- a/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs +++ b/Demo/Measures.Demo/CSharp/CumulativeMedicationDurationFHIR4-1.0.000.g.cs @@ -1073,7 +1073,7 @@ bool f_() { CqlDateTime e_ = context.Operators.Start(X); CqlDateTime f_ = context.Operators.End(X); - int? g_ = context.Operators.DifferenceBetween(e_, f_, null); + int? g_ = context.Operators.DifferenceBetween(e_, f_, "day"); return g_; }; @@ -1111,7 +1111,7 @@ CqlInterval d_(CqlInterval X) ]; CqlDateTime v_ = context.Operators.Max((u_ as IEnumerable)); CqlDateTime x_ = context.Operators.End(X); - int? y_ = context.Operators.DurationBetween(m_, x_, null); + int? y_ = context.Operators.DurationBetween(m_, x_, "day"); decimal? z_ = context.Operators.ConvertIntegerToDecimal((y_ ?? 0)); CqlDateTime aa_ = context.Operators.Add(v_, new CqlQuantity(z_, "day")); CqlInterval ab_ = context.Operators.Interval(o_, aa_, true, true); 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 ffa6b0b94..06a00f2b3 100644 --- a/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs +++ b/Demo/Measures.Demo/CSharp/DRCommunicationWithPhysicianManagingDiabetesFHIR-0.0.004.g.cs @@ -662,7 +662,7 @@ public IEnumerable Medical_or_Patient_Reason_for_Not_Communicatin CqlDateTime d_ = context.Operators.ConvertStringToDateTime(c_); CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); - int? g_ = context.Operators.CalculateAgeAt(d_, f_, null); + int? g_ = context.Operators.CalculateAgeAt(d_, f_, "year"); bool? h_ = context.Operators.GreaterOrEqual(g_, 18); IEnumerable i_ = this.Diabetic_Retinopathy_Encounter(); bool? j_ = context.Operators.Exists(i_); 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 9b7114f45..9df4bf09c 100644 --- a/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs +++ b/Demo/Measures.Demo/CSharp/DiabetesHemoglobinA1cHbA1cPoorControl9FHIR-0.0.015.g.cs @@ -325,7 +325,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(18, 75, true, false); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = AdultOutpatientEncountersFHIR4_2_2_000.Qualifying_Encounters(); @@ -495,7 +495,7 @@ public Observation Most_Recent_HbA1c() => CqlInterval h_ = this.Measurement_Period(); CqlDateTime i_ = context.Operators.Start(h_); CqlDate j_ = context.Operators.DateFrom(i_); - int? k_ = context.Operators.CalculateAgeAt(g_, j_, null); + int? k_ = context.Operators.CalculateAgeAt(g_, j_, "year"); bool? l_ = context.Operators.GreaterOrEqual(k_, 65); bool? m_ = AdvancedIllnessandFrailtyExclusionECQMFHIR4_5_17_000.Has_Long_Term_Care_Periods_Longer_Than_90_Consecutive_Days(); bool? n_ = context.Operators.And(l_, m_); 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 640137284..047d1a9ca 100644 --- a/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam125FHIR-0.0.009.g.cs @@ -323,7 +323,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); return h_; } @@ -341,7 +341,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(51, 74, true, false); bool? j_ = context.Operators.In(h_, i_, null); Code l_ = a_?.GenderElement; @@ -593,7 +593,7 @@ public IEnumerable Bilateral_Mastectomy_Procedure() => CqlInterval z_ = this.Measurement_Period(); CqlDateTime aa_ = context.Operators.Start(z_); CqlDate ab_ = context.Operators.DateFrom(aa_); - int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, null); + int? ac_ = context.Operators.CalculateAgeAt(y_, ab_, "year"); bool? ad_ = context.Operators.GreaterOrEqual(ac_, 65); bool? ae_ = AdvancedIllnessandFrailtyExclusionECQMFHIR4_5_17_000.Has_Long_Term_Care_Periods_Longer_Than_90_Consecutive_Days(); bool? af_ = context.Operators.And(ad_, ae_); 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 167dfcf16..fc09dc2c8 100644 --- a/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs +++ b/Demo/Measures.Demo/CSharp/Exam130FHIR-0.0.003.g.cs @@ -561,7 +561,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); return h_; } @@ -579,7 +579,7 @@ public IEnumerable Telehealth_Services() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(51, 75, true, false); bool? j_ = context.Operators.In(h_, i_, null); IEnumerable k_ = AdultOutpatientEncountersFHIR4_2_2_000.Qualifying_Encounters(); @@ -701,7 +701,7 @@ public IEnumerable Total_Colectomy_Condition() => CqlInterval q_ = this.Measurement_Period(); CqlDateTime r_ = context.Operators.Start(q_); CqlDate s_ = context.Operators.DateFrom(r_); - int? t_ = context.Operators.CalculateAgeAt(p_, s_, null); + int? t_ = context.Operators.CalculateAgeAt(p_, s_, "year"); bool? u_ = context.Operators.GreaterOrEqual(t_, 65); bool? v_ = AdvancedIllnessandFrailtyExclusionECQMFHIR4_5_17_000.Has_Long_Term_Care_Periods_Longer_Than_90_Consecutive_Days(); bool? w_ = context.Operators.And(u_, v_); @@ -959,7 +959,7 @@ string ac_(Code @this) DataType q_ = FecalOccult?.Effective; CqlDateTime r_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(q_); CqlInterval s_ = this.Measurement_Period(); - bool? t_ = context.Operators.In(r_, s_, null); + bool? t_ = context.Operators.In(r_, s_, "day"); bool? u_ = context.Operators.And(p_, t_); return u_; @@ -1029,7 +1029,7 @@ string x_(Code @this) DataType l_ = FecalOccult?.Effective; CqlDateTime m_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(l_); CqlInterval n_ = this.Measurement_Period(); - bool? o_ = context.Operators.In(m_, n_, null); + bool? o_ = context.Operators.In(m_, n_, "day"); bool? p_ = context.Operators.And(k_, o_); return p_; @@ -1064,7 +1064,7 @@ private IEnumerable Fecal_Occult_Blood_Test_Performed_without_appro DataType m_ = FecalOccult?.Effective; CqlDateTime n_ = MATGlobalCommonFunctionsFHIR4_6_1_000.Latest(m_); CqlInterval o_ = this.Measurement_Period(); - bool? p_ = context.Operators.In(n_, o_, null); + bool? p_ = context.Operators.In(n_, o_, "day"); bool? q_ = context.Operators.And(l_, p_); return q_; @@ -1337,7 +1337,7 @@ string am_(Code @this) CqlDateTime v_ = context.Operators.Subtract(t_, u_); CqlDateTime x_ = context.Operators.End(s_); CqlInterval y_ = context.Operators.Interval(v_, x_, true, true); - bool? z_ = context.Operators.In(r_, y_, null); + bool? z_ = context.Operators.In(r_, y_, "day"); CqlDateTime ab_ = context.Operators.End(s_); bool? ac_ = context.Operators.Not((bool?)(ab_ is null)); bool? ad_ = context.Operators.And(z_, ac_); @@ -1415,7 +1415,7 @@ string ah_(Code @this) CqlDateTime q_ = context.Operators.Subtract(o_, p_); CqlDateTime s_ = context.Operators.End(n_); CqlInterval t_ = context.Operators.Interval(q_, s_, true, true); - bool? u_ = context.Operators.In(m_, t_, null); + bool? u_ = context.Operators.In(m_, t_, "day"); CqlDateTime w_ = context.Operators.End(n_); bool? x_ = context.Operators.Not((bool?)(w_ is null)); bool? y_ = context.Operators.And(u_, x_); @@ -1458,7 +1458,7 @@ private IEnumerable Fecal_Immunochemical_Test_DNA_Performed_without CqlDateTime r_ = context.Operators.Subtract(p_, q_); CqlDateTime t_ = context.Operators.End(o_); CqlInterval u_ = context.Operators.Interval(r_, t_, true, true); - bool? v_ = context.Operators.In(n_, u_, null); + bool? v_ = context.Operators.In(n_, u_, "day"); CqlDateTime x_ = context.Operators.End(o_); bool? y_ = context.Operators.Not((bool?)(x_ is null)); bool? z_ = context.Operators.And(v_, y_); 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 3a9a637b5..17982a927 100644 --- a/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs +++ b/Demo/Measures.Demo/CSharp/FHIR347-0.1.021.g.cs @@ -642,7 +642,7 @@ public IEnumerable Qualifying_Encounter_during_Measurement_Period() = CqlDateTime d_ = context.Operators.ConvertStringToDateTime(c_); CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); - int? g_ = context.Operators.CalculateAgeAt(d_, f_, null); + int? g_ = context.Operators.CalculateAgeAt(d_, f_, "year"); bool? h_ = context.Operators.GreaterOrEqual(g_, 20); return h_; @@ -789,7 +789,7 @@ public IEnumerable Hypercholesterolemia_Diagnosis() => CqlDateTime d_ = context.Operators.ConvertStringToDateTime(c_); CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); - int? g_ = context.Operators.CalculateAgeAt(d_, f_, null); + int? g_ = context.Operators.CalculateAgeAt(d_, f_, "year"); CqlInterval h_ = context.Operators.Interval(40, 75, true, true); bool? i_ = context.Operators.In(g_, h_, null); bool? j_ = this.Has_Diabetes_Diagnosis(); 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 416b1f61e..8afb070cf 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmHyperglycemiainHospitalizedPatientsFHIR-0.0.006.g.cs @@ -239,7 +239,7 @@ private IEnumerable Qualifying_Encounters_Value() CqlDateTime g_ = context.Operators.ConvertStringToDateTime(f_); CqlInterval h_ = MATGlobalCommonFunctionsFHIR4_6_1_000.HospitalizationWithObservation(InpatientEncounter); CqlDateTime i_ = context.Operators.Start(h_); - int? j_ = context.Operators.CalculateAgeAt(g_, i_, null); + int? j_ = context.Operators.CalculateAgeAt(g_, i_, "year"); bool? k_ = context.Operators.GreaterOrEqual(j_, 18); return k_; @@ -458,7 +458,7 @@ public CqlInterval Crop_Interval_to_10_Days(CqlInterval d_ = context.Operators.Interval(1, c_, true, true); CqlInterval[] e_ = [ d_, @@ -498,7 +498,7 @@ bool m_() CqlQuantity r_ = context.Operators.Multiply(o_, q_); CqlDateTime s_ = context.Operators.Add(n_, r_); CqlDateTime t_ = context.Operators.End(Period); - int? u_ = context.Operators.DurationBetween(s_, t_, null); + int? u_ = context.Operators.DurationBetween(s_, t_, "hour"); bool? v_ = context.Operators.Less(u_, 24); return (v_ ?? false); 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 f4dfdebc5..86ac9e892 100644 --- a/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/HospitalHarmSevereHypoglycemiaFHIR-0.0.012.g.cs @@ -258,7 +258,7 @@ private IEnumerable Qualifying_Encounter_Value() CqlDateTime g_ = context.Operators.ConvertStringToDateTime(f_); CqlInterval h_ = MATGlobalCommonFunctionsFHIR4_6_1_000.HospitalizationWithObservation(InpatientEncounter); CqlDateTime i_ = context.Operators.Start(h_); - int? j_ = context.Operators.CalculateAgeAt(g_, i_, null); + int? j_ = context.Operators.CalculateAgeAt(g_, i_, "year"); bool? k_ = context.Operators.GreaterOrEqual(j_, 18); return k_; 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 0aa038c94..6c722e180 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWMFHIR-0.102.005.g.cs @@ -336,7 +336,7 @@ public CqlCode SDE_Sex() => { CqlDateTime a_ = context.Operators.Start(Value); CqlDateTime b_ = context.Operators.End(Value); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } @@ -368,7 +368,7 @@ private IEnumerable Inpatient_Encounters_Value() CqlInterval u_ = FHIRHelpers_4_0_001.ToInterval(t_); CqlDateTime v_ = context.Operators.End(u_); CqlInterval w_ = this.Measurement_Period(); - bool? x_ = context.Operators.In(v_, w_, null); + bool? x_ = context.Operators.In(v_, w_, "day"); bool? y_ = context.Operators.And(s_, x_); Patient z_ = this.Patient(); Date aa_ = z_?.BirthDateElement; @@ -377,7 +377,7 @@ private IEnumerable Inpatient_Encounters_Value() CqlInterval ae_ = FHIRHelpers_4_0_001.ToInterval(t_); CqlDateTime af_ = context.Operators.Start(ae_); CqlDate ag_ = context.Operators.DateFrom(af_); - int? ah_ = context.Operators.CalculateAgeAt(ac_, ag_, null); + int? ah_ = context.Operators.CalculateAgeAt(ac_, ag_, "year"); CqlInterval ai_ = context.Operators.Interval(65, 94, true, true); bool? aj_ = context.Operators.In(ah_, ai_, null); bool? ak_ = context.Operators.And(y_, aj_); @@ -699,7 +699,7 @@ public IEnumerable Results() => { CqlDate a_ = context.Operators.ConvertDateTimeToDate(BirthDateTime); CqlDate b_ = context.Operators.ConvertDateTimeToDate(AsOf); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "year"); return c_; } @@ -707,9 +707,11 @@ public IEnumerable Results() => [CqlDeclaration("ToDate")] public CqlDateTime ToDate(CqlDateTime Value) { - int? a_ = context.Operators.DateTimeComponentFrom(Value, null); + int? a_ = context.Operators.DateTimeComponentFrom(Value, "year"); + int? b_ = context.Operators.DateTimeComponentFrom(Value, "month"); + int? c_ = context.Operators.DateTimeComponentFrom(Value, "day"); decimal? d_ = context.Operators.TimezoneOffsetFrom(Value); - CqlDateTime e_ = context.Operators.DateTime(a_, a_, a_, 0, 0, 0, 0, d_); + CqlDateTime e_ = context.Operators.DateTime(a_, b_, c_, 0, 0, 0, 0, d_); return e_; } @@ -719,7 +721,7 @@ public CqlDateTime ToDate(CqlDateTime Value) { CqlDateTime a_ = context.Operators.Start(Stay); CqlDateTime b_ = context.Operators.End(Stay); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } 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 782f67258..26e106c98 100644 --- a/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs +++ b/Demo/Measures.Demo/CSharp/HybridHWRFHIR-1.3.005.g.cs @@ -572,7 +572,7 @@ object s_(Encounter @this) { CqlDateTime a_ = context.Operators.Start(Value); CqlDateTime b_ = context.Operators.End(Value); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } @@ -604,7 +604,7 @@ private IEnumerable Inpatient_Encounters_Value() CqlInterval u_ = FHIRHelpers_4_0_001.ToInterval(t_); CqlDateTime v_ = context.Operators.End(u_); CqlInterval w_ = this.Measurement_Period(); - bool? x_ = context.Operators.In(v_, w_, null); + bool? x_ = context.Operators.In(v_, w_, "day"); bool? y_ = context.Operators.And(s_, x_); Patient z_ = this.Patient(); Date aa_ = z_?.BirthDateElement; @@ -613,7 +613,7 @@ private IEnumerable Inpatient_Encounters_Value() CqlInterval ae_ = FHIRHelpers_4_0_001.ToInterval(t_); CqlDateTime af_ = context.Operators.Start(ae_); CqlDate ag_ = context.Operators.DateFrom(af_); - int? ah_ = context.Operators.CalculateAgeAt(ac_, ag_, null); + int? ah_ = context.Operators.CalculateAgeAt(ac_, ag_, "year"); bool? ai_ = context.Operators.GreaterOrEqual(ah_, 65); bool? aj_ = context.Operators.And(y_, ai_); @@ -1067,7 +1067,7 @@ public IEnumerable Results() => { CqlDate a_ = context.Operators.ConvertDateTimeToDate(BirthDateTime); CqlDate b_ = context.Operators.ConvertDateTimeToDate(AsOf); - int? c_ = context.Operators.DurationBetween(a_, b_, null); + int? c_ = context.Operators.DurationBetween(a_, b_, "year"); return c_; } @@ -1075,9 +1075,11 @@ public IEnumerable Results() => [CqlDeclaration("ToDate")] public CqlDateTime ToDate(CqlDateTime Value) { - int? a_ = context.Operators.DateTimeComponentFrom(Value, null); + int? a_ = context.Operators.DateTimeComponentFrom(Value, "year"); + int? b_ = context.Operators.DateTimeComponentFrom(Value, "month"); + int? c_ = context.Operators.DateTimeComponentFrom(Value, "day"); decimal? d_ = context.Operators.TimezoneOffsetFrom(Value); - CqlDateTime e_ = context.Operators.DateTime(a_, a_, a_, 0, 0, 0, 0, d_); + CqlDateTime e_ = context.Operators.DateTime(a_, b_, c_, 0, 0, 0, 0, d_); return e_; } @@ -1087,7 +1089,7 @@ public CqlDateTime ToDate(CqlDateTime Value) { CqlDateTime a_ = context.Operators.Start(Stay); CqlDateTime b_ = context.Operators.End(Stay); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } 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 02603d5e8..b920c5bf6 100644 --- a/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs +++ b/Demo/Measures.Demo/CSharp/MATGlobalCommonFunctionsFHIR4-6.1.000.g.cs @@ -488,7 +488,7 @@ public Patient Patient() => { CqlDateTime a_ = context.Operators.Start(Value); CqlDateTime b_ = context.Operators.End(Value); - int? c_ = context.Operators.DifferenceBetween(a_, b_, null); + int? c_ = context.Operators.DifferenceBetween(a_, b_, "day"); return c_; } 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 f07e92267..04156558c 100644 --- a/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQAAdvancedIllnessandFrailty-1.0.0.g.cs @@ -583,7 +583,7 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(66, 80, true, true); bool? j_ = context.Operators.In(h_, i_, null); bool? k_ = this.Has_Criteria_Indicating_Frailty(); @@ -601,7 +601,7 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg CqlDate x_ = context.Operators.ConvertStringToDate(w_); CqlDateTime z_ = context.Operators.End(e_); CqlDate aa_ = context.Operators.DateFrom(z_); - int? ab_ = context.Operators.CalculateAgeAt(x_, aa_, null); + int? ab_ = context.Operators.CalculateAgeAt(x_, aa_, "year"); bool? ac_ = context.Operators.GreaterOrEqual(ab_, 81); bool? ae_ = context.Operators.And(ac_, k_); bool? af_ = context.Operators.Or(t_, ae_); @@ -622,7 +622,7 @@ CqlDate h_((CqlDate OutpatientVisit1, CqlDate OutpatientVisit2)? tuple_cmsergtjg CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.End(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); bool? i_ = context.Operators.GreaterOrEqual(h_, 66); bool? j_ = this.Has_Criteria_Indicating_Frailty(); bool? k_ = context.Operators.And(i_, j_); 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 91c55e91d..706f200e6 100644 --- a/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs +++ b/Demo/Measures.Demo/CSharp/NCQACQLBase-1.0.0.g.cs @@ -605,7 +605,7 @@ bool f_() { CqlDate l_ = context.Operators.Start(I); CqlDate m_ = context.Operators.End(I); - int? n_ = context.Operators.DurationBetween(l_, m_, null); + int? n_ = context.Operators.DurationBetween(l_, m_, "day"); int? o_ = context.Operators.Add(n_, 1); int?[] p_ = [ o_, @@ -640,7 +640,7 @@ bool r_() { CqlDate aa_ = context.Operators.Start(I); CqlDate ab_ = context.Operators.End(I); - int? ac_ = context.Operators.DurationBetween(aa_, ab_, null); + int? ac_ = context.Operators.DurationBetween(aa_, ab_, "day"); int? ad_ = context.Operators.Add(ac_, 1); int?[] ae_ = [ ad_, @@ -684,7 +684,7 @@ bool ai_() { CqlDate bd_ = context.Operators.Start(I); CqlDate be_ = context.Operators.End(I); - int? bf_ = context.Operators.DurationBetween(bd_, be_, null); + int? bf_ = context.Operators.DurationBetween(bd_, be_, "day"); int? bg_ = context.Operators.Add(bf_, 1); int?[] bh_ = [ bg_, @@ -710,7 +710,7 @@ object an_((CqlInterval interval, int? days)? @this) { CqlDate bl_ = context.Operators.Start(I); CqlDate bm_ = context.Operators.End(I); - int? bn_ = context.Operators.DurationBetween(bl_, bm_, null); + int? bn_ = context.Operators.DurationBetween(bl_, bm_, "day"); int? bo_ = context.Operators.Add(bn_, 1); int?[] bp_ = [ bo_, @@ -732,7 +732,7 @@ object au_((CqlInterval interval, int? days)? @this) (CqlInterval interval, int? days)? aw_ = context.Operators.First<(CqlInterval interval, int? days)?>(av_); CqlInterval ax_ = aw_?.interval; CqlDate ay_ = context.Operators.End(ax_); - int? az_ = context.Operators.DurationBetween(ar_, ay_, null); + int? az_ = context.Operators.DurationBetween(ar_, ay_, "day"); int? ba_ = context.Operators.Add(az_, 1); int?[] bb_ = [ ba_, @@ -794,13 +794,13 @@ object au_((CqlInterval interval, int? days)? @this) public CqlInterval DateTime_Interval_Set_Nulls_to_Zero(CqlInterval interval) { CqlDateTime a_ = context.Operators.Start(interval); - int? b_ = context.Operators.DateTimeComponentFrom(a_, null); + int? b_ = context.Operators.DateTimeComponentFrom(a_, "year"); int? c_() { bool v_() { CqlDateTime w_ = context.Operators.Start(interval); - int? x_ = context.Operators.DateTimeComponentFrom(w_, null); + int? x_ = context.Operators.DateTimeComponentFrom(w_, "month"); return (x_ is null); }; @@ -811,7 +811,7 @@ bool v_() else { CqlDateTime y_ = context.Operators.Start(interval); - int? z_ = context.Operators.DateTimeComponentFrom(y_, null); + int? z_ = context.Operators.DateTimeComponentFrom(y_, "month"); return z_; } @@ -821,7 +821,7 @@ bool v_() bool aa_() { CqlDateTime ab_ = context.Operators.Start(interval); - int? ac_ = context.Operators.DateTimeComponentFrom(ab_, null); + int? ac_ = context.Operators.DateTimeComponentFrom(ab_, "day"); return (ac_ is null); }; @@ -832,7 +832,7 @@ bool aa_() else { CqlDateTime ad_ = context.Operators.Start(interval); - int? ae_ = context.Operators.DateTimeComponentFrom(ad_, null); + int? ae_ = context.Operators.DateTimeComponentFrom(ad_, "day"); return ae_; } @@ -842,7 +842,7 @@ bool aa_() bool af_() { CqlDateTime ag_ = context.Operators.Start(interval); - int? ah_ = context.Operators.DateTimeComponentFrom(ag_, null); + int? ah_ = context.Operators.DateTimeComponentFrom(ag_, "hour"); return (ah_ is null); }; @@ -853,7 +853,7 @@ bool af_() else { CqlDateTime ai_ = context.Operators.Start(interval); - int? aj_ = context.Operators.DateTimeComponentFrom(ai_, null); + int? aj_ = context.Operators.DateTimeComponentFrom(ai_, "hour"); return aj_; } @@ -863,7 +863,7 @@ bool af_() bool ak_() { CqlDateTime al_ = context.Operators.Start(interval); - int? am_ = context.Operators.DateTimeComponentFrom(al_, null); + int? am_ = context.Operators.DateTimeComponentFrom(al_, "minute"); return (am_ is null); }; @@ -874,7 +874,7 @@ bool ak_() else { CqlDateTime an_ = context.Operators.Start(interval); - int? ao_ = context.Operators.DateTimeComponentFrom(an_, null); + int? ao_ = context.Operators.DateTimeComponentFrom(an_, "minute"); return ao_; } @@ -884,7 +884,7 @@ bool ak_() bool ap_() { CqlDateTime aq_ = context.Operators.Start(interval); - int? ar_ = context.Operators.DateTimeComponentFrom(aq_, null); + int? ar_ = context.Operators.DateTimeComponentFrom(aq_, "second"); return (ar_ is null); }; @@ -895,7 +895,7 @@ bool ap_() else { CqlDateTime as_ = context.Operators.Start(interval); - int? at_ = context.Operators.DateTimeComponentFrom(as_, null); + int? at_ = context.Operators.DateTimeComponentFrom(as_, "second"); return at_; } @@ -905,7 +905,7 @@ bool ap_() bool au_() { CqlDateTime av_ = context.Operators.Start(interval); - int? aw_ = context.Operators.DateTimeComponentFrom(av_, null); + int? aw_ = context.Operators.DateTimeComponentFrom(av_, "millisecond"); return (aw_ is null); }; @@ -916,19 +916,19 @@ bool au_() else { CqlDateTime ax_ = context.Operators.Start(interval); - int? ay_ = context.Operators.DateTimeComponentFrom(ax_, null); + int? ay_ = context.Operators.DateTimeComponentFrom(ax_, "millisecond"); return ay_; } }; CqlDateTime i_ = context.Operators.End(interval); - int? j_ = context.Operators.DateTimeComponentFrom(i_, null); + int? j_ = context.Operators.DateTimeComponentFrom(i_, "year"); int? k_() { bool az_() { CqlDateTime ba_ = context.Operators.End(interval); - int? bb_ = context.Operators.DateTimeComponentFrom(ba_, null); + int? bb_ = context.Operators.DateTimeComponentFrom(ba_, "month"); return (bb_ is null); }; @@ -939,7 +939,7 @@ bool az_() else { CqlDateTime bc_ = context.Operators.End(interval); - int? bd_ = context.Operators.DateTimeComponentFrom(bc_, null); + int? bd_ = context.Operators.DateTimeComponentFrom(bc_, "month"); return bd_; } @@ -949,7 +949,7 @@ bool az_() bool be_() { CqlDateTime bf_ = context.Operators.End(interval); - int? bg_ = context.Operators.DateTimeComponentFrom(bf_, null); + int? bg_ = context.Operators.DateTimeComponentFrom(bf_, "day"); return (bg_ is null); }; @@ -960,7 +960,7 @@ bool be_() else { CqlDateTime bh_ = context.Operators.End(interval); - int? bi_ = context.Operators.DateTimeComponentFrom(bh_, null); + int? bi_ = context.Operators.DateTimeComponentFrom(bh_, "day"); return bi_; } @@ -970,7 +970,7 @@ bool be_() bool bj_() { CqlDateTime bk_ = context.Operators.End(interval); - int? bl_ = context.Operators.DateTimeComponentFrom(bk_, null); + int? bl_ = context.Operators.DateTimeComponentFrom(bk_, "hour"); return (bl_ is null); }; @@ -981,7 +981,7 @@ bool bj_() else { CqlDateTime bm_ = context.Operators.End(interval); - int? bn_ = context.Operators.DateTimeComponentFrom(bm_, null); + int? bn_ = context.Operators.DateTimeComponentFrom(bm_, "hour"); return bn_; } @@ -991,7 +991,7 @@ bool bj_() bool bo_() { CqlDateTime bp_ = context.Operators.End(interval); - int? bq_ = context.Operators.DateTimeComponentFrom(bp_, null); + int? bq_ = context.Operators.DateTimeComponentFrom(bp_, "minute"); return (bq_ is null); }; @@ -1002,7 +1002,7 @@ bool bo_() else { CqlDateTime br_ = context.Operators.End(interval); - int? bs_ = context.Operators.DateTimeComponentFrom(br_, null); + int? bs_ = context.Operators.DateTimeComponentFrom(br_, "minute"); return bs_; } @@ -1012,7 +1012,7 @@ bool bo_() bool bt_() { CqlDateTime bu_ = context.Operators.End(interval); - int? bv_ = context.Operators.DateTimeComponentFrom(bu_, null); + int? bv_ = context.Operators.DateTimeComponentFrom(bu_, "second"); return (bv_ is null); }; @@ -1023,7 +1023,7 @@ bool bt_() else { CqlDateTime bw_ = context.Operators.End(interval); - int? bx_ = context.Operators.DateTimeComponentFrom(bw_, null); + int? bx_ = context.Operators.DateTimeComponentFrom(bw_, "second"); return bx_; } @@ -1033,7 +1033,7 @@ bool bt_() bool by_() { CqlDateTime bz_ = context.Operators.End(interval); - int? ca_ = context.Operators.DateTimeComponentFrom(bz_, null); + int? ca_ = context.Operators.DateTimeComponentFrom(bz_, "millisecond"); return (ca_ is null); }; @@ -1044,7 +1044,7 @@ bool by_() else { CqlDateTime cb_ = context.Operators.End(interval); - int? cc_ = context.Operators.DateTimeComponentFrom(cb_, null); + int? cc_ = context.Operators.DateTimeComponentFrom(cb_, "millisecond"); return cc_; } @@ -1105,7 +1105,7 @@ bool f_() CqlInterval l_ = this.DateTime_Interval_Set_Nulls_to_Zero(I); CqlDateTime m_ = context.Operators.Start(l_); CqlDateTime o_ = context.Operators.End(l_); - int? p_ = context.Operators.DurationBetween(m_, o_, null); + int? p_ = context.Operators.DurationBetween(m_, o_, "day"); int? q_ = context.Operators.Add(p_, 1); int?[] r_ = [ q_, @@ -1141,7 +1141,7 @@ bool t_() CqlInterval ac_ = this.DateTime_Interval_Set_Nulls_to_Zero(I); CqlDateTime ad_ = context.Operators.Start(ac_); CqlDateTime af_ = context.Operators.End(ac_); - int? ag_ = context.Operators.DurationBetween(ad_, af_, null); + int? ag_ = context.Operators.DurationBetween(ad_, af_, "day"); int? ah_ = context.Operators.Add(ag_, 1); int?[] ai_ = [ ah_, @@ -1186,7 +1186,7 @@ bool am_() CqlInterval bj_ = this.DateTime_Interval_Set_Nulls_to_Zero(I); CqlDateTime bk_ = context.Operators.Start(bj_); CqlDateTime bm_ = context.Operators.End(bj_); - int? bn_ = context.Operators.DurationBetween(bk_, bm_, null); + int? bn_ = context.Operators.DurationBetween(bk_, bm_, "day"); int? bo_ = context.Operators.Add(bn_, 1); int?[] bp_ = [ bo_, @@ -1214,7 +1214,7 @@ object ar_((CqlInterval interval, int? days)? @this) CqlInterval bt_ = this.DateTime_Interval_Set_Nulls_to_Zero(I); CqlDateTime bu_ = context.Operators.Start(bt_); CqlDateTime bw_ = context.Operators.End(bt_); - int? bx_ = context.Operators.DurationBetween(bu_, bw_, null); + int? bx_ = context.Operators.DurationBetween(bu_, bw_, "day"); int? by_ = context.Operators.Add(bx_, 1); int?[] bz_ = [ by_, @@ -1237,7 +1237,7 @@ object az_((CqlInterval interval, int? days)? @this) CqlInterval bc_ = bb_?.interval; CqlInterval bd_ = this.DateTime_Interval_Set_Nulls_to_Zero(bc_); CqlDateTime be_ = context.Operators.End(bd_); - int? bf_ = context.Operators.DurationBetween(aw_, be_, null); + int? bf_ = context.Operators.DurationBetween(aw_, be_, "day"); int? bg_ = context.Operators.Add(bf_, 1); int?[] bh_ = [ bg_, @@ -1298,29 +1298,29 @@ object az_((CqlInterval interval, int? days)? @this) [CqlDeclaration("Convert To UTC DateTime")] public CqlDateTime Convert_To_UTC_DateTime(CqlDate d) { - int? a_ = context.Operators.DateTimeComponentFrom(d, null); + int? a_ = context.Operators.DateTimeComponentFrom(d, "year"); int? b_() { - if ((context.Operators.DateTimeComponentFrom(d, null) is null)) + if ((context.Operators.DateTimeComponentFrom(d, "month") is null)) { return 0; } else { - int? i_ = context.Operators.DateTimeComponentFrom(d, null); + int? i_ = context.Operators.DateTimeComponentFrom(d, "month"); return i_; } }; int? c_() { - if ((context.Operators.DateTimeComponentFrom(d, null) is null)) + if ((context.Operators.DateTimeComponentFrom(d, "day") is null)) { return 0; } else { - int? j_ = context.Operators.DateTimeComponentFrom(d, null); + int? j_ = context.Operators.DateTimeComponentFrom(d, "day"); return j_; } 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 da117db7f..6a5777636 100644 --- a/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs +++ b/Demo/Measures.Demo/CSharp/PrimaryCariesPreventionasOfferedbyPCPsincludingDentistsFHIR-0.0.008.g.cs @@ -306,14 +306,14 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "month"); bool? i_ = context.Operators.GreaterOrEqual(h_, 6); Date k_ = a_?.BirthDateElement; string l_ = k_?.Value; CqlDate m_ = context.Operators.ConvertStringToDate(l_); CqlDateTime o_ = context.Operators.Start(e_); CqlDate p_ = context.Operators.DateFrom(o_); - int? q_ = context.Operators.CalculateAgeAt(m_, p_, null); + int? q_ = context.Operators.CalculateAgeAt(m_, p_, "year"); bool? r_ = context.Operators.Less(q_, 20); bool? s_ = context.Operators.And(i_, r_); IEnumerable t_ = this.Qualifying_Encounters(); @@ -358,14 +358,14 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "month"); bool? i_ = context.Operators.GreaterOrEqual(h_, 6); Date k_ = a_?.BirthDateElement; string l_ = k_?.Value; CqlDate m_ = context.Operators.ConvertStringToDate(l_); CqlDateTime o_ = context.Operators.Start(e_); CqlDate p_ = context.Operators.DateFrom(o_); - int? q_ = context.Operators.CalculateAgeAt(m_, p_, null); + int? q_ = context.Operators.CalculateAgeAt(m_, p_, "year"); bool? r_ = context.Operators.LessOrEqual(q_, 4); bool? s_ = context.Operators.And(i_, r_); @@ -385,7 +385,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(5, 11, true, true); bool? j_ = context.Operators.In(h_, i_, null); @@ -405,7 +405,7 @@ public IEnumerable Qualifying_Encounters() => CqlInterval e_ = this.Measurement_Period(); CqlDateTime f_ = context.Operators.Start(e_); CqlDate g_ = context.Operators.DateFrom(f_); - int? h_ = context.Operators.CalculateAgeAt(d_, g_, null); + int? h_ = context.Operators.CalculateAgeAt(d_, g_, "year"); CqlInterval i_ = context.Operators.Interval(12, 20, true, false); bool? j_ = context.Operators.In(h_, i_, null); 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 e6073aec7..fdf6d01be 100644 --- a/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs +++ b/Demo/Measures.Demo/CSharp/SafeUseofOpioidsConcurrentPrescribingFHIR-0.0.012.g.cs @@ -201,7 +201,7 @@ private IEnumerable Inpatient_Encounter_with_Age_Greater_than_or_Equa CqlInterval i_ = FHIRHelpers_4_0_001.ToInterval(h_); CqlDateTime j_ = context.Operators.Start(i_); CqlDate k_ = context.Operators.DateFrom(j_); - int? l_ = context.Operators.CalculateAgeAt(g_, k_, null); + int? l_ = context.Operators.CalculateAgeAt(g_, k_, "year"); bool? m_ = context.Operators.GreaterOrEqual(l_, 18); Code n_ = EncounterInpatient?.StatusElement; string o_ = FHIRHelpers_4_0_001.ToString(n_); 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 d59120fe0..e0d0b60be 100644 --- a/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs +++ b/Demo/Measures.Demo/CSharp/TJCOverallFHIR-1.8.000.g.cs @@ -250,7 +250,7 @@ private IEnumerable Non_Elective_Inpatient_Encounter_Value() CqlInterval j_ = FHIRHelpers_4_0_001.ToInterval(e_); CqlDateTime k_ = context.Operators.End(j_); CqlInterval l_ = this.Measurement_Period(); - bool? m_ = context.Operators.In(k_, l_, null); + bool? m_ = context.Operators.In(k_, l_, "day"); bool? n_ = context.Operators.And(h_, m_); return n_; @@ -306,7 +306,7 @@ IEnumerable b_(Encounter AllStrokeEncounter) Period m_ = AllStrokeEncounter?.Period; CqlInterval n_ = FHIRHelpers_4_0_001.ToInterval(m_); CqlDateTime o_ = context.Operators.Start(n_); - int? p_ = context.Operators.CalculateAgeAt(l_, o_, null); + int? p_ = context.Operators.CalculateAgeAt(l_, o_, "year"); bool? q_ = context.Operators.GreaterOrEqual(p_, 18); return q_;