Improve SQL

Author: bbimber

SivStudies/resources/queries/study/infectionAnchorDateDiscordance.sql

@@ -1,16 +1,15 @@
 SELECT
-    t.Id,
+    coalesce(t.Id, t2.subjectId) as Id,
     'SIV Infection' as category,
     t.date as treatmentTableDate,
     t2.date as subjectAnchorDatesTableDate
 
 FROM study.treatments t
 FULL JOIN studies.subjectAnchorDates t2 ON (
-    t.category = 'SIV Infection' AND
-    t2.subjectId = t.Id AND
-    t2.eventLabel = 'SIV Infection'
+    t.category = t2.eventLabel AND
+    t2.subjectId = t.Id
 )
 
-WHERE t2.date != t.date OR
+WHERE (t2.date != t.date OR
     t2.date IS NULL OR
-    t.date IS NULL
+    t.date IS NULL) AND COALESCE(t.category, t2.eventLabel) = 'SIV Infection'