Skip to content

Commit

Permalink
Regenerate C# based on corrections of precisionSpecified fix in PR #441
Browse files Browse the repository at this point in the history
  • Loading branch information
baseTwo committed Aug 5, 2024
1 parent 7b98046 commit ba160a1
Show file tree
Hide file tree
Showing 81 changed files with 503 additions and 499 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ private IEnumerable<Encounter> Qualifying_Encounter_during_day_of_Measurement_Pe
CqlInterval<CqlDateTime> i_ = this.Measurement_Period();
Period j_ = ValidEncounter?.Period;
CqlInterval<CqlDateTime> k_ = FHIRHelpers_4_3_000.ToInterval(j_);
bool? l_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(i_, k_, null);
bool? l_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(i_, k_, "day");
bool? m_ = context.Operators.And(h_, l_);

return m_;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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_;
}
Expand Down
8 changes: 4 additions & 4 deletions Demo/Measures.Authoring/CSharp/QICoreCommon-2.0.000.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<int?> d_ = context.Operators.Interval(1, c_, true, true);
CqlInterval<int?>[] e_ = [
d_,
Expand All @@ -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<int?> d_ = context.Operators.Interval(1, c_, true, true);
CqlInterval<int?>[] e_ = [
d_,
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions Demo/Measures.CMS/CSharp/AHAOverall-2.6.000.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ public IEnumerable<Encounter> Qualifying_Outpatient_Encounter_During_Measurement
CqlInterval<CqlDateTime> 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<Encounter> j_ = this.Qualifying_Outpatient_Encounter_During_Measurement_Period();
IEnumerable<Encounter> k_(Encounter Encounter1)
Expand Down Expand Up @@ -749,7 +749,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) =>
CqlDateTime f_ = context.Operators.Convert<CqlDateTime>(e_);
Period g_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> h_ = FHIRHelpers_4_3_000.ToInterval(g_);
bool? i_ = context.Operators.In<CqlDateTime>(f_, h_, null);
bool? i_ = context.Operators.In<CqlDateTime>(f_, h_, "day");
Code<MedicationRequest.MedicationrequestStatus> j_ = Order?.StatusElement;
MedicationRequest.MedicationrequestStatus? k_ = j_?.Value;
string l_ = context.Operators.Convert<string>(k_);
Expand Down Expand Up @@ -794,7 +794,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) =>
CqlInterval<CqlDateTime> e_ = QICoreCommon_2_0_000.prevalenceInterval(Diagnosis);
Period f_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> 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_);

Expand All @@ -819,7 +819,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) =>
CqlInterval<CqlDateTime> f_ = QICoreCommon_2_0_000.prevalenceInterval((Event as Condition));
Period g_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> 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_);

Expand All @@ -832,7 +832,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) =>
CqlInterval<CqlDateTime> n_ = QICoreCommon_2_0_000.toInterval(m_);
Period o_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> p_ = FHIRHelpers_4_3_000.ToInterval(o_);
bool? q_ = context.Operators.OverlapsAfter(n_, p_, null);
bool? q_ = context.Operators.OverlapsAfter(n_, p_, "day");
Code<EventStatus> r_ = (Event as Procedure)?.StatusElement;
EventStatus? s_ = r_?.Value;
string t_ = context.Operators.Convert<string>(s_);
Expand All @@ -852,7 +852,7 @@ Procedure k_(Encounter ModerateOrSevereLVSDHFOutpatientEncounter) =>
CqlInterval<CqlDateTime> ac_ = context.Operators.Interval(z_, ab_, true, true);
Period ad_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> 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();
Expand Down Expand Up @@ -962,7 +962,7 @@ object cc_(CqlInterval<CqlDateTime> @this)
CqlInterval<CqlDateTime> ce_ = context.Operators.First<CqlInterval<CqlDateTime>>(cd_);
Period cf_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> cg_ = FHIRHelpers_4_3_000.ToInterval(cf_);
bool? ch_ = context.Operators.OverlapsAfter(ce_, cg_, null);
bool? ch_ = context.Operators.OverlapsAfter(ce_, cg_, "day");
Code<MedicationRequest.MedicationrequestStatus> ci_ = (Event as MedicationRequest)?.StatusElement;
MedicationRequest.MedicationrequestStatus? cj_ = ci_?.Value;
string ck_ = context.Operators.Convert<string>(cj_);
Expand Down Expand Up @@ -999,7 +999,7 @@ object cc_(CqlInterval<CqlDateTime> @this)
CqlInterval<CqlDateTime> do_ = QICoreCommon_2_0_000.toInterval(dn_);
Period dp_ = ModerateOrSevereLVSDHFOutpatientEncounter?.Period;
CqlInterval<CqlDateTime> dq_ = FHIRHelpers_4_3_000.ToInterval(dp_);
bool? dr_ = context.Operators.OverlapsAfter(do_, dq_, null);
bool? dr_ = context.Operators.OverlapsAfter(do_, dq_, "day");
Code<ObservationStatus> ds_ = (Event as Observation)?.StatusElement;
ObservationStatus? dt_ = ds_?.Value;
string du_ = context.Operators.Convert<string>(dt_);
Expand Down
2 changes: 1 addition & 1 deletion Demo/Measures.CMS/CSharp/ALARACTOQRFHIR-0.1.001.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ private IEnumerable<Observation> 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_);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ private IEnumerable<Encounter> Qualifying_Encounters_Value()
Period y_ = ValidEncounter?.Period;
CqlInterval<CqlDateTime> z_ = FHIRHelpers_4_3_000.ToInterval(y_);
CqlInterval<CqlDateTime> aa_ = QICoreCommon_2_0_000.toInterval((z_ as object));
bool? ab_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(x_, aa_, null);
bool? ab_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(x_, aa_, "day");

