Skip to content

Update date range condition in SQL queries #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mzntlamelle wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update date range condition in SQL queries #301

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions openmrs/apps/reports/sql/hts_pitc_hiv_status_with_history_pivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down