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 #1875 from patryllus/risk-Score-Tx-Curr
Added latest risk score, risk category and evaluation date to Active On ART linelist
- Loading branch information
Showing
8 changed files
with
316 additions
and
35 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
...enyaemr/reporting/data/converter/definition/art/LastRiskCategorizationDataDefinition.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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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; | ||
|
|
||
| /** | ||
| * Most current risk categorization | ||
| */ | ||
| @Caching(strategy=ConfigurationPropertyCachingStrategy.class) | ||
| public class LastRiskCategorizationDataDefinition extends BaseDataDefinition implements PersonDataDefinition { | ||
|
|
||
| public static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Default Constructor | ||
| */ | ||
| public LastRiskCategorizationDataDefinition() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor to populate name only | ||
| */ | ||
| public LastRiskCategorizationDataDefinition(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| //***** INSTANCE METHODS ***** | ||
|
|
||
| /** | ||
| * @see org.openmrs.module.reporting.data.DataDefinition#getDataType() | ||
| */ | ||
| public Class<?> getDataType() { | ||
| return Double.class; | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
...enyaemr/reporting/data/converter/definition/art/LastRiskEvaluationDateDataDefinition.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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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; | ||
|
|
||
| /** | ||
| * Most current risk evaluation date | ||
| */ | ||
| @Caching(strategy=ConfigurationPropertyCachingStrategy.class) | ||
| public class LastRiskEvaluationDateDataDefinition extends BaseDataDefinition implements PersonDataDefinition { | ||
|
|
||
| public static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Default Constructor | ||
| */ | ||
| public LastRiskEvaluationDateDataDefinition() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor to populate name only | ||
| */ | ||
| public LastRiskEvaluationDateDataDefinition(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| //***** INSTANCE METHODS ***** | ||
|
|
||
| /** | ||
| * @see org.openmrs.module.reporting.data.DataDefinition#getDataType() | ||
| */ | ||
| public Class<?> getDataType() { | ||
| return Double.class; | ||
| } | ||
| } |
47 changes: 47 additions & 0 deletions
47
.../module/kenyaemr/reporting/data/converter/definition/art/LastRiskScoreDataDefinition.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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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; | ||
|
|
||
| /** | ||
| * Most current risk score | ||
| */ | ||
| @Caching(strategy=ConfigurationPropertyCachingStrategy.class) | ||
| public class LastRiskScoreDataDefinition extends BaseDataDefinition implements PersonDataDefinition { | ||
|
|
||
| public static final long serialVersionUID = 1L; | ||
|
|
||
| /** | ||
| * Default Constructor | ||
| */ | ||
| public LastRiskScoreDataDefinition() { | ||
| super(); | ||
| } | ||
|
|
||
| /** | ||
| * Constructor to populate name only | ||
| */ | ||
| public LastRiskScoreDataDefinition(String name) { | ||
| super(name); | ||
| } | ||
|
|
||
| //***** INSTANCE METHODS ***** | ||
|
|
||
| /** | ||
| * @see org.openmrs.module.reporting.data.DataDefinition#getDataType() | ||
| */ | ||
| public Class<?> getDataType() { | ||
| return Double.class; | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...eporting/data/converter/definition/evaluator/art/LastRiskCategorizationDataEvaluator.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,53 @@ | ||
| /** | ||
| * 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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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.LastRiskCategorizationDataDefinition; | ||
| 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 LastRiskCategorizationDataDefinition | ||
| */ | ||
| @Handler(supports= LastRiskCategorizationDataDefinition.class, order=50) | ||
| public class LastRiskCategorizationDataEvaluator implements PersonDataEvaluator { | ||
|
|
||
| @Autowired | ||
| private EvaluationService evaluationService; | ||
|
|
||
| public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationContext context) throws EvaluationException { | ||
| EvaluatedPersonData c = new EvaluatedPersonData(definition, context); | ||
|
|
||
| String qry = "select ml.patient_id,\n" + | ||
| " mid(max(concat(ml.date_created ,concat(ml.description ))),20) as risk_score\n" + | ||
| "from kenyaemr_ml_patient_risk_score ml where ml.date_created <= date(:endDate)\n" + | ||
| "GROUP BY ml.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; | ||
| } | ||
| } |
54 changes: 54 additions & 0 deletions
54
...eporting/data/converter/definition/evaluator/art/LastRiskEvaluationDateDataEvaluator.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,54 @@ | ||
| /** | ||
| * 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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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.LastRiskCategorizationDataDefinition; | ||
| import org.openmrs.module.kenyaemr.reporting.data.converter.definition.art.LastRiskEvaluationDateDataDefinition; | ||
| 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 LastRiskCategorizationDataDefinition | ||
| */ | ||
| @Handler(supports= LastRiskEvaluationDateDataDefinition.class, order=50) | ||
| public class LastRiskEvaluationDateDataEvaluator implements PersonDataEvaluator { | ||
|
|
||
| @Autowired | ||
| private EvaluationService evaluationService; | ||
|
|
||
| public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationContext context) throws EvaluationException { | ||
| EvaluatedPersonData c = new EvaluatedPersonData(definition, context); | ||
|
|
||
| String qry = "select ml.patient_id,\n" + | ||
| " mid(max(concat(ml.date_created ,NULLIF(concat(date(ml.evaluation_date)),'0000-00-00'))),20) as evaluation_date\n" + | ||
| "from kenyaemr_ml_patient_risk_score ml where ml.date_created <= date(:endDate)\n" + | ||
| "GROUP BY ml.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; | ||
| } | ||
| } |
53 changes: 53 additions & 0 deletions
53
...enyaemr/reporting/data/converter/definition/evaluator/art/LastRiskScoreDataEvaluator.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,53 @@ | ||
| /** | ||
| * 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:https://mozilla.org/MPL/2.0/. OpenMRS is also distributed under | ||
| * the terms of the Healthcare Disclaimer located at http:https://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.LastRiskScoreDataDefinition; | ||
| 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 LastRiskScoreDataDefinition | ||
| */ | ||
| @Handler(supports= LastRiskScoreDataDefinition.class, order=50) | ||
| public class LastRiskScoreDataEvaluator implements PersonDataEvaluator { | ||
|
|
||
| @Autowired | ||
| private EvaluationService evaluationService; | ||
|
|
||
| public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationContext context) throws EvaluationException { | ||
| EvaluatedPersonData c = new EvaluatedPersonData(definition, context); | ||
|
|
||
| String qry = "select ml.patient_id,\n" + | ||
| " mid(max(concat(ml.date_created ,concat(ml.risk_score ))),20) as risk_score\n" + | ||
| " from kenyaemr_ml_patient_risk_score ml where ml.date_created <= date(:endDate)\n" + | ||
| " GROUP BY ml.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; | ||
| } | ||
| } |
Binary file modified
BIN
-17 KB
(40%)
omod/src/main/webapp/resources/reports/active_on_art_linelist.xls
Binary file not shown.