return ab_;
};
Expand Down
28 changes: 14 additions & 14 deletions Demo/Measures.CMS/CSharp/AdvancedIllnessandFrailty-1.8.000.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ public Patient Patient() =>
FhirDateTime ap_ = FrailtyDeviceOrder?.AuthoredOnElement;
CqlDateTime aq_ = context.Operators.Convert<CqlDateTime>(ap_);
CqlInterval<CqlDateTime> ar_ = QICoreCommon_2_0_000.toInterval((aq_ as object));
bool? as_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(ao_, ar_, null);
bool? as_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(ao_, ar_, "day");
bool? at_ = context.Operators.And(an_, as_);

return at_;
Expand All @@ -292,7 +292,7 @@ public Patient Patient() =>
CqlInterval<CqlDateTime> ba_ = QICoreCommon_2_0_000.toInterval(az_);
CqlDateTime bb_ = context.Operators.End(ba_);
CqlInterval<CqlDateTime> bc_ = this.Measurement_Period();
bool? bd_ = context.Operators.In<CqlDateTime>(bb_, bc_, null);
bool? bd_ = context.Operators.In<CqlDateTime>(bb_, bc_, "day");
bool? be_ = context.Operators.And(ax_, bd_);

return be_;
Expand All @@ -306,7 +306,7 @@ public Patient Patient() =>
{
CqlInterval<CqlDateTime> bf_ = QICoreCommon_2_0_000.prevalenceInterval(FrailtyDiagnosis);
CqlInterval<CqlDateTime> bg_ = this.Measurement_Period();
bool? bh_ = context.Operators.Overlaps(bf_, bg_, null);
bool? bh_ = context.Operators.Overlaps(bf_, bg_, "day");

return bh_;
};
Expand All @@ -322,7 +322,7 @@ public Patient Patient() =>
CqlInterval<CqlDateTime> bj_ = FHIRHelpers_4_3_000.ToInterval(bi_);
CqlInterval<CqlDateTime> bk_ = QICoreCommon_2_0_000.toInterval((bj_ as object));
CqlInterval<CqlDateTime> bl_ = this.Measurement_Period();
bool? bm_ = context.Operators.Overlaps(bk_, bl_, null);
bool? bm_ = context.Operators.Overlaps(bk_, bl_, "day");

return bm_;
};
Expand All @@ -338,7 +338,7 @@ public Patient Patient() =>
object bo_ = FHIRHelpers_4_3_000.ToValue(bn_);
CqlInterval<CqlDateTime> bp_ = QICoreCommon_2_0_000.toInterval(bo_);
CqlInterval<CqlDateTime> bq_ = this.Measurement_Period();
bool? br_ = context.Operators.Overlaps(bp_, bq_, null);
bool? br_ = context.Operators.Overlaps(bp_, bq_, "day");

return br_;
};
Expand Down Expand Up @@ -391,7 +391,7 @@ private IEnumerable<Encounter> Outpatient_Encounters_with_Advanced_Illness_Value
CqlDateTime z_ = context.Operators.Subtract(x_, y_);
CqlDateTime ab_ = context.Operators.End(w_);
CqlInterval<CqlDateTime> ac_ = context.Operators.Interval(z_, ab_, true, true);
bool? ad_ = context.Operators.In<CqlDateTime>(v_, ac_, null);
bool? ad_ = context.Operators.In<CqlDateTime>(v_, ac_, "day");
bool? ae_ = context.Operators.And(r_, ad_);

return ae_;
Expand Down Expand Up @@ -426,7 +426,7 @@ public IEnumerable<Encounter> 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_;
};
Expand Down Expand Up @@ -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<CqlDateTime> u_ = context.Operators.Interval(r_, t_, true, true);
bool? v_ = context.Operators.In<CqlDateTime>(n_, u_, null);
bool? v_ = context.Operators.In<CqlDateTime>(n_, u_, "day");
bool? w_ = context.Operators.And(j_, v_);

