Updated PR reviews: Report title and firmed up the appointment and sc…

…hedule date to join on encounter
palladiumkenya · Jul 26, 2024 · 4b1da2f · 4b1da2f
1 parent c6f5105
commit 4b1da2f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.../converter/definition/evaluator/art/PatientAppointmentScheduledDateDateDataEvaluator.java b/.../converter/definition/evaluator/art/PatientAppointmentScheduledDateDateDataEvaluator.java
@@ -41,8 +41,9 @@ public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationC
 			"    date(mid(max(concat(pp.date_created,pp.date_appointment_scheduled, '' )),20)) as scheduled_date\n" +
 			"from patient_appointment pp\n" +
 			"         inner join person d on d.person_id=pp.patient_id and d.voided=0\n" +
-			"where pp.appointment_service_id = 1\n" +
-			"  and date(pp.date_created)  <= date(:endDate)\n" +
+			"             inner join encounter e on e.patient_id = pp.patient_id\n" +
+			"where pp.appointment_service_id = 1 and date(e.encounter_datetime) = date(pp.date_appointment_scheduled)\n" +
+			"  and date(pp.date_created) <= date(:endDate)\n" +
 			"group by pp.patient_id,pp.date_appointment_scheduled;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();

diff --git a/...rting/data/converter/definition/evaluator/art/PatientAppointmentTCADateDataEvaluator.java b/...rting/data/converter/definition/evaluator/art/PatientAppointmentTCADateDataEvaluator.java
@@ -39,10 +39,11 @@ public EvaluatedPersonData evaluate(PersonDataDefinition definition, EvaluationC
         String qry = "select\n" +
 			"    pp.patient_id,\n" +
 			"    date(mid(max(concat(pp.date_created,pp.start_date_time, '' )),20)) as next_appointment_date\n" +
-			"    from patient_appointment pp\n" +
+			"from patient_appointment pp\n" +
 			"         inner join person d on d.person_id=pp.patient_id and d.voided=0\n" +
-			"where pp.appointment_service_id = 1\n" +
-			"and date(pp.date_created)   <= date(:endDate)\n" +
+			"         inner join encounter e on e.patient_id = pp.patient_id\n" +
+			"where pp.appointment_service_id = 1  and date(e.encounter_datetime) = date(pp.date_appointment_scheduled)\n" +
+			"  and date(pp.date_created) <= date(:endDate)\n" +
 			"group by pp.patient_id,pp.start_date_time;";
 
         SqlQueryBuilder queryBuilder = new SqlQueryBuilder();

diff --git a/api/src/main/resources/content/kenyaemr.hiv.xml b/api/src/main/resources/content/kenyaemr.hiv.xml
@@ -483,7 +483,7 @@
 
 	<bean id="kenyaemr.hiv.report.appointmentsTracker" class="org.openmrs.module.kenyacore.report.HybridReportDescriptor">
 		<property name="targetUuid" value="71d06cae-7b11-43b2-9c69-5559813ece66" />
-		<property name="name" value="Appointment Tracking report" />
+		<property name="name" value="Appointment Documentation Tracking" />
 		<property name="description" value="Provides a list of patients who had a visit and appointment dates documented" />
 		<property name="apps"><set><ref bean="kenyaemr.app.reports" /></set></property>
 	</bean>