From 705b90913884924013d38e70bac4a29526f11e50 Mon Sep 17 00:00:00 2001
From: mzntlamelle <32940027+mzntlamelle@users.noreply.github.com>
Date: Wed, 13 May 2026 16:05:57 +0200
Subject: [PATCH] Update date range condition in SQL queries

---
 .../sql/hts_pitc_hiv_status_with_history_pivot.sql        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/openmrs/apps/reports/sql/hts_pitc_hiv_status_with_history_pivot.sql b/openmrs/apps/reports/sql/hts_pitc_hiv_status_with_history_pivot.sql
index 244ce06..60ad9c8 100644
--- a/openmrs/apps/reports/sql/hts_pitc_hiv_status_with_history_pivot.sql
+++ b/openmrs/apps/reports/sql/hts_pitc_hiv_status_with_history_pivot.sql
@@ -29,7 +29,7 @@ FROM (
         ON tr.person_id = p.person_id
         AND tr.concept_id = 2165
         AND tr.voided = 0
-        AND tr.obs_datetime >= CAST('#startDate#' AS DATE) AND tr.obs_datetime <= CAST('#endDate#' AS DATE)
+        AND tr.obs_datetime >= CAST('#startDate#' AS DATE) AND tr.obs_datetime < DATE_ADD(CAST('#endDate#' AS DATE), INTERVAL 1 DAY)
 
     -- Require PITC selected in same encounter
     JOIN obs pitc
@@ -57,7 +57,7 @@ FROM (
             FROM obs
             WHERE concept_id = 4798
               AND voided = 0
-              AND obs_datetime >= CAST('#startDate#' AS DATE) AND obs_datetime <= CAST('#endDate#' AS DATE)
+              AND obs_datetime >= CAST('#startDate#' AS DATE) AND obs_datetime < DATE_ADD(CAST('#endDate#' AS DATE), INTERVAL 1 DAY)
             GROUP BY person_id
         ) latest
             ON latest.person_id = o.person_id
@@ -108,7 +108,7 @@ FROM (
         ON tr.person_id = p.person_id
         AND tr.concept_id = 2165
         AND tr.voided = 0
-        AND tr.obs_datetime >= CAST('#startDate#' AS DATE) AND tr.obs_datetime <= CAST('#endDate#' AS DATE)
+        AND tr.obs_datetime >= CAST('#startDate#' AS DATE) AND tr.obs_datetime < DATE_ADD(CAST('#endDate#' AS DATE), INTERVAL 1 DAY)
 
     -- Require PITC selected in same encounter
     JOIN obs pitc
@@ -136,7 +136,7 @@ FROM (
             FROM obs
             WHERE concept_id = 4798
               AND voided = 0
-            AND obs_datetime >= CAST('#startDate#' AS DATE) AND obs_datetime <= CAST('#endDate#' AS DATE)
+            AND obs_datetime >= CAST('#startDate#' AS DATE) AND obs_datetime < DATE_ADD(CAST('#endDate#' AS DATE), INTERVAL 1 DAY)
 
     GROUP BY person_id
         ) latest