From 7be3cd8fbf7566b497deac0306214c4611b0b3cd Mon Sep 17 00:00:00 2001 From: Simao Mazive Date: Thu, 16 Jan 2020 09:16:44 +0200 Subject: [PATCH] Include Date for next Drug Pickup --- openmrs/apps/reports/sql/Patient_With_ARV_Drug_Pickups.sql | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/openmrs/apps/reports/sql/Patient_With_ARV_Drug_Pickups.sql b/openmrs/apps/reports/sql/Patient_With_ARV_Drug_Pickups.sql index 90b99cf37..45bd98362 100644 --- a/openmrs/apps/reports/sql/Patient_With_ARV_Drug_Pickups.sql +++ b/openmrs/apps/reports/sql/Patient_With_ARV_Drug_Pickups.sql @@ -12,7 +12,8 @@ SELECT DISTINCT 'Sim' END AS "Levantou ARV (S/N)", -DATE_FORMAT(edo.dispensed_date,'%d-%m-%Y') AS "Data do Levantamento" +DATE_FORMAT(edo.dispensed_date,'%d-%m-%Y') AS "Data do Levantamento", +DATE_FORMAT(papp.start_date_time, '%d-%m-%Y') as "Data do Próximo Levantamento" FROM (SELECT @rownum:=0) as initialization, person p @@ -41,4 +42,8 @@ and edo.dispensed=1 and edo.arv_dispensed=1 AND edo.dispensed_date IS NOT NULL AND CAST(edo.dispensed_date AS DATE) BETWEEN '#startDate#' AND '#endDate#' +LEFT JOIN +patient_appointment papp +ON papp.patient_id = p.person_id +AND papp.appointment_service_id = 5 ;