Merge pull request #1941 from patryllus/bugFix/ml-date-created

TxCURR Risk score, categorization and evaluation date: Casted date_created
palladiumkenya · Jul 2, 2024 · bc4d31b · bc4d31b
2 parents b8715ec + 6b8bce0
commit bc4d31b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/...eporting/data/converter/definition/evaluator/art/LastRiskCategorizationDataEvaluator.java b/...eporting/data/converter/definition/evaluator/art/LastRiskCategorizationDataEvaluator.java
@@ -37,7 +37,7 @@ public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationC
 
         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" +
+			"from kenyaemr_ml_patient_risk_score ml where date(ml.date_created) <= date(:endDate)\n" +
 			"GROUP BY ml.patient_id;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();

diff --git a/...eporting/data/converter/definition/evaluator/art/LastRiskEvaluationDateDataEvaluator.java b/...eporting/data/converter/definition/evaluator/art/LastRiskEvaluationDateDataEvaluator.java
@@ -38,7 +38,7 @@ public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationC
 
         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" +
+			"from kenyaemr_ml_patient_risk_score ml where date(ml.date_created) <= date(:endDate)\n" +
 			"GROUP BY ml.patient_id;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();

diff --git a/...enyaemr/reporting/data/converter/definition/evaluator/art/LastRiskScoreDataEvaluator.java b/...enyaemr/reporting/data/converter/definition/evaluator/art/LastRiskScoreDataEvaluator.java
@@ -37,7 +37,7 @@ public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationC
 
         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" +
+			"        from kenyaemr_ml_patient_risk_score ml where date(ml.date_created) <= date(:endDate)\n" +
 			"        GROUP BY ml.patient_id;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();