Skip to content

VL Exchange Transaction Report With Program Data #372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 21, 2025
Merged

VL Exchange Transaction Report With Program Data #372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
095e781
Adding the VL Exchange transaction report
dbaluku Nov 10, 2024
254f2b2
improveed excel return formats
dbaluku Nov 10, 2024
626954e
improveed excel return formats
dbaluku Nov 10, 2024
7afbdfe
Merge remote-tracking branch 'origin/VL_transaction_report' into VL_t…
dbaluku Nov 10, 2024
b0b9001
removed csv option
dbaluku Nov 10, 2024
3807157
Added VL program data to transaction report for use in manual exchange
dbaluku Mar 11, 2025
49fe334
Merge branch 'master' of https://github.com/mohuganda/openmrs-module-…
dbaluku Mar 11, 2025
dabb6ad
ensure specimen id is a string to ensure there are correct display in…
dbaluku Mar 21, 2025
5efdcd3
Merge branch 'master' of https://github.com/mohuganda/openmrs-module-…
dbaluku Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 102 additions & 32 deletions ...e/ugandaemrreports/definition/dataset/evaluator/VLExchangeDatasetDefinitionEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,39 +53,96 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext c
endDate = endDate+" 23:59:59";
context = ObjectUtil.nvl(context, new EvaluationContext());

