DRC-7: Add missed appointments report as initial work for Treatment interruptions and loss of follow-up #8
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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,90 @@ | ||
| package org.openmrs.module.commonreports.reports; | ||
|
|
||
| import static org.openmrs.module.commonreports.common.Helper.getStringFromResource; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.HashMap; | ||
| import java.util.Date; | ||
|
|
||
| import org.openmrs.module.commonreports.ActivatedReportManager; | ||
| import org.openmrs.module.initializer.api.InitializerService; | ||
| import org.openmrs.module.reporting.common.MessageUtil; | ||
| import org.openmrs.module.reporting.dataset.definition.SqlDataSetDefinition; | ||
| import org.openmrs.module.reporting.evaluation.parameter.Parameter; | ||
| import org.openmrs.module.reporting.evaluation.parameter.Mapped; | ||
| import org.openmrs.module.reporting.report.ReportDesign; | ||
| import org.openmrs.module.reporting.report.definition.ReportDefinition; | ||
| import org.openmrs.module.reporting.report.manager.ReportManagerUtil; | ||
| import org.springframework.beans.factory.annotation.Autowired; | ||
| import org.springframework.stereotype.Component; | ||
|
|
||
| @Component | ||
| public class DRCMissedAppointmentReportManager extends ActivatedReportManager { | ||
|
|
||
| @Autowired | ||
| private InitializerService inizService; | ||
|
|
||
| @Override | ||
| public boolean isActivated() { | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public String getVersion() { | ||
| return "1.0.0-SNAPSHOT"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getUuid() { | ||
| return "82a51c4b-acd3-4868-a0fb-74cf01c61479"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getName() { | ||
| return "Missed Appointments Report"; | ||
| } | ||
|
|
||
| @Override | ||
| public String getDescription() { | ||
| return "Missed Appointments Report"; | ||
|
Contributor
There was a problem hiding this comment. We do the translation here too |
||
| } | ||
|
|
||
| @Override | ||
| public List<Parameter> getParameters() { | ||
| return Arrays.asList( | ||
| new Parameter("startDate", MessageUtil.translate("commonreports.report.util.startDate"), Date.class), | ||
| new Parameter("endDate", MessageUtil.translate("commonreports.report.util.endDate"), Date.class)); | ||
| } | ||
|
|
||
| @Override | ||
| public ReportDefinition constructReportDefinition() { | ||
| ReportDefinition rd = new ReportDefinition(); | ||
| rd.setName(getName()); | ||
| rd.setDescription(getDescription()); | ||
| rd.setParameters(getParameters()); | ||
| rd.setUuid(getUuid()); | ||
|
|
||
| SqlDataSetDefinition sqlDsd = new SqlDataSetDefinition(); | ||
| sqlDsd.setName(MessageUtil.translate("commonreports.report.missedAppointments.datasetName")); | ||
| sqlDsd.setDescription(MessageUtil.translate("commonreports.report.missedAppointments.datasetDescription")); | ||
| String sql = getStringFromResource("org/openmrs/module/commonreports/sql/missedAppointments.sql"); | ||
| sqlDsd.setSqlQuery(sql); | ||
| sqlDsd.addParameters(getParameters()); | ||
|
|
||
| Map<String, Object> parameterMappings = new HashMap<String, Object>(); | ||
| parameterMappings.put("startDate", "${startDate}"); | ||
| parameterMappings.put("endDate", "${endDate}"); | ||
|
|
||
| rd.addDataSetDefinition(getName(), sqlDsd, parameterMappings); | ||
| return rd; | ||
| } | ||
|
|
||
| @Override | ||
| public List<ReportDesign> constructReportDesigns(ReportDefinition reportDefinition) { | ||
| ReportDesign reportDesign = ReportManagerUtil.createCsvReportDesign("86cc3558-8181-4fc3-aac4-fdb738f7c888", | ||
| reportDefinition); | ||
| return Arrays.asList(reportDesign); | ||
| } | ||
| } | ||
This file contains hidden or 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
This file contains hidden or 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
|
Contributor
There was a problem hiding this comment. Things I'm not quite clear how this report handles:
|
This file contains hidden or 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,36 @@ | ||
| SELECT DISTINCT | ||
| p.patient_id, | ||
| pn.given_name, | ||
| pn.family_name, | ||
| per.gender, | ||
| per.birthdate, | ||
| o.value_datetime AS missed_date, | ||
| 'Return visit date' AS source | ||
| FROM patient p | ||
| JOIN obs o ON p.patient_id = o.person_id | ||
| JOIN person per ON p.patient_id = per.person_id | ||
| JOIN person_name pn ON per.person_id = pn.person_id | ||
| WHERE o.concept_id = 211 | ||
|
Contributor
There was a problem hiding this comment. Because of the way metadata is loaded, it is not safe to rely on |
||
| AND o.voided = 0 | ||
| AND p.voided = 0 | ||
| AND o.value_datetime BETWEEN :startDate AND :endDate | ||
| AND pn.preferred = 1 | ||
|
|
||
| UNION | ||
|
|
||
| SELECT DISTINCT | ||
| pa.patient_id, | ||
| pn.given_name, | ||
| pn.family_name, | ||
| per.gender, | ||
| per.birthdate, | ||
| pa.start_date_time AS missed_date, | ||
| 'Appointment' AS source | ||
| FROM patient_appointment pa | ||
| JOIN patient p ON pa.patient_id = p.patient_id | ||
| JOIN person per ON p.patient_id = per.person_id | ||
| JOIN person_name pn ON per.person_id = pn.person_id | ||
| WHERE pa.start_date_time BETWEEN :startDate AND :endDate | ||
| AND pa.voided = 0 | ||
| AND p.voided = 0 | ||
| AND pn.preferred = 1; | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't these return the translatable strings (as in
MessageUtil.translate(...))?