regression/template test tweak

smart-on-fhir · Feb 1, 2024 · ff299df · ff299df
1 parent 936dc2d
commit ff299df
Show file tree

Hide file tree

Showing 5 changed files with 11,234 additions and 11,234 deletions.
diff --git a/cumulus_library/studies/core/count_core.py b/cumulus_library/studies/core/count_core.py
@@ -12,7 +12,7 @@ def count_core_condition(self, duration: str = "month"):
         cols = [
             ["category_code", "varchar", "cond_category_code"],
             [f"recorded_{duration}", "date", "cond_month"],
-            ["code_display", "varchar", None],
+            ["code_display", "varchar", "cond_code_display"],
         ]
         return self.count_condition(table_name, from_table, cols)
 

diff --git a/cumulus_library/studies/core/reference_sql/count_core.sql b/cumulus_library/studies/core/reference_sql/count_core.sql
@@ -15,7 +15,7 @@ CREATE TABLE core__count_condition_month AS (
             --noqa: disable=RF03, AL02
             s."category_code" AS cond_category_code,
             s."recorded_month" AS cond_month,
-            s."code_display"
+            s."code_display" AS cond_code_display
             --noqa: enable=RF03, AL02
         FROM core__condition AS s
     ),
@@ -33,29 +33,29 @@ CREATE TABLE core__count_condition_month AS (
                 'cumulus__none'
             ) AS cond_month,
             coalesce(
-                cast(code_display AS varchar),
+                cast(cond_code_display AS varchar),
                 'cumulus__none'
-            ) AS code_display
+            ) AS cond_code_display
         FROM filtered_table
     ),
     secondary_powerset AS (
         SELECT
             count(DISTINCT encounter_ref) AS cnt_encounter_ref,
             "cond_category_code",
             "cond_month",
-            "code_display",
+            "cond_code_display",
             concat_ws(
                 '-',
                 COALESCE("cond_category_code",''),
                 COALESCE("cond_month",''),
-                COALESCE("code_display",'')
+                COALESCE("cond_code_display",'')
             ) AS id
         FROM null_replacement
         GROUP BY
             cube(
             "cond_category_code",
             "cond_month",
-            "code_display"
+            "cond_code_display"
             )
     ),
 
@@ -64,27 +64,27 @@ CREATE TABLE core__count_condition_month AS (
             count(DISTINCT subject_ref) AS cnt_subject_ref,
             "cond_category_code",
             "cond_month",
-            "code_display",
+            "cond_code_display",
             concat_ws(
                 '-',
                 COALESCE("cond_category_code",''),
                 COALESCE("cond_month",''),
-                COALESCE("code_display",'')
+                COALESCE("cond_code_display",'')
             ) AS id
         FROM null_replacement
         GROUP BY
             cube(
             "cond_category_code",
             "cond_month",
-            "code_display"
+            "cond_code_display"
             )
     )
 
     SELECT
         s.cnt_encounter_ref AS cnt,
         p."cond_category_code",
         p."cond_month",
-        p."code_display"
+        p."cond_code_display"
     FROM powerset AS p
     JOIN secondary_powerset AS s on s.id = p.id
     WHERE