fixing views after moving test_subject_boolean to baseline_data table

neurobooth · Jan 10, 2025 · caa03e7 · caa03e7
1 parent 0968e37
commit caa03e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/neurobooth_terra/views/sql/rc_demographic_clean.sql b/neurobooth_terra/views/sql/rc_demographic_clean.sql
@@ -13,7 +13,7 @@ SELECT
     dem.redcap_event_name,
     (regexp_match(REPLACE(dem.redcap_event_name, 'enrollment', 'v1'), 'v(\d+)_arm_\d+'))[1]::int AS redcap_sequence_num,
 	(regexp_match(REPLACE(dem.redcap_event_name, 'enrollment', 'v1'), 'v\d+_arm_(\d+)'))[1]::int AS redcap_study_arm,
-    pinfo.test_subject_boolean,
+    bdata.test_subject_boolean,
     CASE
         WHEN dem.demographic_complete = 2 THEN TRUE
         ELSE FALSE
@@ -152,6 +152,8 @@ SELECT
 FROM rc_demographic dem
 RIGHT OUTER JOIN rc_participant_and_consent_information pinfo
     ON dem.subject_id = pinfo.subject_id  -- Should by a many-to-one join
+RIGHT OUTER JOIN rc_baseline_data bdata
+    ON dem.subject_id = bdata.subject_id
 LEFT OUTER JOIN subject subj
     ON pinfo.subject_id = subj.subject_id
 ORDER BY

diff --git a/neurobooth_terra/views/sql/v_longitudinal_summary.sql b/neurobooth_terra/views/sql/v_longitudinal_summary.sql
@@ -27,7 +27,7 @@ WITH latest_diagnosis AS (
 		MAX(visit.neurobooth_visit_dates) AS last_visit,
 		MAX(visit.neurobooth_visit_dates) - MIN(visit.neurobooth_visit_dates) AS total_days
 	FROM rc_visit_dates visit
-	JOIN rc_participant_and_consent_information subj_info
+	JOIN rc_baseline_data subj_info
 		ON visit.subject_id = subj_info.subject_id
 	WHERE subj_info.test_subject_boolean = FALSE
 	GROUP BY