Correct naming error and trial all diseases

opensafely · Jan 1, 2025 · e7ff87b · e7ff87b
1 parent 7b975c5
commit e7ff87b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/analysis/dataset_definition.py b/analysis/dataset_definition.py
@@ -112,8 +112,8 @@ def preceding_registration(dx_date):
 )  
 
 # List of diseases and codelists to cycle through
-diseases = ["dementia", "stroke"]
-# diseases = ["asthma", "copd", "chd", "stroke", "heart_failure", "dementia", "multiple_sclerosis", "epilepsy", "crohns_disease", "ulcerative_colitis", "dm_type2", "dm_type1", "ckd", "psoriasis", "atopic_dermatitis", "osteoporosis", "hiv", "depression", "coeliac", "pmr"]
+# diseases = ["asthma", "copd", "chd", "stroke", "heart_failure"]
+diseases = ["asthma", "copd", "chd", "stroke", "heart_failure", "dementia", "multiple_sclerosis", "epilepsy", "crohns_disease", "ulcerative_colitis", "dm_type2", "dm_type1", "ckd", "psoriasis", "atopic_dermatitis", "osteoporosis", "hiv", "depression", "coeliac", "pmr"]
 codelist_types = ["snomed", "icd", "resolved"]
 
 for disease in diseases:

diff --git a/analysis/dataset_definition_measures.py b/analysis/dataset_definition_measures.py
@@ -162,7 +162,7 @@ def preceding_registration(dx_date):
 
     # Prevalence
     measures.define_measure(
-        name=disease + "_prevalence",
+        name=f"{disease}_prevalence",
         numerator=prev_numerators[f"{disease}_prev_num"],
         denominator=prev_denominators[f"{disease}_prev_denom"],
         intervals=years(intervals_years).starting_on(start_date),
@@ -174,7 +174,7 @@ def preceding_registration(dx_date):
 
     # Incidence by age and sex
     measures.define_measure(
-        name=disease + "_incidence",
+        name=f"{disease}_incidence",
         numerator=incidence_numerators[f"{disease}_inc_num"],
         denominator=incidence_denominators[f"{disease}_inc_denom"],
         group_by={