Merge pull request #197 from OHSUCMP/max-age-100

Change max age to 100 and over.

input/cql/Hypertension.cql

@@ -35,7 +35,7 @@ define "Meets Inclusion Criteria":
 
 define "Meets Exclusion Criteria":
   Common."Patient Under Age 18"
-    or Common."Patient Over Age 80"
+    or Common."Patient Over Age 100"
     or exists Common."Condition Indicating End Stage Renal Disease"
     or exists Common."Condition Indicating Pregnancy"
 
@@ -112,7 +112,7 @@ define "Exclusion Reason":
       'Patient was excluded from initial diagnosis of hypertension due to '
       + (
           if Common."Patient Under Age 18" then 'being under the age of 18.'
-          else if Common."Patient Over Age 80" then 'being over the age of 80.'
+          else if Common."Patient Over Age 100" then 'being over the age of 80.'
           else if exists Common."Condition Indicating End Stage Renal Disease" then 'having end stage renal disease.'
           else if exists Common."Condition Indicating Pregnancy" then 'being pregnant.'
           else if Common."HTN Crisis" then 'a recent high blood pressure warning.'

input/cql/Monitoring.cql

@@ -30,7 +30,7 @@ define "Meets Inclusion Criteria":
 
 define "Meets Exclusion Criteria":
   Common."Patient Under Age 18"
-    or Common."Patient Over Age 80"
+    or Common."Patient Over Age 100"
     or exists Common."Condition Indicating End Stage Renal Disease"
     or exists Common."Condition Indicating Pregnancy"
 
@@ -78,21 +78,6 @@ define "Links":
   else if not Common."Has 12 Home BPs" then '[{"label":"Bell 2021: The potential for overdiagnosis and underdiagnosis because of blood pressure variability: a comparison of the 2017 ACC/AHA, 2018 ESC/ESH and 2019 NICE hypertension guidelines", "url":"https://pubmed.ncbi.nlm.nih.gov/32773652/"}]'
   else '[]'
 
-define "Exclusion Reason":
-  if "Meets Exclusion Criteria" then
-    (
-      'Patient was excluded from monitoring of hypertension due to '
-      + (
-          if Common."Patient Under Age 18" then 'being under the age of 18.'
-          else if Common."Patient Over Age 80" then 'being over the age of 80.'
-          else if exists Common."Condition Indicating End Stage Renal Disease" then 'having end stage renal disease.'
-          else if exists Common."Condition Indicating Pregnancy" then 'being pregnant.'
-          else if Common."HTN Crisis" then 'a recent high blood pressure warning.'
-          else ''
-        )
-    )
-  else ''
-
 define "No Entry into Population":
   not "Meets Inclusion Criteria"
     and not "Meets Exclusion Criteria"

input/cql/NonPharmacologicIntervention.cql

@@ -59,7 +59,7 @@ define "Meets Inclusion Criteria":
 
 define "Meets Exclusion Criteria":
   Common."Patient Under Age 18"
-    or Common."Patient Over Age 80"
+    or Common."Patient Over Age 100"
     or exists Common."Condition Indicating End Stage Renal Disease"
     or exists Common."Condition Indicating Pregnancy"
 
@@ -284,21 +284,6 @@ define "Physical Activity Indicator Status":
   if exists "Physical Activity Goals Needing Update" then 'warning'
   else 'info'
 
-define "Exclusion Reason":
-  if "Meets Exclusion Criteria" then
-    (
-      'Patient was excluded from non-pharmacologic interventions for hypertension due to '
-      + (
-          if Common."Patient Under Age 18" then 'being under the age of 18.'
-          else if Common."Patient Over Age 80" then 'being over the age of 80.'
-          else if exists Common."Condition Indicating End Stage Renal Disease" then 'having end stage renal disease.'
-          else if exists Common."Condition Indicating Pregnancy" then 'being pregnant.'
-          else if Common."HTN Crisis" then 'a recent high blood pressure warning.'
-          else ''
-        )
-    )
-  else ''
-
 /* Non-Pharmacologic Interventions Workflow */
 define "Goals":
   (Common.QualifiedGoal(["Goal"])) Goal where Goal.lifecycleStatus = 'active'
@@ -473,3 +458,6 @@ define "TEST Get Average All BP Last 2 Years":
 
 define "TEST Get Average Most Recent BP Set":
   Common."Avg BP"(Common."Most Recent BP Set")
+
+define "TEST Exclusion":
+  Common."Patient Under Age 18"

input/cql/OHSUHTNCommon.cql

@@ -347,8 +347,8 @@ define function "Prevalence Period"(condition Condition):
 define "Patient Under Age 18":
   AgeInYearsAt(Today()) < 18
 
-define "Patient Over Age 80":
-  AgeInYearsAt(Today()) > 80
+define "Patient Over Age 100":
+  AgeInYearsAt(Today()) >= 100
 
 // Grab all conditions for patients since we can't limit by code in Epic.
 define "Conditions":
@@ -458,10 +458,10 @@ define "Most Recent BP Reading":
   Last("All BP Observations" O sort by effective)
 
 define "HTN High Crisis":
-  "HTN Crisis BP"("Most Recent BP Reading")
+  "Most Recent BP Reading" is not null and "HTN Crisis BP"("Most Recent BP Reading")
 
 define "HTN Low Crisis":
-  "HTN Low Crisis BP"("Most Recent BP Reading")
+  "Most Recent BP Reading" is not null and "HTN Low Crisis BP"("Most Recent BP Reading")
 
 define "HTN Crisis":
   "HTN High Crisis" or "HTN Low Crisis"

input/cql/Pharma.cql

@@ -12,7 +12,7 @@ define "Meets Inclusion Criteria":
 
 define "Meets Exclusion Criteria":
   Common."Patient Under Age 18"
-    or Common."Patient Over Age 80"
+    or Common."Patient Over Age 100"
     or exists Common."Condition Indicating End Stage Renal Disease"
     or exists Common."Condition Indicating Pregnancy"
     or Common."HTN Crisis"