String dataQuery = String.format("SELECT pi.identifier as HIV_clinic_no,\n" +
String dataQuery = String.format("SELECT pi.identifier AS hiv_clinic_no,\n" +
" p.birthdate,\n" +
" TIMESTAMPDIFF(YEAR,p.birthdate,CURRENT_DATE) AS age,\n" +
" TIMESTAMPDIFF(YEAR, p.birthdate, CURRENT_DATE) AS age,\n" +
" p.gender,\n" +
" accession_number AS specimen_id,\n" +
" specimen_source,\n" +
" DATE(date_activated),\n" +
" DATE(send_request_sync_task.date_sent) AS send_request_date_sent,\n" +
" send_request_sync_task.status AS send_request_status,\n" +
" send_request_sync_task.status_code AS send_request_status_code,\n" +
" program_data_task.status as program_data_status,\n" +
" program_data_task.status_code as program_data_status_code,\n" +
" DATE(program_data_task.date_created) as program_data_date,\n" +
" DATE(request_result_task.date_created) as request_results_date,\n" +
" request_result_task.status as request_results,\n" +
" request_result_task.status_code as request_status_code\n" +
"\n" +
"FROM (SELECT orders.patient_id,orders.date_activated,orders.accession_number, test_order.specimen_source\n" +
" CAST(accession_number as CHAR ) AS specimen_id,\n" +
" specimen.name as specimen_source,\n" +
" DATE(date_activated) AS vl_collection_date,\n" +
" DATE(send_request_sync_task.date_sent) AS send_request_date_sent,\n" +
" send_request_sync_task.status AS send_request_status,\n" +
" send_request_sync_task.status_code AS send_request_status_code,\n" +
" program_data_task.status AS program_data_status,\n" +
" program_data_task.status_code AS program_data_status_code,\n" +
" DATE(program_data_task.date_created) AS program_data_date,\n" +
" DATE(request_result_task.date_created) AS request_results_date,\n" +
" request_result_task.status AS request_results,\n" +
" request_result_task.status_code AS request_status_code,\n" +
"audittool.baseline_regimen_start_date,\n" +
"nin.identifier as NIN,\n" +
"audittool.who_stage,\n" +
"preg.status,\n" +
"audittool.tuberculosis_status,\n" +
"audittool.adherence,\n" +
"dsd.model as dsd_model,\n" +
"vl_indication.value,\n" +
"audittool.current_regimen,\n" +
"audittool.regimen_line,\n" +
"(SELECT property_value from global_property where property ='ugandaemr.dhis2.organizationuuid') as facility_id,\n" +
"(SELECT property_value from global_property where property ='ugandaemr.healthCenterName') as facility_name,\n" +
"audittool.arv_regimen_start_date as current_regimen_duration\n" +
"FROM (SELECT orders.patient_id, orders.date_activated, orders.accession_number, test_order.specimen_source\n" +
" FROM orders\n" +
" INNER JOIN test_order ON (test_order.order_id = orders.order_id)\n" +
"WHERE accession_number IS NOT NULL\n" +
" AND specimen_source IS NOT NULL\n" +
" AND orders.instructions = 'REFER TO cphl'\n" +
" AND orders.concept_id = 165412\n" +
" AND orders.voided = 0\n" +
" AND orders.date_activated >= '%s'\n" +
" AND orders.date_activated <= '%s')cohort\n" +
"LEFT JOIN person p on p.person_id = cohort.patient_id\n" +
"LEFT JOIN sync_task send_request_sync_task on send_request_sync_task.sync_task = accession_number and send_request_sync_task.sync_task_type = (SELECT sync_task_type_id from sync_task_type where uuid='3551ca84-06c0-432b-9064-fcfeefd6f4ec')\n" +
"LEFT JOIN sync_task request_result_task on request_result_task.sync_task = accession_number and request_result_task.sync_task_type = (SELECT sync_task_type_id from sync_task_type where uuid='3396dcf0-2106-4e73-9b90-c63978c3a8b4')\n" +
"LEFT JOIN sync_task program_data_task on program_data_task.sync_task = accession_number and program_data_task.sync_task_type = (SELECT sync_task_type_id from sync_task_type where uuid='f9b2fa5d-5d37-4fd9-b20a-a0cab664f520')\n" +
"LEFT JOIN patient_identifier pi ON pi.patient_id = cohort.patient_id and pi.identifier_type = (SELECT patient_identifier_type_id from patient_identifier_type where uuid = 'e1731641-30ab-102d-86b0-7a5022ba4115');",startDate,endDate);

" INNER JOIN test_order ON (test_order.order_id = orders.order_id)\n" +
" WHERE accession_number IS NOT NULL\n" +
" AND specimen_source IS NOT NULL\n" +
" AND orders.instructions = 'REFER TO cphl'\n" +
" AND orders.concept_id = 165412\n" +
" AND orders.voided = 0\n" +
" AND orders.date_activated >= '%s'\n" +
" AND orders.date_activated <= '%s') cohort\n" +
" LEFT JOIN person p ON p.person_id = cohort.patient_id\n" +
" LEFT JOIN concept_name specimen\n" +
" ON cohort.specimen_source = specimen.concept_id AND specimen.concept_name_type = 'FULLY_SPECIFIED' AND\n" +
" specimen.locale = 'en' and specimen.locale_preferred=1\n" +
" LEFT JOIN sync_task send_request_sync_task ON send_request_sync_task.sync_task = accession_number AND\n" +
" send_request_sync_task.sync_task_type = (SELECT sync_task_type_id\n" +
" FROM sync_task_type\n" +
" WHERE uuid = '3551ca84-06c0-432b-9064-fcfeefd6f4ec')\n" +
" LEFT JOIN sync_task request_result_task ON request_result_task.sync_task = accession_number AND\n" +
" request_result_task.sync_task_type = (SELECT sync_task_type_id\n" +
" FROM sync_task_type\n" +
" WHERE uuid = '3396dcf0-2106-4e73-9b90-c63978c3a8b4')\n" +
" LEFT JOIN sync_task program_data_task ON program_data_task.sync_task = accession_number AND\n" +
" program_data_task.sync_task_type = (SELECT sync_task_type_id\n" +
" FROM sync_task_type\n" +
" WHERE uuid = 'f9b2fa5d-5d37-4fd9-b20a-a0cab664f520')\n" +
" LEFT JOIN patient_identifier pi ON pi.patient_id = cohort.patient_id AND pi.identifier_type =\n" +
" (SELECT patient_identifier_type_id\n" +
" FROM patient_identifier_type\n" +
" WHERE uuid = 'e1731641-30ab-102d-86b0-7a5022ba4115')\n" +
" LEFT JOIN patient_identifier nin ON nin.patient_id = cohort.patient_id AND nin.identifier_type =\n" +
" (SELECT patient_identifier_type_id\n" +
" FROM patient_identifier_type\n" +
" WHERE uuid = 'f0c16a6d-dc5f-4118-a803-616d0075d282')\n" +
" LEFT JOIN mamba_fact_audit_tool_art_patients audittool ON audittool.client_id = cohort.patient_id\n" +
"\n" +
" LEFT JOIN mamba_fact_patients_latest_pregnancy_status preg ON preg.client_id = cohort.patient_id\n" +
" LEFT JOIN (SELECT latest.person_id, cn.name AS model\n" +
" FROM obs o\n" +
" INNER JOIN (SELECT person_id, MAX(obs_datetime) latest\n" +
" FROM obs o\n" +
" WHERE concept_id = 165143\n" +
" AND voided = 0\n" +
" GROUP BY person_id) latest ON o.person_id = latest.person_id\n" +
" LEFT JOIN concept_name cn\n" +
" ON o.value_coded = cn.concept_id AND cn.concept_name_type = 'FULLY_SPECIFIED' AND\n" +
" cn.locale = 'en'\n" +
" WHERE o.concept_id = 165143\n" +
" AND o.obs_datetime = latest.latest) dsd ON dsd.person_id = cohort.patient_id\n" +
" LEFT JOIN (SELECT latest.person_id, cn.name AS value\n" +
" FROM obs o\n" +
" INNER JOIN (SELECT person_id, MAX(obs_datetime) latest\n" +
" FROM obs o\n" +
" WHERE concept_id = 168689\n" +
" AND voided = 0\n" +
" GROUP BY person_id) latest ON o.person_id = latest.person_id\n" +
" LEFT JOIN concept_name cn\n" +
" ON o.value_coded = cn.concept_id AND cn.concept_name_type = 'FULLY_SPECIFIED' AND\n" +
" cn.locale = 'en'\n" +
" WHERE o.concept_id = 168689\n" +
" AND o.obs_datetime = latest.latest) vl_indication ON vl_indication.person_id = cohort.patient_id;\n" ,startDate,endDate);
SqlQueryBuilder q = new SqlQueryBuilder();
q.append(dataQuery);

