forked from I-TECH/openmrs-module-kenyaemr
-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1958 from njorocs/patients-scheduled-for-app-rpt
KHP3-6210:Refactor data fetch for next appointment date column. Chang…
- Loading branch information
Showing
3 changed files
with
110 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
...reporting/data/converter/definition/art/ETLNextAppointmentBetweenDatesDataDefinition.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.kenyaemr.reporting.data.converter.definition.art; | ||
|
|
||
| import org.openmrs.module.reporting.data.BaseDataDefinition; | ||
| import org.openmrs.module.reporting.data.person.definition.PersonDataDefinition; | ||
| import org.openmrs.module.reporting.definition.configuration.ConfigurationPropertyCachingStrategy; | ||
| import org.openmrs.module.reporting.evaluation.caching.Caching; | ||
|
|
||
| /** | ||
| * Next Appointment Data Definition | ||
| */ | ||
| @Caching(strategy=ConfigurationPropertyCachingStrategy.class) | ||
| public class ETLNextAppointmentBetweenDatesDataDefinition extends BaseDataDefinition implements PersonDataDefinition { | ||
|
|
||
| public static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Default Constructor | ||
| */ | ||
| public ETLNextAppointmentBetweenDatesDataDefinition() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor to populate name only | ||
| */ | ||
| public ETLNextAppointmentBetweenDatesDataDefinition(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| //***** INSTANCE METHODS ***** | ||
|
|
||
| /** | ||
| * @see org.openmrs.module.reporting.data.DataDefinition#getDataType() | ||
| */ | ||
| public Class<?> getDataType() { | ||
| return Double.class; | ||
| } | ||
| } |
56 changes: 56 additions & 0 deletions
56
.../data/converter/definition/evaluator/art/ETLNextAppointmentBetweenDatesDataEvaluator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| /** | ||
| * This Source Code Form is subject to the terms of the Mozilla Public License, | ||
| * v. 2.0. If a copy of the MPL was not distributed with this file, You can | ||
| * obtain one at http://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http://openmrs.org/license. | ||
| * | ||
| * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS | ||
| * graphic logo is a trademark of OpenMRS Inc. | ||
| */ | ||
| package org.openmrs.module.kenyaemr.reporting.data.converter.definition.evaluator.art; | ||
|
|
||
| import org.openmrs.annotation.Handler; | ||
| import org.openmrs.module.kenyaemr.reporting.data.converter.definition.art.ETLNextAppointmentBetweenDatesDataDefinition; | ||
| import org.openmrs.module.reporting.data.person.EvaluatedPersonData; | ||
| import org.openmrs.module.reporting.data.person.definition.PersonDataDefinition; | ||
| import org.openmrs.module.reporting.data.person.evaluator.PersonDataEvaluator; | ||
| import org.openmrs.module.reporting.evaluation.EvaluationContext; | ||
| import org.openmrs.module.reporting.evaluation.EvaluationException; | ||
| import org.openmrs.module.reporting.evaluation.querybuilder.SqlQueryBuilder; | ||
| import org.openmrs.module.reporting.evaluation.service.EvaluationService; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.Map; | ||
|
|
||
| /** | ||
| * Evaluates Next Appointment Data Definition | ||
| */ | ||
| @Handler(supports= ETLNextAppointmentBetweenDatesDataDefinition.class, order=50) | ||
| public class ETLNextAppointmentBetweenDatesDataEvaluator implements PersonDataEvaluator { | ||
|
|
||
| @Autowired | ||
| private EvaluationService evaluationService; | ||
|
|
||
| public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationContext context) throws EvaluationException { | ||
| EvaluatedPersonData c = new EvaluatedPersonData(definition, context); | ||
|
|
||
| String qry = "select patient_id,\n" + | ||
| " date(mid(max(concat(visit_date, next_appointment_date, '')), 11)) as next_appointment_date\n" + | ||
| "from kenyaemr_etl.etl_patient_hiv_followup\n" + | ||
| "where date(visit_date) <= date(:endDate)\n" + | ||
| " and next_appointment_date between date(:startDate) and date(:endDate)\n" + | ||
| "GROUP BY patient_id;"; | ||
|
|
||
| SqlQueryBuilder queryBuilder = new SqlQueryBuilder(); | ||
| queryBuilder.append(qry); | ||
| Date startDate = (Date)context.getParameterValue("startDate"); | ||
| Date endDate = (Date)context.getParameterValue("endDate"); | ||
| queryBuilder.addParameter("endDate", endDate); | ||
| queryBuilder.addParameter("startDate", startDate); | ||
|
|
||
| Map<Integer, Object> data = evaluationService.evaluateToMap(queryBuilder, Integer.class, Object.class, context); | ||
| c.setData(data); | ||
| return c; | ||
| } | ||
| } |