Skip to content

Add age parameter #34

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
Sep 29, 2025
Merged

Add age parameter #34

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
19 changes: 11 additions & 8 deletions api/src/main/java/org/openmrs/module/drcreports/reports/DRCArtAbandonmentReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ public ReportDefinition constructReportDefinition() {
Map<String, Object> parameterMappings = new HashMap<String, Object>();
parameterMappings.put("onOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

SqlCohortDefinition sqd = new SqlCohortDefinition();

// ART plan -> Started drugs
Expand Down Expand Up @@ -159,7 +162,7 @@ public ReportDefinition constructReportDefinition() {
under1y.setMaxAge(11);
under1y.setMaxAgeUnit(DurationUnit.MONTHS);
under1y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col4, createCohortComposition(under1y), null);
artAbandonment.addColumn(col4, createCohortComposition(under1y), ageParameterMappings);

// 1-4 years
AgeCohortDefinition _1To4y = new AgeCohortDefinition();
Expand All @@ -168,7 +171,7 @@ public ReportDefinition constructReportDefinition() {
_1To4y.setMaxAge(4);
_1To4y.setMaxAgeUnit(DurationUnit.YEARS);
_1To4y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col5, createCohortComposition(_1To4y), null);
artAbandonment.addColumn(col5, createCohortComposition(_1To4y), ageParameterMappings);

// 5-9 years
AgeCohortDefinition _5To9y = new AgeCohortDefinition();
Expand All @@ -177,7 +180,7 @@ public ReportDefinition constructReportDefinition() {
_5To9y.setMaxAge(9);
_5To9y.setMaxAgeUnit(DurationUnit.YEARS);
_5To9y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col6, createCohortComposition(_5To9y), null);
artAbandonment.addColumn(col6, createCohortComposition(_5To9y), ageParameterMappings);

// 10-14 years
AgeCohortDefinition _10To14y = new AgeCohortDefinition();
Expand All @@ -186,7 +189,7 @@ public ReportDefinition constructReportDefinition() {
_10To14y.setMaxAge(14);
_10To14y.setMaxAgeUnit(DurationUnit.YEARS);
_10To14y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col7, createCohortComposition(_10To14y), null);
artAbandonment.addColumn(col7, createCohortComposition(_10To14y), ageParameterMappings);

// 15-19 years
AgeCohortDefinition _15To19y = new AgeCohortDefinition();
Expand All @@ -195,7 +198,7 @@ public ReportDefinition constructReportDefinition() {
_15To19y.setMaxAge(19);
_15To19y.setMaxAgeUnit(DurationUnit.YEARS);
_15To19y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col8, createCohortComposition(_15To19y), null);
artAbandonment.addColumn(col8, createCohortComposition(_15To19y), ageParameterMappings);

// 20-24 years
AgeCohortDefinition _20To24y = new AgeCohortDefinition();
Expand All @@ -204,7 +207,7 @@ public ReportDefinition constructReportDefinition() {
_20To24y.setMaxAge(24);
_20To24y.setMaxAgeUnit(DurationUnit.YEARS);
_20To24y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col9, createCohortComposition(_20To24y), null);
artAbandonment.addColumn(col9, createCohortComposition(_20To24y), ageParameterMappings);

// 25-49 years
AgeCohortDefinition _25To49y = new AgeCohortDefinition();
Expand All @@ -213,7 +216,7 @@ public ReportDefinition constructReportDefinition() {
_25To49y.setMaxAge(49);
_25To49y.setMaxAgeUnit(DurationUnit.YEARS);
_25To49y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col10, createCohortComposition(_25To49y), null);
artAbandonment.addColumn(col10, createCohortComposition(_25To49y), ageParameterMappings);

// 50+ years
AgeCohortDefinition _50andAbove = new AgeCohortDefinition();
Expand All @@ -222,7 +225,7 @@ public ReportDefinition constructReportDefinition() {
_50andAbove.setMaxAge(200);
_50andAbove.setMaxAgeUnit(DurationUnit.YEARS);
_50andAbove.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artAbandonment.addColumn(col11, createCohortComposition(_50andAbove), null);
artAbandonment.addColumn(col11, createCohortComposition(_50andAbove), ageParameterMappings);

return rd;
}
Expand Down
20 changes: 12 additions & 8 deletions api/src/main/java/org/openmrs/module/drcreports/reports/DRCArtDeathReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ public ReportDefinition constructReportDefinition() {
Map<String, Object> parameterMappings = new HashMap<String, Object>();
parameterMappings.put("onOrAfter", "${startDate}");
parameterMappings.put("onOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

SqlCohortDefinition sqd = new SqlCohortDefinition();

// Death Date in range
Expand Down Expand Up @@ -155,7 +159,7 @@ public ReportDefinition constructReportDefinition() {
under1y.setMaxAge(11);
under1y.setMaxAgeUnit(DurationUnit.MONTHS);
under1y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col4, createCohortComposition(under1y), null);
artDeath.addColumn(col4, createCohortComposition(under1y), ageParameterMappings);

// 1-4 years
AgeCohortDefinition _1To4y = new AgeCohortDefinition();
Expand All @@ -164,7 +168,7 @@ public ReportDefinition constructReportDefinition() {
_1To4y.setMaxAge(4);
_1To4y.setMaxAgeUnit(DurationUnit.YEARS);
_1To4y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col5, createCohortComposition(_1To4y), null);
artDeath.addColumn(col5, createCohortComposition(_1To4y), ageParameterMappings);

// 5-9 years
AgeCohortDefinition _5To9y = new AgeCohortDefinition();
Expand All @@ -173,7 +177,7 @@ public ReportDefinition constructReportDefinition() {
_5To9y.setMaxAge(9);
_5To9y.setMaxAgeUnit(DurationUnit.YEARS);
_5To9y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col6, createCohortComposition(_5To9y), null);
artDeath.addColumn(col6, createCohortComposition(_5To9y), ageParameterMappings);

// 10-14 years
AgeCohortDefinition _10To14y = new AgeCohortDefinition();
Expand All @@ -182,7 +186,7 @@ public ReportDefinition constructReportDefinition() {
_10To14y.setMaxAge(14);
_10To14y.setMaxAgeUnit(DurationUnit.YEARS);
_10To14y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col7, createCohortComposition(_10To14y), null);
artDeath.addColumn(col7, createCohortComposition(_10To14y), ageParameterMappings);

// 15-19 years
AgeCohortDefinition _15To19y = new AgeCohortDefinition();
Expand All @@ -191,7 +195,7 @@ public ReportDefinition constructReportDefinition() {
_15To19y.setMaxAge(19);
_15To19y.setMaxAgeUnit(DurationUnit.YEARS);
_15To19y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col8, createCohortComposition(_15To19y), null);
artDeath.addColumn(col8, createCohortComposition(_15To19y), ageParameterMappings);

// 20-24 years
AgeCohortDefinition _20To24y = new AgeCohortDefinition();
Expand All @@ -200,7 +204,7 @@ public ReportDefinition constructReportDefinition() {
_20To24y.setMaxAge(24);
_20To24y.setMaxAgeUnit(DurationUnit.YEARS);
_20To24y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col9, createCohortComposition(_20To24y), null);
artDeath.addColumn(col9, createCohortComposition(_20To24y), ageParameterMappings);

// 25-49 years
AgeCohortDefinition _25To49y = new AgeCohortDefinition();
Expand All @@ -209,7 +213,7 @@ public ReportDefinition constructReportDefinition() {
_25To49y.setMaxAge(49);
_25To49y.setMaxAgeUnit(DurationUnit.YEARS);
_25To49y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col10, createCohortComposition(_25To49y), null);
artDeath.addColumn(col10, createCohortComposition(_25To49y), ageParameterMappings);

// 50+ years
AgeCohortDefinition _50andAbove = new AgeCohortDefinition();
Expand All @@ -218,7 +222,7 @@ public ReportDefinition constructReportDefinition() {
_50andAbove.setMaxAge(200);
_50andAbove.setMaxAgeUnit(DurationUnit.YEARS);
_50andAbove.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artDeath.addColumn(col11, createCohortComposition(_50andAbove), null);
artDeath.addColumn(col11, createCohortComposition(_50andAbove), ageParameterMappings);

return rd;
}
Expand Down
11 changes: 7 additions & 4 deletions .../org/openmrs/module/drcreports/reports/DRCArtFirstLineBelowFifteenYearsReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,9 @@ public ReportDefinition constructReportDefinition() {
parameterMappings.put("onOrAfter", "${startDate}");
parameterMappings.put("onOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

SqlCohortDefinition sqd = new SqlCohortDefinition();

// Visit in range
Expand Down Expand Up @@ -201,7 +204,7 @@ public ReportDefinition constructReportDefinition() {
under1y.setMaxAge(11);
under1y.setMaxAgeUnit(DurationUnit.MONTHS);
under1y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineBelowFifteenYears.addColumn(col4, createCohortComposition(under1y), null);
artFirstLineBelowFifteenYears.addColumn(col4, createCohortComposition(under1y), ageParameterMappings);

// 1-4 years
AgeCohortDefinition _1To4y = new AgeCohortDefinition();
Expand All @@ -210,7 +213,7 @@ public ReportDefinition constructReportDefinition() {
_1To4y.setMaxAge(4);
_1To4y.setMaxAgeUnit(DurationUnit.YEARS);
_1To4y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineBelowFifteenYears.addColumn(col5, createCohortComposition(_1To4y), null);
artFirstLineBelowFifteenYears.addColumn(col5, createCohortComposition(_1To4y), ageParameterMappings);

// 5-9 years
AgeCohortDefinition _5To9y = new AgeCohortDefinition();
Expand All @@ -219,7 +222,7 @@ public ReportDefinition constructReportDefinition() {
_5To9y.setMaxAge(9);
_5To9y.setMaxAgeUnit(DurationUnit.YEARS);
_5To9y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineBelowFifteenYears.addColumn(col6, createCohortComposition(_5To9y), null);
artFirstLineBelowFifteenYears.addColumn(col6, createCohortComposition(_5To9y), ageParameterMappings);

// 10-14 years
AgeCohortDefinition _10To14y = new AgeCohortDefinition();
Expand All @@ -228,7 +231,7 @@ public ReportDefinition constructReportDefinition() {
_10To14y.setMaxAge(14);
_10To14y.setMaxAgeUnit(DurationUnit.YEARS);
_10To14y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineBelowFifteenYears.addColumn(col7, createCohortComposition(_10To14y), null);
artFirstLineBelowFifteenYears.addColumn(col7, createCohortComposition(_10To14y), ageParameterMappings);

return rd;
}
Expand Down
11 changes: 7 additions & 4 deletions ...g/openmrs/module/drcreports/reports/DRCArtFirstLineFifteenYearsAndAboveReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@ public ReportDefinition constructReportDefinition() {
parameterMappings.put("onOrAfter", "${startDate}");
parameterMappings.put("onOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

SqlCohortDefinition sqd = new SqlCohortDefinition();

// Visit in range
Expand Down Expand Up @@ -186,7 +189,7 @@ public ReportDefinition constructReportDefinition() {
_15To19y.setMaxAge(19);
_15To19y.setMaxAgeUnit(DurationUnit.YEARS);
_15To19y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineFifteenYearsAndAbove.addColumn(col8, createCohortComposition(_15To19y), null);
artFirstLineFifteenYearsAndAbove.addColumn(col8, createCohortComposition(_15To19y), ageParameterMappings);

// 20-24 years
AgeCohortDefinition _20To24y = new AgeCohortDefinition();
Expand All @@ -195,7 +198,7 @@ public ReportDefinition constructReportDefinition() {
_20To24y.setMaxAge(24);
_20To24y.setMaxAgeUnit(DurationUnit.YEARS);
_20To24y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineFifteenYearsAndAbove.addColumn(col9, createCohortComposition(_20To24y), null);
artFirstLineFifteenYearsAndAbove.addColumn(col9, createCohortComposition(_20To24y), ageParameterMappings);

// 25-49 years
AgeCohortDefinition _25To49y = new AgeCohortDefinition();
Expand All @@ -204,7 +207,7 @@ public ReportDefinition constructReportDefinition() {
_25To49y.setMaxAge(49);
_25To49y.setMaxAgeUnit(DurationUnit.YEARS);
_25To49y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineFifteenYearsAndAbove.addColumn(col10, createCohortComposition(_25To49y), null);
artFirstLineFifteenYearsAndAbove.addColumn(col10, createCohortComposition(_25To49y), ageParameterMappings);

// 50+ years
AgeCohortDefinition _50andAbove = new AgeCohortDefinition();
Expand All @@ -213,7 +216,7 @@ public ReportDefinition constructReportDefinition() {
_50andAbove.setMaxAge(200);
_50andAbove.setMaxAgeUnit(DurationUnit.YEARS);
_50andAbove.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artFirstLineFifteenYearsAndAbove.addColumn(col11, createCohortComposition(_50andAbove), null);
artFirstLineFifteenYearsAndAbove.addColumn(col11, createCohortComposition(_50andAbove), ageParameterMappings);

return rd;
}
Expand Down
7 changes: 5 additions & 2 deletions api/src/main/java/org/openmrs/module/drcreports/reports/DRCArtHepatitisReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,9 @@ public ReportDefinition constructReportDefinition() {
parameterMappings.put("startedOnOrAfter", "${startDate}");
parameterMappings.put("startedOnOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

// Current visit in date range
VisitCohortDefinition visits = new VisitCohortDefinition();
visits.setVisitTypeList(vs.getAllVisitTypes(false));
Expand Down Expand Up @@ -215,7 +218,7 @@ public ReportDefinition constructReportDefinition() {
_0To14y.setMaxAge(14);
_0To14y.setMaxAgeUnit(DurationUnit.YEARS);
_0To14y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artHepatitis.addColumn(col4, createCohortComposition(_0To14y), null);
artHepatitis.addColumn(col4, createCohortComposition(_0To14y), ageParameterMappings);

// 15+ years
AgeCohortDefinition _15andAbove = new AgeCohortDefinition();
Expand All @@ -224,7 +227,7 @@ public ReportDefinition constructReportDefinition() {
_15andAbove.setMaxAge(200);
_15andAbove.setMaxAgeUnit(DurationUnit.YEARS);
_15andAbove.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artHepatitis.addColumn(col5, createCohortComposition(_15andAbove), null);
artHepatitis.addColumn(col5, createCohortComposition(_15andAbove), ageParameterMappings);

return rd;
}
Expand Down
21 changes: 12 additions & 9 deletions api/src/main/java/org/openmrs/module/drcreports/reports/DRCArtPdvReportManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public class DRCArtPdvReportManager extends ActivatedReportManager {
@Override
public boolean isActivated() {
return inizService.getBooleanFromKey("report.drc.artPdvReport.active", true);

}

@Override
Expand Down Expand Up @@ -115,6 +115,9 @@ public ReportDefinition constructReportDefinition() {
Map<String, Object> parameterMappings = new HashMap<String, Object>();
parameterMappings.put("onOrBefore", "${endDate}");

Map<String, Object> ageParameterMappings = new HashMap<String, Object>();
ageParameterMappings.put("effectiveDate", "${endDate}");

SqlCohortDefinition sqd = new SqlCohortDefinition();

// ART plan -> Started drugs
Expand Down Expand Up @@ -158,7 +161,7 @@ public ReportDefinition constructReportDefinition() {
under1y.setMaxAge(11);
under1y.setMaxAgeUnit(DurationUnit.MONTHS);
under1y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col4, createCohortComposition(under1y), null);
artPDV.addColumn(col4, createCohortComposition(under1y), ageParameterMappings);

// 1-4 years
AgeCohortDefinition _1To4y = new AgeCohortDefinition();
Expand All @@ -167,7 +170,7 @@ public ReportDefinition constructReportDefinition() {
_1To4y.setMaxAge(4);
_1To4y.setMaxAgeUnit(DurationUnit.YEARS);
_1To4y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col5, createCohortComposition(_1To4y), null);
artPDV.addColumn(col5, createCohortComposition(_1To4y), ageParameterMappings);

// 5-9 years
AgeCohortDefinition _5To9y = new AgeCohortDefinition();
Expand All @@ -176,7 +179,7 @@ public ReportDefinition constructReportDefinition() {
_5To9y.setMaxAge(9);
_5To9y.setMaxAgeUnit(DurationUnit.YEARS);
_5To9y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col6, createCohortComposition(_5To9y), null);
artPDV.addColumn(col6, createCohortComposition(_5To9y), ageParameterMappings);

// 10-14 years
AgeCohortDefinition _10To14y = new AgeCohortDefinition();
Expand All @@ -185,7 +188,7 @@ public ReportDefinition constructReportDefinition() {
_10To14y.setMaxAge(14);
_10To14y.setMaxAgeUnit(DurationUnit.YEARS);
_10To14y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col7, createCohortComposition(_10To14y), null);
artPDV.addColumn(col7, createCohortComposition(_10To14y), ageParameterMappings);

// 15-19 years
AgeCohortDefinition _15To19y = new AgeCohortDefinition();
Expand All @@ -194,7 +197,7 @@ public ReportDefinition constructReportDefinition() {
_15To19y.setMaxAge(19);
_15To19y.setMaxAgeUnit(DurationUnit.YEARS);
_15To19y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col8, createCohortComposition(_15To19y), null);
artPDV.addColumn(col8, createCohortComposition(_15To19y), ageParameterMappings);

// 20-24 years
AgeCohortDefinition _20To24y = new AgeCohortDefinition();
Expand All @@ -203,7 +206,7 @@ public ReportDefinition constructReportDefinition() {
_20To24y.setMaxAge(24);
_20To24y.setMaxAgeUnit(DurationUnit.YEARS);
_20To24y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col9, createCohortComposition(_20To24y), null);
artPDV.addColumn(col9, createCohortComposition(_20To24y), ageParameterMappings);

// 25-49 years
AgeCohortDefinition _25To49y = new AgeCohortDefinition();
Expand All @@ -212,7 +215,7 @@ public ReportDefinition constructReportDefinition() {
_25To49y.setMaxAge(49);
_25To49y.setMaxAgeUnit(DurationUnit.YEARS);
_25To49y.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col10, createCohortComposition(_25To49y), null);
artPDV.addColumn(col10, createCohortComposition(_25To49y), ageParameterMappings);

// 50+ years
AgeCohortDefinition _50andAbove = new AgeCohortDefinition();
Expand All @@ -221,7 +224,7 @@ public ReportDefinition constructReportDefinition() {
_50andAbove.setMaxAge(200);
_50andAbove.setMaxAgeUnit(DurationUnit.YEARS);
_50andAbove.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
artPDV.addColumn(col11, createCohortComposition(_50andAbove), null);
artPDV.addColumn(col11, createCohortComposition(_50andAbove), ageParameterMappings);

return rd;
}
Expand Down
Loading