return w_;
Expand Down Expand Up @@ -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<CqlDateTime> 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_;
Expand All @@ -538,7 +538,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t
CqlInterval<CqlDateTime> 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_);
Expand All @@ -565,7 +565,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t
CqlInterval<CqlDateTime> 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<int?> i_ = context.Operators.Interval(66, 80, true, true);
bool? j_ = context.Operators.In<int?>(h_, i_, null);
bool? k_ = this.Has_Criteria_Indicating_Frailty();
Expand All @@ -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_);
Expand All @@ -602,7 +602,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t
CqlInterval<CqlDateTime> 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<CqlCode> k_ = context.Operators.ToList<CqlCode>(j_);
Expand All @@ -616,7 +616,7 @@ Encounter h_((Encounter OutpatientEncounter1, Encounter OutpatientEncounter2)? t
CqlDateTime ab_ = context.Operators.End(aa_);
CqlInterval<CqlDateTime> 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_;
};
Expand Down
2 changes: 1 addition & 1 deletion Demo/Measures.CMS/CSharp/AlaraCTFHIR-0.1.001.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ private IEnumerable<Observation> 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_);

Expand Down
2 changes: 1 addition & 1 deletion Demo/Measures.CMS/CSharp/AlaraCTIQRFHIR-0.1.000.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private IEnumerable<Encounter> 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_);

Expand Down
4 changes: 2 additions & 2 deletions Demo/Measures.CMS/CSharp/Antibiotic-1.5.000.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ IEnumerable<Encounter> a_(Encounter eDate)
CqlQuantity q_ = context.Operators.Quantity(3m, "days");
CqlDateTime r_ = context.Operators.Add(p_, q_);
CqlInterval<CqlDateTime> s_ = context.Operators.Interval(m_, r_, true, true);
bool? t_ = context.Operators.In<CqlDateTime>(j_, s_, null);
bool? t_ = context.Operators.In<CqlDateTime>(j_, s_, "day");
CqlInterval<CqlDateTime> v_ = FHIRHelpers_4_3_000.ToInterval(k_);
CqlDateTime w_ = context.Operators.Start(v_);
bool? x_ = context.Operators.Not((bool?)(w_ is null));
Expand Down Expand Up @@ -228,7 +228,7 @@ Timing j_(Dosage @this)
CqlInterval<CqlDate> ch_ = context.Operators.Interval(bz_, cg_, true, true);
bool? ci_ = ch_?.highClosed;
CqlInterval<CqlDateTime> 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_;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ private CqlDateTime April_30_of_the_Measurement_Period_Value()
{
CqlInterval<CqlDateTime> 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_);

Expand All @@ -254,7 +254,7 @@ private CqlDateTime May_1_of_the_Year_Prior_to_the_Measurement_Period_Value()
{
CqlInterval<CqlDateTime> 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_);
Expand Down Expand Up @@ -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<CqlDateTime> r_ = this.Intake_Period();
bool? s_ = context.Operators.In<CqlDateTime>(q_, r_, null);
bool? s_ = context.Operators.In<CqlDateTime>(q_, r_, "day");

return s_;
};
Expand Down Expand Up @@ -423,7 +423,7 @@ public IEnumerable<Encounter> 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_);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ CqlConcept y_(CodeableConcept @this)
Period ai_ = ValidEncounters?.Period;
CqlInterval<CqlDateTime> aj_ = FHIRHelpers_4_3_000.ToInterval(ai_);
CqlInterval<CqlDateTime> ak_ = QICoreCommon_2_0_000.ToInterval((aj_ as object));
bool? al_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(ah_, ak_, null);
bool? al_ = context.Operators.IntervalIncludesInterval<CqlDateTime>(ah_, ak_, "day");

return al_;
};
Expand All @@ -824,7 +824,7 @@ public IEnumerable<Encounter> Qualifying_Encounter() =>
CqlInterval<CqlDateTime> 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<int?> i_ = context.Operators.Interval(50, 63, true, true);
bool? j_ = context.Operators.In<int?>(h_, i_, null);
Code<AdministrativeGender> l_ = a_?.GenderElement;
Expand Down Expand Up @@ -1224,7 +1224,7 @@ public IEnumerable<Condition> DiagnosisInPatientHistory(IEnumerable<Condition> C
CqlDateTime d_ = context.Operators.Start(c_);
CqlInterval<CqlDateTime> 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_;
};
Expand All @@ -1245,7 +1245,7 @@ public IEnumerable<Procedure> ProcedureInPatientHistory(IEnumerable<Procedure> P
CqlDateTime g_ = context.Operators.End(f_);
CqlInterval<CqlDateTime> 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_;
};
Expand Down
Loading

0 comments on commit ba160a1

Please sign in to comment.