diff --git a/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.query.xml b/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.query.xml
index ba5b595d4..e5f63127d 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.query.xml
@@ -3,7 +3,7 @@
- Assignments created in past 24 hrs
+ Assignments created in the past 24 hrs
diff --git a/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.sql b/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.sql
index 8a09aa654..152a69e82 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentsCreatedInPast1Day.sql
@@ -1,3 +1,7 @@
+/* Created by Kollil, Dec, 2025
+ Tkt # 13618
+ Priority 1: Add Grid 1 ("Assignments Created in the Past Day ") to daily Behavior Alerts email - display full grid in email
+ */
SELECT
Id,
Id.demographics.gender as Sex,
@@ -16,4 +20,4 @@ SELECT
releaseCondition.meaning as ConditionAtRelease
FROM Assignment
-WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())
\ No newline at end of file
+WHERE CAST(created AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -1, CAST(NOW() AS DATE))
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.query.xml b/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.query.xml
index bc2343418..40c848da0 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.query.xml
@@ -3,7 +3,7 @@
- Assignments released in past 24 hrs
+ Assignments released in the past 24 hrs
diff --git a/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.sql b/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.sql
index b936474ae..f476894d3 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentsReleasedInPast1Day.sql
@@ -1,3 +1,8 @@
+/* Created by Kollil, Dec, 2025
+ Tkt # 13618
+ Priority 2: Create new Grid 2 (Assignments ended in the Past 1 Day):
+ - List of records with new “Release date” added within the last 24hrs (omitting day leases). I am not omitting day leases for now as per Isabel's request.
+*/
SELECT
Id,
Id.demographics.gender as Sex,
@@ -16,4 +21,9 @@ SELECT
releaseCondition.meaning as ConditionAtRelease
FROM Assignment
-WHERE CAST(enddate AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())
\ No newline at end of file
+/* this condition: >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW()) → not older than 24 hours
+and this one: <= NOW() → not in the future
+Together, they produce exactly the last 24 hours, nothing more.
+ */
+WHERE CAST(enddate AS DATE) = TIMESTAMPADD('SQL_TSI_DAY', -1, CAST(NOW() AS DATE))
+ AND CAST(enddate AS DATE) <= CAST(NOW() AS DATE)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.query.xml b/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.query.xml
index a65ccdd3d..d543e5816 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.query.xml
@@ -3,7 +3,7 @@
- Assignments started in past 1-7 days
+ Assignments started in the past 1-7 days
diff --git a/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.sql b/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.sql
index 020306760..1702ede9b 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentsStartedPast1to7Days.sql
@@ -1,3 +1,9 @@
+/* Created by Kollil, Dec, 2025
+ Tkt # 13618
+ Priority 4: Add links to grids 3 and 4 in daily Behavior Alerts email (do not need to display full grid in email)
+ - for grid 3 - There were __ assignments started in the past 1-7 days" with a link, including today's date
+
+ */
SELECT
Id,
Id.demographics.gender as Sex,
@@ -16,5 +22,10 @@ SELECT
releaseCondition.meaning as ConditionAtRelease
FROM Assignment
-WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())
- AND CAST(date AS DATE) < TIMESTAMPADD('SQL_TSI_DAY', -7, NOW())
\ No newline at end of file
+--including today
+WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -7, CAST(NOW() AS DATE))
+ AND CAST(date AS DATE) <= CAST(NOW() AS DATE);
+--excluding today
+-- WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', -1, NOW())
+-- AND CAST(date AS DATE) < TIMESTAMPADD('SQL_TSI_DAY', -7, NOW())
+
diff --git a/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.query.xml b/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.query.xml
index 165ef5863..bde8b09e6 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.query.xml
+++ b/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.query.xml
@@ -3,7 +3,7 @@
- Assignments starting in next 1 to 14 days
+ Assignments starting in the next 1 to 14 days
diff --git a/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.sql b/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.sql
index fcc73bac8..3dc0e61c6 100644
--- a/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.sql
+++ b/onprc_ehr/resources/queries/study/AssignmentsStartingNext1to14Days.sql
@@ -1,3 +1,9 @@
+/* Created by Kollil, Dec, 2025
+ Tkt # 13618
+ Priority 4: Add links to grids 3 and 4 in daily Behavior Alerts email (do not need to display full grid in email)
+ - for grid 4 - There are __ assignments starting in the Next 1-14 days" with a link, including today's date
+*/
+
SELECT
Id,
Id.demographics.gender as Sex,
@@ -16,5 +22,5 @@ SELECT
releaseCondition.meaning as ConditionAtRelease
FROM Assignment
-WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', 1, NOW())
- AND CAST(date AS DATE) < TIMESTAMPADD('SQL_TSI_DAY', 14, NOW())
\ No newline at end of file
+WHERE CAST(date AS DATE) >= TIMESTAMPADD('SQL_TSI_DAY', 1, CAST(NOW() AS DATE))
+ AND CAST(date AS DATE) <= TIMESTAMPADD('SQL_TSI_DAY', 14, CAST(NOW() AS DATE))
\ No newline at end of file