Expand All @@ -98,8 +155,8 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext c
pdh.addCol(row, "Birthdate", e[1]);
pdh.addCol(row, "Age", e[2]);
pdh.addCol(row, "Sex", e[3]);
pdh.addCol(row, "Specimen ID", e[4]);
pdh.addCol(row, "Specimen source", e[5]);
pdh.addCol(row, "Specimen ID", e[4].toString());
pdh.addCol(row, "specimen_source", e[5]);
pdh.addCol(row, "Date Ordered", e[6]);
pdh.addCol(row, "send_request_date_sent", e[7]);
pdh.addCol(row, "send_request_status", e[8]);
Expand All @@ -110,6 +167,19 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext c
pdh.addCol(row, "request_results_date", e[13]);
pdh.addCol(row, "request_results", e[14]);
pdh.addCol(row, "request_status_code", e[15]);
pdh.addCol(row, "NIN", e[17]);
pdh.addCol(row, "Art_start_date", e[16]);
pdh.addCol(row, "who", e[18]);
pdh.addCol(row, "duration", e[28]);
pdh.addCol(row, "preg", e[19]);
pdh.addCol(row, "tb_status", e[20]);
pdh.addCol(row, "adherence", e[21]);
pdh.addCol(row, "dsd", e[22]);
pdh.addCol(row, "indication", e[23]);
pdh.addCol(row, "regimen", e[24]);
pdh.addCol(row, "line", e[25]);
pdh.addCol(row, "facility_id", e[26]);
pdh.addCol(row, "facility_name", e[27]);

dataSet.addRow(row);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/openmrs/module/ugandaemrreports/reports2019/SetupVLExchangeTransactionReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,6 @@ public ReportDefinition constructReportDefinition() {

@Override
public String getVersion() {
return "0.1.6";
return "0.2.5";
}
}
Binary file modified ...ain/resources/org/openmrs/module/ugandaemrreports/reports2019/VL_Exchange_PatientList.xls
View file
Open in desktop
Binary file not shown.
Loading