From 231e3862d5a942ae6355f223d4212980d12be9bb Mon Sep 17 00:00:00 2001 From: Dennis Kigen Date: Wed, 13 Oct 2021 12:26:43 +0300 Subject: [PATCH] Fix breast screening report counts (#1121) This PR restores the `location_uuid` column to the breast cancer screening summary report, thereby fixing count mismatches between the base and aggregate reports. This column had been mistakenly removed in https://github.com/AMPATH/etl-rest-server/pull/1093. --- ...cer-daily-screening-summary-aggregate.json | 5 ++++ ...r-monthly-screening-summary-aggregate.json | 5 ++++ ...cancer-monthly-screening-summary-base.json | 7 ++++- .../oncology-patient-list-cols.json | 28 +++++++++++++++++++ 4 files changed, 44 insertions(+), 1 deletion(-) diff --git a/app/reporting-framework/json-reports/breast-cancer-daily-screening-summary-aggregate.json b/app/reporting-framework/json-reports/breast-cancer-daily-screening-summary-aggregate.json index 9dbace77f..8a56fd6bb 100644 --- a/app/reporting-framework/json-reports/breast-cancer-daily-screening-summary-aggregate.json +++ b/app/reporting-framework/json-reports/breast-cancer-daily-screening-summary-aggregate.json @@ -21,6 +21,11 @@ "alias": "location_name", "column": "location_name" }, + { + "type": "simple_column", + "alias": "location_uuid", + "column": "location_uuid" + }, { "type": "derived_column", "alias": "encounter_datetime", diff --git a/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-aggregate.json b/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-aggregate.json index f7deda0d0..9ff47e0fa 100644 --- a/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-aggregate.json +++ b/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-aggregate.json @@ -21,6 +21,11 @@ "alias": "location_name", "column": "location_name" }, + { + "type": "simple_column", + "alias": "location_uuid", + "column": "location_uuid" + }, { "type": "derived_column", "alias": "encounter_datetime", diff --git a/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-base.json b/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-base.json index 74fb3d528..bc38fdf2b 100644 --- a/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-base.json +++ b/app/reporting-framework/json-reports/breast-cancer-monthly-screening-summary-base.json @@ -83,6 +83,11 @@ "alias": "location_id", "column": "fbcs.location_id" }, + { + "type": "simple_column", + "alias": "location_uuid", + "column": "fbcs.location_uuid" + }, { "type": "derived_column", "alias": "past_clinical_breast_exam_results", @@ -636,7 +641,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "l.uuid in ?", + "conditionExpression": "fbcs.location_uuid in ?", "parameterName": "locationUuids" }, { diff --git a/oncology-reports/oncology-patient-list-cols.json b/oncology-reports/oncology-patient-list-cols.json index 4ad25c659..274c221db 100644 --- a/oncology-reports/oncology-patient-list-cols.json +++ b/oncology-reports/oncology-patient-list-cols.json @@ -8,6 +8,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -30,6 +31,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -52,6 +54,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -74,6 +77,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -96,6 +100,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -118,6 +123,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -140,6 +146,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -162,6 +169,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -184,6 +192,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -206,6 +215,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -228,6 +238,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -250,6 +261,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -272,6 +284,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -302,6 +315,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -324,6 +338,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -346,6 +361,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -368,6 +384,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -390,6 +407,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -412,6 +430,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -434,6 +453,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -456,6 +476,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -478,6 +499,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -500,6 +522,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -522,6 +545,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -544,6 +568,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -566,6 +591,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -588,6 +614,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age", @@ -610,6 +637,7 @@ "patientListCols": [ "encounter_datetime", "location_name", + "location_uuid", "identifiers", "person_name", "age",