Accommodate NULL treatment-order enddates

LabKey · Dec 14, 2024 · 54be93a · 54be93a
1 parent 8923636
commit 54be93a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/onprc_ehr/resources/queries/study/TreatmentSchedulePostOps.sql b/onprc_ehr/resources/queries/study/TreatmentSchedulePostOps.sql
@@ -64,7 +64,7 @@ FROM (
     FROM ehr_lookups.dateRange dr
 
 Join study."Treatment Orders" t1
-    ON (dr.dateOnly >= t1.dateOnly and dr.dateOnly <= t1.enddateCoalesced AND
+    ON (dr.dateOnly >= t1.dateOnly AND (dr.dateOnly <= t1.enddate OR t1.enddate IS NULL) AND
         mod(CAST(timestampdiff('SQL_TSI_DAY', CAST(t1.dateOnly as timestamp), dr.dateOnly) as integer), t1.frequency.intervalindays) = 0
     )
 
@@ -93,7 +93,7 @@ WHERE t1.date is not null
 ) s ON (s.animalid = h.id)
    WHERE h.calculated_status = 'Alive'
    --account for date/time in schedule
-   and s.date >= s.startDate and s.date <= s.enddate
+   AND s.date >= s.startDate AND (s.date <= s.enddate OR s.enddate IS NULL)
 
 
 -- /*

diff --git a/onprc_ehr/resources/queries/study/treatmentScheduleMPA.sql b/onprc_ehr/resources/queries/study/treatmentScheduleMPA.sql
@@ -62,7 +62,7 @@ FROM study.demographics h JOIN (
         FROM ehr_lookups.dateRange dr
 
         Join study."Treatment Orders" t1
-        ON (dr.dateOnly >= t1.dateOnly and dr.dateOnly <= t1.enddateCoalesced AND
+        ON (dr.dateOnly >= t1.dateOnly AND (dr.dateOnly <= t1.enddate OR t1.enddate IS NULL) AND
         mod(CAST(timestampdiff('SQL_TSI_DAY', CAST(t1.dateOnly as timestamp), dr.dateOnly) as integer), t1.frequency.intervalindays) = 0
         )
 
@@ -92,4 +92,4 @@ WHERE h.calculated_status = 'Alive'
   --account for date/time in schedule
   --and s.date >= s.startDate and s.date <= s.enddate
   --Added the enddate = null clause by Kollil, 10/25/24. Refer to ticket #11471
-  and s.date >= s.startDate and (s.date <= s.enddate or s.enddate is null)
+  AND s.date >= s.startDate AND (s.date <= s.enddate OR s.enddate is null)
diff --git a/treatmentETL/resources/queries/study/treatmentScheduleUpdate.sql b/treatmentETL/resources/queries/study/treatmentScheduleUpdate.sql
@@ -85,7 +85,7 @@ FROM dateRangedata dr
 
 JOIN Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study."Treatment Orders" t1
   --NOTE: should the enddate consider date/time?
-  ON (dr.dateOnly >= t1.dateOnly and dr.dateOnly <= t1.enddateCoalesced AND
+  ON (dr.dateOnly >= t1.dateOnly AND (dr.dateOnly <= t1.enddate OR t1.enddate IS NULL) AND
       --technically the first day of the treatment is day 1, not day 0
       mod(CAST(timestampdiff('SQL_TSI_DAY', CAST(t1.dateOnly as timestamp), dr.dateOnly) as integer), t1.frequency.intervalindays) = 0
        OR (t1.frequency.dayofweek is not null And t1.frequency.intervalindays is null And dr.DayOfWeek in (select k.value from onprc_ehr.Frequency_DayofWeek k where k.FreqKey = t1.frequency.rowid ))
@@ -115,8 +115,5 @@ WHERE --d.calculated_status = 'Alive'
 
 --account for date/time in schedule
 --and
-s.date >= s.startDate
-    AND (
-        s.date <= s.enddate
-        OR s.enddate IS NULL   -- some treatment_orders can have NULL enddates
-    )
+s.date >= s.startDate AND (s.date <= s.enddate OR s.enddate IS NULL)   -- some treatment_orders can have NULL enddates
+