Skip to content

Add range to death date #35

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

Merged
ibacher merged 1 commit into from
Nov 24, 2025
Merged

Add range to death date #35

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions api/src/main/java/org/openmrs/module/drcreports/reports/DRCTxCurrReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,8 @@ public ReportDefinition constructReportDefinition() {
SqlCohortDefinition liveSqlCD = new SqlCohortDefinition();
String liveSql = getStringFromResource("org/openmrs/module/drcreports/sql/DRCLivePatients.sql");
liveSqlCD.setQuery(liveSql);
liveSqlCD.addParameter(new Parameter("onOrAfter", "On Or After", Date.class));
liveSqlCD.addParameter(new Parameter("onOrBefore", "On Or Before", Date.class));

// Not stopped ART in date range
SqlCohortDefinition notStoppedARTSqlCD = new SqlCohortDefinition();
Expand Down
3 changes: 2 additions & 1 deletion api/src/main/resources/org/openmrs/module/drcreports/sql/DRCLivePatients.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,13 @@ INNER JOIN person pe ON p.patient_id = pe.person_id
WHERE pe.voided = 0
AND p.voided = 0
AND NOT EXISTS (
-- Check that patient does NOT have death date observation
-- Check that patient does NOT have death date observation in the date range
SELECT 1
FROM obs o
INNER JOIN concept c ON o.concept_id = c.concept_id
WHERE o.person_id = p.patient_id
AND o.voided = 0
AND c.uuid = '1543AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA'
AND DATE(o.value_datetime) BETWEEN :onOrAfter AND :onOrBefore
)
ORDER BY p.patient_id;