Skip to content
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

Moh 706 report #2057

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Moh 706 report #2057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125d8f3
add mappings for 706 report dsds
Injiri Nov 12, 2024
2e6e7e8
add util methode for the age dimension, and append to 706 cohortDsd
Injiri Nov 16, 2024
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
55 changes: 48 additions & 7 deletions api/src/main/java/org/openmrs/module/kenyaemr/reporting/MohReportUtils/ReportingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,34 +9,38 @@
*/
package org.openmrs.module.kenyaemr.reporting.MohReportUtils;

import org.openmrs.module.reporting.cohort.definition.AgeCohortDefinition;
import org.openmrs.module.reporting.cohort.definition.CohortDefinition;
import org.openmrs.module.reporting.cohort.definition.SqlCohortDefinition;
import org.openmrs.module.reporting.dataset.definition.CohortIndicatorDataSetDefinition;
import org.openmrs.module.reporting.evaluation.parameter.Mapped;
import org.openmrs.module.reporting.evaluation.parameter.Parameter;
import org.openmrs.module.reporting.indicator.CohortIndicator;
import org.openmrs.module.reporting.indicator.dimension.CohortDefinitionDimension;
import org.openmrs.module.reporting.query.encounter.definition.EncounterQuery;
import org.openmrs.module.reporting.query.encounter.definition.SqlEncounterQuery;

import java.util.Date;
import java.util.List;

import static org.openmrs.module.kenyacore.report.ReportUtils.map;

public class ReportingUtils {

public ReportingUtils() {
}

public static CohortIndicator cohortIndicator(String name, Mapped<CohortDefinition> cohort) {
CohortIndicator ind = new CohortIndicator(name);
ind.addParameter(new Parameter("startDate", "Start Date", Date.class));
ind.addParameter(new Parameter("endDate", "End Date", Date.class));
ind.setCohortDefinition(cohort);
return ind;
}

/**
* Adds a row to a dataset based on an indicator and a list of column parameters
*
*
* @param cohortDsd the dataset
* @param baseName the base columm name
* @param baseLabel the base column label
Expand All @@ -45,14 +49,14 @@ public static CohortIndicator cohortIndicator(String name, Mapped<CohortDefiniti
*/
public static void addRow(CohortIndicatorDataSetDefinition cohortDsd, String baseName, String baseLabel,
Mapped<CohortIndicator> indicator, List<ColumnParameters> columns) {

for (ColumnParameters column : columns) {
String name = baseName + "-" + column.getColumn();
String label = baseLabel + " (" + column.getLabel() + ")";
cohortDsd.addColumn(name, label, indicator, column.getDimensions());
}
}

public static EncounterQuery getEncounterLimitsByDate() {
SqlEncounterQuery query = new SqlEncounterQuery();
query.setName("Encounter per the given date");
Expand Down Expand Up @@ -96,5 +100,42 @@ public static CohortDefinition reAttendances(String age) {
cd.setDescription("Patients who are revisit attendances");
return cd;
}


/**
* Get age based on the based on DOB and context date
*
* @return @{@link org.openmrs.module.reporting.indicator.dimension.CohortDimension}
*/
public static CohortDefinitionDimension getAge() {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think there should be this util method already. @patryllus kindly confirm.

CohortDefinitionDimension dim = new CohortDefinitionDimension();
dim.addParameter(new Parameter("effectiveDate", "Effective Date", Date.class));
dim.setName("Patient age - dim");
dim.addCohortDefinition("<5", map(createXtoYAgeCohort(0, 4), "effectiveDate=${effectiveDate}"));
dim.addCohortDefinition(">5", map(createXtoYAgeCohort(5, 59), "effectiveDate=${effectiveDate}"));
dim.addCohortDefinition(">60", map(createXtoYAgeCohort(60, 600), "effectiveDate=${effectiveDate}"));
return dim;
}


/**
* Get patients dimesion age
*
* @param minAge
* @param maxAge
* @return
*/
public static CohortDefinition createXtoYAgeCohort(Integer minAge, Integer maxAge) {
AgeCohortDefinition xToYCohort = new AgeCohortDefinition();
xToYCohort.setName("age");
if (minAge != null) {
xToYCohort.setMinAge(minAge);
}
if (maxAge != null) {
xToYCohort.setMaxAge(maxAge);
}
xToYCohort.addParameter(new Parameter("effectiveDate", "effectiveDate", Date.class));
return xToYCohort;
}


}
Loading