diff --git a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-aggregate.json index af0c62b3c..a13a4cc9f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-base.json index 133cbe093..9229db09b 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-base.json @@ -16,6 +16,14 @@ "type": "INNER", "joinCondition": "hm.location_id = ll.location_id" } + }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } } ], "columns": [ @@ -24,6 +32,21 @@ "alias": "person_id", "column": "hm.person_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location_id", @@ -59,30 +82,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-indicators.json b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-indicators.json index 39dff0fa0..515da83db 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-indicators.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-curr/tx-curr-report-indicators.json @@ -11,14 +11,6 @@ { "sectionTitle": "TX_CURR Report", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_unknown_year", - "male_unknown_year", - "unknown_year" - ] - }, { "label": "<1 year", "indicator": ["female_less_1_year", "male_less_1_year", "less_1_year"] diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json index 4d152c984..bb80c804c 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/patient-list-txml-template.json @@ -14,7 +14,7 @@ "alias": "n", "join": { "type": "LEFT", - "joinCondition": "c.person_id = n.person_id" + "joinCondition": "hm.person_id = n.person_id" } }, { @@ -30,7 +30,7 @@ "alias": "flat_identifiers", "join": { "type": "LEFT", - "joinCondition": "c.person_id = flat_identifiers.patient_id" + "joinCondition": "hm.person_id = flat_identifiers.patient_id" } }, { @@ -38,7 +38,7 @@ "alias": "cl", "join": { "type": "LEFT", - "joinCondition": "cl.location_id = c.location_id" + "joinCondition": "cl.location_id = hm.location_id" } }, { @@ -62,7 +62,7 @@ "alias": "t1", "join": { "type": "INNER", - "joinCondition": "c.person_id = t1.person_id" + "joinCondition": "hm.person_id = t1.person_id" } }, { @@ -142,7 +142,7 @@ { "type": "simple_column", "alias": "person_id", - "column": "c.person_id" + "column": "hm.person_id" }, { "type": "simple_column", @@ -167,7 +167,7 @@ { "type": "simple_column", "alias": "start_month", - "column": "DATE_FORMAT(c.endDate,'%Y-%m')" + "column": "DATE_FORMAT(hm.endDate,'%Y-%m')" }, { "type": "simple_column", @@ -182,12 +182,12 @@ { "type": "simple_column", "alias": "enrollment_date", - "column": "DATE_FORMAT(c.enrollment_date,'%Y-%m-%d')" + "column": "DATE_FORMAT(hm.enrollment_date,'%Y-%m-%d')" }, { "type": "simple_column", "alias": "transfer_out_date_v1", - "column": "DATE_FORMAT(c.transfer_out_date,'%Y-%m-%d')" + "column": "DATE_FORMAT(hm.transfer_out_date,'%Y-%m-%d')" }, { "type": "simple_column", @@ -197,19 +197,19 @@ { "type": "simple_column", "alias": "location_id", - "column": "c.location_id" + "column": "hm.location_id" }, { "type": "simple_column", "alias": "prev_location_id", - "column": "c.prev_location_id" + "column": "hm.prev_location_id" }, { "type": "derived_column", "alias": "on_art_starting", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.on_art_this_month = 1, 1, NULL)" + "expression": "IF(hm.on_art_this_month = 1, 1, NULL)" } }, { @@ -217,7 +217,7 @@ "alias": "not_on_art_starting", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.on_art_this_month = 0, 1, NULL)" + "expression": "IF(hm.on_art_this_month = 0, 1, NULL)" } }, { @@ -225,7 +225,7 @@ "alias": "starting_active", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.status = 'active', 1, NULL)" + "expression": "IF(hm.status = 'active', 1, NULL)" } }, { @@ -233,7 +233,7 @@ "alias": "dead", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -241,7 +241,7 @@ "alias": "dead_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -249,7 +249,7 @@ "alias": "dead_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND c.cur_arv_meds IS NULL AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND hm.cur_arv_meds IS NULL AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -270,6 +270,10 @@ "condition": "d.cause_of_death = 1548", "value": "HEALTH ISSUES" }, + { + "condition": "d.cause_of_death = 5622", + "value": "OTHER NON-CODED" + }, { "condition": "d.cause_of_death = 84", "value": "ACCIDENT" @@ -378,7 +382,7 @@ "alias": "transfer_out", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' then 1 when n.status != 'transfer_out' AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' then 1 when n.status != 'transfer_out' AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -386,7 +390,7 @@ "alias": "transfer_out_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -394,7 +398,7 @@ "alias": "transfer_out_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -402,7 +406,7 @@ "alias": "transfer_out_date", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN c.transfer_out_this_month = 1 then DATE_FORMAT(c.transfer_out_date,'%Y-%m-%d') WHEN c.transfer_out_this_month = 0 AND n.location_id != c.location_id THEN DATE_FORMAT(c.encounter_date,'%Y-%m-%d') ELSE NULL END" + "expression": "CASE WHEN hm.transfer_out_this_month = 1 then DATE_FORMAT(hm.transfer_out_date,'%Y-%m-%d') WHEN hm.transfer_out_this_month = 0 AND n.location_id != hm.location_id THEN DATE_FORMAT(hm.encounter_date,'%Y-%m-%d') ELSE NULL END" } }, { @@ -410,7 +414,7 @@ "alias": "transfer_out_location", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN to.transfer_to_location WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN nl.name ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' THEN to.transfer_to_location WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN nl.name ELSE NULL END" } }, { @@ -420,23 +424,23 @@ "expressionOptions": { "caseOptions": [ { - "condition": "c.transfer_out_location_id = 9998 AND cl.parent_location = nl.parent_location", + "condition": "hm.transfer_out_location_id = 9998 AND cl.parent_location = nl.parent_location", "value": "INTRA-AMPATH" }, { - "condition": "c.transfer_out_location_id is NULL AND c.transfer_out_date is NOT NULL AND cl.parent_location = nl.parent_location AND c.location_id != n.location_id", + "condition": "hm.transfer_out_location_id is NULL AND hm.transfer_out_date is NOT NULL AND cl.parent_location = nl.parent_location AND hm.location_id != n.location_id", "value": "INTRA-AMPATH" }, { - "condition": "c.location_id != n.location_id AND cl.parent_location = nl.parent_location", + "condition": "hm.location_id != n.location_id AND cl.parent_location = nl.parent_location", "value": "INTRA-AMPATH" }, { - "condition": "c.location_id != n.location_id AND NOT (cl.parent_location <=> nl.parent_location)", + "condition": "hm.location_id != n.location_id AND NOT (cl.parent_location <=> nl.parent_location)", "value": "INTER-AMPATH" }, { - "condition": "c.location_id != n.location_id AND cl.parent_location != nl.parent_location", + "condition": "hm.location_id != n.location_id AND cl.parent_location != nl.parent_location", "value": "INTER-AMPATH" }, { @@ -475,7 +479,7 @@ "alias": "ltfu", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -483,7 +487,7 @@ "alias": "ltfu_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -491,7 +495,7 @@ "alias": "ltfu_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -499,7 +503,7 @@ "alias": "defaulter", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -507,7 +511,7 @@ "alias": "defaulter_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -515,28 +519,28 @@ "alias": "defaulter_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id,1,NULL)" } }, { "type": "simple_column", "alias": "days_since_rtc_date", - "column": "c.days_since_rtc_date" + "column": "hm.days_since_rtc_date" }, { "type": "simple_column", "alias": "arv_first_regimen", - "column": "c.arv_first_regimen" + "column": "hm.arv_first_regimen" }, { "type": "simple_column", "alias": "cur_arv_line", - "column": "c.cur_arv_line" + "column": "hm.cur_arv_line" }, { "type": "simple_column", "alias": "arv_first_regimen_start_date", - "column": "date_format(c.arv_first_regimen_start_date, '%Y-%m-%d')" + "column": "date_format(hm.arv_first_regimen_start_date, '%Y-%m-%d')" }, { "type": "simple_column", @@ -546,7 +550,7 @@ { "type": "simple_column", "alias": "death_date", - "column": "date_format(c.death_date, '%Y-%m-%d')" + "column": "date_format(hm.death_date, '%Y-%m-%d')" }, { "type": "derived_column", @@ -561,7 +565,7 @@ "alias": "loss", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN 1 WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' THEN 1 WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -569,7 +573,7 @@ "alias": "loss_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -577,7 +581,7 @@ "alias": "loss_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -585,7 +589,7 @@ "alias": "loss_status", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN 'Transfer Out' WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN 'Transfer Out' WHEN n.status = 'dead' AND c.location_id = n.location_id THEN 'Dead' WHEN n.status IN ('ltfu') AND c.location_id = n.location_id THEN 'Ltfu/IIT' WHEN n.status IN ('defaulter') AND c.location_id = n.location_id THEN 'Ltfu/IIT' ELSE NULL END " + "expression": "CASE WHEN n.status = 'transfer_out' THEN 'Transfer Out' WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN 'Transfer Out' WHEN n.status = 'dead' AND hm.location_id = n.location_id THEN 'Dead' WHEN n.status IN ('ltfu') AND hm.location_id = n.location_id THEN 'Ltfu/IIT' WHEN n.status IN ('defaulter') AND hm.location_id = n.location_id THEN 'Ltfu/IIT' ELSE NULL END " } }, { @@ -1032,21 +1036,21 @@ "conditions": [ { "filterType": "tableColumns", - "conditionExpression": "c.endDate = ?", + "conditionExpression": "hm.endDate = ?", "parameterName": "startingMonth" }, { "filterType": "tableColumns", - "conditionExpression": "c.location_id in ? ", + "conditionExpression": "hm.location_id in ? ", "parameterName": "locations" }, { "filterType": "tableColumns", - "conditionExpression": "c.status = 'active'" + "conditionExpression": "hm.status = 'active'" }, { "filterType": "expressionColumns", - "conditionExpression": "1 = (CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != c.location_id then 1 ELSE NULL END)", + "conditionExpression": "1 = (CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != hm.location_id then 1 ELSE NULL END)", "parameterName": "", "dynamicallyGenerated": true } @@ -1072,7 +1076,7 @@ "alias": "n", "join": { "type": "LEFT", - "joinCondition": "c.person_id = n.person_id AND n.endDate = '{endingMonth}'" + "joinCondition": "hm.person_id = n.person_id AND n.endDate = '{endingMonth}'" } }, { @@ -1088,7 +1092,7 @@ "alias": "flat_identifiers", "join": { "type": "LEFT", - "joinCondition": "c.person_id = flat_identifiers.patient_id" + "joinCondition": "hm.person_id = flat_identifiers.patient_id" } }, { @@ -1096,7 +1100,7 @@ "alias": "cl", "join": { "type": "LEFT", - "joinCondition": "cl.location_id = c.location_id" + "joinCondition": "cl.location_id = hm.location_id" } }, { @@ -1120,7 +1124,7 @@ { "type": "simple_column", "alias": "person_id", - "column": "c.person_id" + "column": "hm.person_id" }, { "type": "simple_column", @@ -1145,7 +1149,7 @@ { "type": "simple_column", "alias": "start_month", - "column": "DATE_FORMAT(c.endDate,'%Y-%m')" + "column": "DATE_FORMAT(hm.endDate,'%Y-%m')" }, { "type": "simple_column", @@ -1165,19 +1169,19 @@ { "type": "simple_column", "alias": "location_id", - "column": "c.location_id" + "column": "hm.location_id" }, { "type": "simple_column", "alias": "prev_location_id", - "column": "c.prev_location_id" + "column": "hm.prev_location_id" }, { "type": "derived_column", "alias": "on_art_starting", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.on_art_this_month = 1, 1, NULL)" + "expression": "IF(hm.on_art_this_month = 1, 1, NULL)" } }, { @@ -1185,7 +1189,7 @@ "alias": "not_on_art_starting", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.on_art_this_month = 0, 1, NULL)" + "expression": "IF(hm.on_art_this_month = 0, 1, NULL)" } }, { @@ -1193,7 +1197,7 @@ "alias": "starting_active", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(c.status = 'active', 1, NULL)" + "expression": "IF(hm.status = 'active', 1, NULL)" } }, { @@ -1201,7 +1205,7 @@ "alias": "dead", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -1209,7 +1213,7 @@ "alias": "dead_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -1217,7 +1221,7 @@ "alias": "dead_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status = 'dead' AND c.cur_arv_meds IS NULL AND c.location_id = n.location_id, 1, NULL)" + "expression": "IF(n.status = 'dead' AND hm.cur_arv_meds IS NULL AND hm.location_id = n.location_id, 1, NULL)" } }, { @@ -1346,7 +1350,7 @@ "alias": "transfer_out", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' then 1 when n.status != 'transfer_out' AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' then 1 when n.status != 'transfer_out' AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -1354,7 +1358,7 @@ "alias": "transfer_out_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -1362,7 +1366,7 @@ "alias": "transfer_out_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != c.location_id then 1 ELSE NULL END" + "expression": "CASE when n.status = 'transfer_out' AND n.cur_arv_meds IS NULL then 1 when n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != hm.location_id then 1 ELSE NULL END" } }, { @@ -1370,7 +1374,7 @@ "alias": "transfer_out_date", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN c.transfer_out_this_month = 1 then DATE_FORMAT(c.transfer_out_date,'%Y-%m-%d') WHEN c.transfer_out_this_month = 0 AND n.location_id != c.location_id THEN DATE_FORMAT(c.encounter_date,'%Y-%m-%d') ELSE NULL END" + "expression": "CASE WHEN hm.transfer_out_this_month = 1 then DATE_FORMAT(hm.transfer_out_date,'%Y-%m-%d') WHEN hm.transfer_out_this_month = 0 AND n.location_id != hm.location_id THEN DATE_FORMAT(hm.encounter_date,'%Y-%m-%d') ELSE NULL END" } }, { @@ -1378,7 +1382,7 @@ "alias": "transfer_out_location", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN to.transfer_to_location WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN nl.name ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' THEN to.transfer_to_location WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN nl.name ELSE NULL END" } }, { @@ -1388,23 +1392,23 @@ "expressionOptions": { "caseOptions": [ { - "condition": "c.transfer_out_location_id = 9998 AND cl.parent_location = nl.parent_location", + "condition": "hm.transfer_out_location_id = 9998 AND cl.parent_location = nl.parent_location", "value": "INTRA-AMPATH" }, { - "condition": "c.transfer_out_location_id is NULL AND c.transfer_out_date is NOT NULL AND cl.parent_location = nl.parent_location AND c.location_id != n.location_id", + "condition": "hm.transfer_out_location_id is NULL AND hm.transfer_out_date is NOT NULL AND cl.parent_location = nl.parent_location AND hm.location_id != n.location_id", "value": "INTRA-AMPATH" }, { - "condition": "c.location_id != n.location_id AND cl.parent_location = nl.parent_location", + "condition": "hm.location_id != n.location_id AND cl.parent_location = nl.parent_location", "value": "INTRA-AMPATH" }, { - "condition": "c.location_id != n.location_id AND NOT (cl.parent_location <=> nl.parent_location)", + "condition": "hm.location_id != n.location_id AND NOT (cl.parent_location <=> nl.parent_location)", "value": "INTER-AMPATH" }, { - "condition": "c.location_id != n.location_id AND cl.parent_location != nl.parent_location", + "condition": "hm.location_id != n.location_id AND cl.parent_location != nl.parent_location", "value": "INTER-AMPATH" }, { @@ -1443,7 +1447,7 @@ "alias": "ltfu", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1451,7 +1455,7 @@ "alias": "ltfu_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1459,7 +1463,7 @@ "alias": "ltfu_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1467,7 +1471,7 @@ "alias": "defaulter", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1475,7 +1479,7 @@ "alias": "defaulter_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1483,7 +1487,7 @@ "alias": "defaulter_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id,1,NULL)" + "expression": "IF(n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id,1,NULL)" } }, { @@ -1499,7 +1503,7 @@ "alias": "loss", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN 1 WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' THEN 1 WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -1507,7 +1511,7 @@ "alias": "loss_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NOT NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NOT NULL AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NOT NULL AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -1515,7 +1519,7 @@ "alias": "loss_not_on_art", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != c.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND c.location_id = n.location_id THEN 1 ELSE NULL END" + "expression": "CASE WHEN n.status = 'transfer_out' AND n.cur_arv_meds IS NULL THEN 1 WHEN n.status != 'transfer_out' AND n.cur_arv_meds IS NULL AND n.location_id != hm.location_id THEN 1 WHEN n.status = 'dead' AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('ltfu') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 WHEN n.status IN ('defaulter') AND n.cur_arv_meds IS NULL AND hm.location_id = n.location_id THEN 1 ELSE NULL END" } }, { @@ -1523,7 +1527,7 @@ "alias": "loss_status", "expressionType": "simple_expression", "expressionOptions": { - "expression": "CASE WHEN n.status = 'transfer_out' THEN 'Transfer Out' WHEN n.status != 'transfer_out' AND n.location_id != c.location_id THEN 'Transfer Out' WHEN n.status = 'dead' AND c.location_id = n.location_id THEN 'Dead' WHEN n.status IN ('ltfu') AND c.location_id = n.location_id THEN 'Ltfu/IIT' WHEN n.status IN ('defaulter') AND c.location_id = n.location_id THEN 'Ltfu/IIT' ELSE NULL END " + "expression": "CASE WHEN n.status = 'transfer_out' THEN 'Transfer Out' WHEN n.status != 'transfer_out' AND n.location_id != hm.location_id THEN 'Transfer Out' WHEN n.status = 'dead' AND hm.location_id = n.location_id THEN 'Dead' WHEN n.status IN ('ltfu') AND hm.location_id = n.location_id THEN 'Ltfu/IIT' WHEN n.status IN ('defaulter') AND hm.location_id = n.location_id THEN 'Ltfu/IIT' ELSE NULL END " } } ], @@ -1532,12 +1536,12 @@ "conditions": [ { "filterType": "tableColumns", - "conditionExpression": "c.endDate = ?", + "conditionExpression": "hm.endDate = ?", "parameterName": "startingMonth" }, { "filterType": "tableColumns", - "conditionExpression": "c.location_id in ? ", + "conditionExpression": "hm.location_id in ? ", "parameterName": "locations" } ] diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-aggregate.json index 34efedba9..fd1483d75 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-aggregate.json @@ -13,7 +13,7 @@ "sources": [ { "dataSet": "txmlIIT35ReportBase", - "alias": "iit35b" + "alias": "b" } ], "columns": [ @@ -28,48 +28,39 @@ { "type": "simple_column", "alias": "location_uuid", - "column": "iit35b.location_uuid" + "column": "b.location_uuid" }, { "type": "simple_column", "alias": "location_id", - "column": "iit35b.location_id" + "column": "b.location_id" }, { "type": "simple_column", - "alias": "location", - "column": "iit35b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", "alias": "male_iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_less_1_year)" + "expression": "SUM(b.male_iit_3_5_less_1_year)" } }, { @@ -77,7 +68,7 @@ "alias": "female_iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_less_1_year)" + "expression": "SUM(b.female_iit_3_5_less_1_year)" } }, { @@ -85,7 +76,7 @@ "alias": "iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_less_1_year)" + "expression": "SUM(b.iit_3_5_less_1_year)" } }, { @@ -93,7 +84,7 @@ "alias": "male_iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_one_four_year)" + "expression": "SUM(b.male_iit_3_5_one_four_year)" } }, { @@ -101,7 +92,7 @@ "alias": "female_iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_one_four_year)" + "expression": "SUM(b.female_iit_3_5_one_four_year)" } }, { @@ -109,7 +100,7 @@ "alias": "iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_one_four_year)" + "expression": "SUM(b.iit_3_5_one_four_year)" } }, { @@ -117,7 +108,7 @@ "alias": "male_iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_5_9_year)" + "expression": "SUM(b.male_iit_3_5_5_9_year)" } }, { @@ -125,7 +116,7 @@ "alias": "female_iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_5_9_year)" + "expression": "SUM(b.female_iit_3_5_5_9_year)" } }, { @@ -133,7 +124,7 @@ "alias": "iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_5_9_year)" + "expression": "SUM(b.iit_3_5_5_9_year)" } }, { @@ -141,7 +132,7 @@ "alias": "male_iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_10_14_year)" + "expression": "SUM(b.male_iit_3_5_10_14_year)" } }, { @@ -149,7 +140,7 @@ "alias": "female_iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_10_14_year)" + "expression": "SUM(b.female_iit_3_5_10_14_year)" } }, { @@ -157,7 +148,7 @@ "alias": "iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_10_14_year)" + "expression": "SUM(b.iit_3_5_10_14_year)" } }, { @@ -165,7 +156,7 @@ "alias": "male_iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_15_19_year)" + "expression": "SUM(b.male_iit_3_5_15_19_year)" } }, { @@ -173,7 +164,7 @@ "alias": "female_iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_15_19_year)" + "expression": "SUM(b.female_iit_3_5_15_19_year)" } }, { @@ -181,7 +172,7 @@ "alias": "iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_15_19_year)" + "expression": "SUM(b.iit_3_5_15_19_year)" } }, { @@ -189,7 +180,7 @@ "alias": "male_iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_20_24_year)" + "expression": "SUM(b.male_iit_3_5_20_24_year)" } }, { @@ -197,7 +188,7 @@ "alias": "female_iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_20_24_year)" + "expression": "SUM(b.female_iit_3_5_20_24_year)" } }, { @@ -205,7 +196,7 @@ "alias": "iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_20_24_year)" + "expression": "SUM(b.iit_3_5_20_24_year)" } }, { @@ -213,7 +204,7 @@ "alias": "male_iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_25_29_year)" + "expression": "SUM(b.male_iit_3_5_25_29_year)" } }, { @@ -221,7 +212,7 @@ "alias": "female_iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_25_29_year)" + "expression": "SUM(b.female_iit_3_5_25_29_year)" } }, { @@ -229,7 +220,7 @@ "alias": "iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_25_29_year)" + "expression": "SUM(b.iit_3_5_25_29_year)" } }, { @@ -237,7 +228,7 @@ "alias": "male_iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_30_34_year)" + "expression": "SUM(b.male_iit_3_5_30_34_year)" } }, { @@ -245,7 +236,7 @@ "alias": "female_iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_30_34_year)" + "expression": "SUM(b.female_iit_3_5_30_34_year)" } }, { @@ -253,7 +244,7 @@ "alias": "iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_30_34_year)" + "expression": "SUM(b.iit_3_5_30_34_year)" } }, { @@ -261,7 +252,7 @@ "alias": "male_iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_35_39_year)" + "expression": "SUM(b.male_iit_3_5_35_39_year)" } }, { @@ -269,7 +260,7 @@ "alias": "female_iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_35_39_year)" + "expression": "SUM(b.female_iit_3_5_35_39_year)" } }, { @@ -277,7 +268,7 @@ "alias": "iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_35_39_year)" + "expression": "SUM(b.iit_3_5_35_39_year)" } }, { @@ -285,7 +276,7 @@ "alias": "male_iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_40_44_year)" + "expression": "SUM(b.male_iit_3_5_40_44_year)" } }, { @@ -293,7 +284,7 @@ "alias": "female_iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_40_44_year)" + "expression": "SUM(b.female_iit_3_5_40_44_year)" } }, { @@ -301,7 +292,7 @@ "alias": "iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_40_44_year)" + "expression": "SUM(b.iit_3_5_40_44_year)" } }, { @@ -309,7 +300,7 @@ "alias": "male_iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_45_49_year)" + "expression": "SUM(b.male_iit_3_5_45_49_year)" } }, { @@ -317,7 +308,7 @@ "alias": "female_iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_45_49_year)" + "expression": "SUM(b.female_iit_3_5_45_49_year)" } }, { @@ -325,7 +316,7 @@ "alias": "iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_45_49_year)" + "expression": "SUM(b.iit_3_5_45_49_year)" } }, { @@ -333,7 +324,7 @@ "alias": "male_iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_50_54_year)" + "expression": "SUM(b.male_iit_3_5_50_54_year)" } }, { @@ -341,7 +332,7 @@ "alias": "female_iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_50_54_year)" + "expression": "SUM(b.female_iit_3_5_50_54_year)" } }, { @@ -349,7 +340,7 @@ "alias": "iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_50_54_year)" + "expression": "SUM(b.iit_3_5_50_54_year)" } }, { @@ -357,7 +348,7 @@ "alias": "male_iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_55_59_year)" + "expression": "SUM(b.male_iit_3_5_55_59_year)" } }, { @@ -365,7 +356,7 @@ "alias": "female_iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_55_59_year)" + "expression": "SUM(b.female_iit_3_5_55_59_year)" } }, { @@ -373,7 +364,7 @@ "alias": "iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_55_59_year)" + "expression": "SUM(b.iit_3_5_55_59_year)" } }, { @@ -381,7 +372,7 @@ "alias": "male_iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_60_64_year)" + "expression": "SUM(b.male_iit_3_5_60_64_year)" } }, { @@ -389,7 +380,7 @@ "alias": "female_iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_60_64_year)" + "expression": "SUM(b.female_iit_3_5_60_64_year)" } }, { @@ -397,7 +388,7 @@ "alias": "iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_60_64_year)" + "expression": "SUM(b.iit_3_5_60_64_year)" } }, { @@ -405,7 +396,7 @@ "alias": "male_iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5_above_65_year)" + "expression": "SUM(b.male_iit_3_5_above_65_year)" } }, { @@ -413,7 +404,7 @@ "alias": "female_iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5_above_65_year)" + "expression": "SUM(b.female_iit_3_5_above_65_year)" } }, { @@ -421,7 +412,7 @@ "alias": "iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.iit_3_5_above_65_year)" + "expression": "SUM(b.iit_3_5_above_65_year)" } }, { @@ -429,7 +420,7 @@ "alias": "female_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.female_iit_3_5)" + "expression": "SUM(b.female_iit_3_5)" } }, { @@ -437,7 +428,7 @@ "alias": "male_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.male_iit_3_5)" + "expression": "SUM(b.male_iit_3_5)" } }, { @@ -445,13 +436,13 @@ "alias": "total_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iit35b.total_iit_3_5)" + "expression": "SUM(b.total_iit_3_5)" } } ], "groupBy": { "groupParam": "groupByParam", - "columns": ["iit35b.location_id"], + "columns": ["b.location_id"], "excludeParam": "excludeParam" }, "transFormDirectives": { diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-base.json index 1f6d1b362..7dbbb543c 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iit35-report-base.json @@ -7,14 +7,22 @@ "sources": [ { "table": "etl.hiv_monthly_report_dataset_frozen", - "alias": "iit35hm" + "alias": "hm" }, { "table": "amrs.location", "alias": "iit35ll", "join": { "type": "INNER", - "joinCondition": "iit35hm.location_id = iit35ll.location_id" + "joinCondition": "hm.location_id = iit35ll.location_id" + } + }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" } }, { @@ -22,7 +30,7 @@ "alias": "iit35tx", "join": { "type": "LEFT", - "joinCondition": "iit35hm.person_id = iit35tx.person_id AND iit35tx.on_art_this_month = 1" + "joinCondition": "hm.person_id = iit35tx.person_id AND iit35tx.on_art_this_month = 1" } } ], @@ -30,12 +38,27 @@ { "type": "simple_column", "alias": "person_id", - "column": "iit35hm.person_id" + "column": "hm.person_id" }, { "type": "simple_column", "alias": "location_id", - "column": "iit35hm.location_id" + "column": "hm.location_id" + }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "iit35ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" }, { "type": "simple_column", @@ -50,53 +73,29 @@ { "type": "simple_column", "alias": "status", - "column": "iit35hm.status" + "column": "hm.status" }, { "type": "simple_column", "alias": "gender", - "column": "iit35hm.gender" + "column": "hm.gender" }, { "type": "simple_column", "alias": "age", - "column": "iit35hm.age" + "column": "hm.age" }, { "type": "simple_column", "alias": "endDate", - "column": "iit35hm.endDate" - }, - { - "type": "derived_column", - "alias": "male_iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "iit_3_5_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age < 0),1,0)" - } + "column": "hm.endDate" }, { "type": "derived_column", "alias": "male_iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age >= 0 AND iit35hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -104,7 +103,7 @@ "alias": "female_iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age >= 0 AND iit35hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -112,7 +111,7 @@ "alias": "iit_3_5_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age >= 0 AND iit35hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -120,7 +119,7 @@ "alias": "male_iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -128,7 +127,7 @@ "alias": "female_iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -136,7 +135,7 @@ "alias": "iit_3_5_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -144,7 +143,7 @@ "alias": "male_iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -152,7 +151,7 @@ "alias": "female_iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -160,7 +159,7 @@ "alias": "iit_3_5_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -168,7 +167,7 @@ "alias": "male_iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -176,7 +175,7 @@ "alias": "female_iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -184,7 +183,7 @@ "alias": "iit_3_5_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -192,7 +191,7 @@ "alias": "male_iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -200,7 +199,7 @@ "alias": "female_iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -208,7 +207,7 @@ "alias": "iit_3_5_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -216,7 +215,7 @@ "alias": "male_iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -224,7 +223,7 @@ "alias": "female_iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -232,7 +231,7 @@ "alias": "iit_3_5_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -240,7 +239,7 @@ "alias": "male_iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -248,7 +247,7 @@ "alias": "female_iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -256,7 +255,7 @@ "alias": "iit_3_5_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -264,7 +263,7 @@ "alias": "male_iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -272,7 +271,7 @@ "alias": "female_iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -280,7 +279,7 @@ "alias": "iit_3_5_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -288,7 +287,7 @@ "alias": "male_iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -296,7 +295,7 @@ "alias": "female_iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -304,7 +303,7 @@ "alias": "iit_3_5_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -312,7 +311,7 @@ "alias": "male_iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -320,7 +319,7 @@ "alias": "female_iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -328,7 +327,7 @@ "alias": "iit_3_5_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -336,7 +335,7 @@ "alias": "male_iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -344,7 +343,7 @@ "alias": "female_iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -352,7 +351,7 @@ "alias": "iit_3_5_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -360,7 +359,7 @@ "alias": "male_iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -368,7 +367,7 @@ "alias": "female_iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -376,7 +375,7 @@ "alias": "iit_3_5_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -384,7 +383,7 @@ "alias": "male_iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -392,7 +391,7 @@ "alias": "female_iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -400,7 +399,7 @@ "alias": "iit_3_5_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -408,7 +407,7 @@ "alias": "male_iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -416,7 +415,7 @@ "alias": "female_iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -424,7 +423,7 @@ "alias": "iit_3_5_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -432,7 +431,7 @@ "alias": "male_iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M' AND iit35hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 65),1,0)" } }, { @@ -440,7 +439,7 @@ "alias": "female_iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F' AND iit35hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 65),1,0)" } }, { @@ -448,7 +447,7 @@ "alias": "iit_3_5_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 65),1,0)" } }, { @@ -456,7 +455,7 @@ "alias": "female_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'F'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F'),1,0)" } }, { @@ -464,7 +463,7 @@ "alias": "male_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter' AND iit35hm.gender = 'M'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M'),1,0)" } }, { @@ -472,7 +471,7 @@ "alias": "total_iit_3_5", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iit35hm.status = 'defaulter'),1,0)" + "expression": "if((hm.status = 'defaulter'),1,0)" } } ], @@ -481,21 +480,21 @@ "conditions": [ { "filterType": "tableColumns", - "conditionExpression": "iit35hm.location_id IN ?", + "conditionExpression": "hm.location_id IN ?", "parameterName": "locations" }, { "filterType": "tableColumns", - "conditionExpression": "iit35hm.endDate = ?", + "conditionExpression": "hm.endDate = ?", "parameterName": "eDate" }, { "filterType": "tableColumns", - "conditionExpression": "iit35hm.on_art_this_month = 0" + "conditionExpression": "hm.on_art_this_month = 0" }, { "filterType": "tableColumns", - "conditionExpression": "(DATEDIFF(iit35hm.rtc_date, iit35hm.arv_first_regimen_start_date) between 90 and 179)" + "conditionExpression": "(DATEDIFF(hm.rtc_date, hm.arv_first_regimen_start_date) between 90 and 179)" }, { "filterType": "tableColumns", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-aggregate.json index 559fa6b61..9936c8481 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-aggregate.json @@ -13,7 +13,7 @@ "sources": [ { "dataSet": "txmlIITabove6ReportBase", - "alias": "iitabove6b" + "alias": "b" } ], "columns": [ @@ -28,48 +28,39 @@ { "type": "simple_column", "alias": "location_uuid", - "column": "iitabove6b.location_uuid" + "column": "b.location_uuid" }, { "type": "simple_column", "alias": "location_id", - "column": "iitabove6b.location_id" + "column": "b.location_id" }, { "type": "simple_column", - "alias": "location", - "column": "iitabove6b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", "alias": "male_iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_less_1_year)" + "expression": "SUM(b.male_iit_6_plus_less_1_year)" } }, { @@ -77,7 +68,7 @@ "alias": "female_iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_less_1_year)" + "expression": "SUM(b.female_iit_6_plus_less_1_year)" } }, { @@ -85,7 +76,7 @@ "alias": "iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_less_1_year)" + "expression": "SUM(b.iit_6_plus_less_1_year)" } }, { @@ -93,7 +84,7 @@ "alias": "male_iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_one_four_year)" + "expression": "SUM(b.male_iit_6_plus_one_four_year)" } }, { @@ -101,7 +92,7 @@ "alias": "female_iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_one_four_year)" + "expression": "SUM(b.female_iit_6_plus_one_four_year)" } }, { @@ -109,7 +100,7 @@ "alias": "iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_one_four_year)" + "expression": "SUM(b.iit_6_plus_one_four_year)" } }, { @@ -117,7 +108,7 @@ "alias": "male_iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_5_9_year)" + "expression": "SUM(b.male_iit_6_plus_5_9_year)" } }, { @@ -125,7 +116,7 @@ "alias": "female_iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_5_9_year)" + "expression": "SUM(b.female_iit_6_plus_5_9_year)" } }, { @@ -133,7 +124,7 @@ "alias": "iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_5_9_year)" + "expression": "SUM(b.iit_6_plus_5_9_year)" } }, { @@ -141,7 +132,7 @@ "alias": "male_iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_10_14_year)" + "expression": "SUM(b.male_iit_6_plus_10_14_year)" } }, { @@ -149,7 +140,7 @@ "alias": "female_iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_10_14_year)" + "expression": "SUM(b.female_iit_6_plus_10_14_year)" } }, { @@ -157,7 +148,7 @@ "alias": "iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_10_14_year)" + "expression": "SUM(b.iit_6_plus_10_14_year)" } }, { @@ -165,7 +156,7 @@ "alias": "male_iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_15_19_year)" + "expression": "SUM(b.male_iit_6_plus_15_19_year)" } }, { @@ -173,7 +164,7 @@ "alias": "female_iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_15_19_year)" + "expression": "SUM(b.female_iit_6_plus_15_19_year)" } }, { @@ -181,7 +172,7 @@ "alias": "iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_15_19_year)" + "expression": "SUM(b.iit_6_plus_15_19_year)" } }, { @@ -189,7 +180,7 @@ "alias": "male_iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_20_24_year)" + "expression": "SUM(b.male_iit_6_plus_20_24_year)" } }, { @@ -197,7 +188,7 @@ "alias": "female_iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_20_24_year)" + "expression": "SUM(b.female_iit_6_plus_20_24_year)" } }, { @@ -205,7 +196,7 @@ "alias": "iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_20_24_year)" + "expression": "SUM(b.iit_6_plus_20_24_year)" } }, { @@ -213,7 +204,7 @@ "alias": "male_iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_25_29_year)" + "expression": "SUM(b.male_iit_6_plus_25_29_year)" } }, { @@ -221,7 +212,7 @@ "alias": "female_iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_25_29_year)" + "expression": "SUM(b.female_iit_6_plus_25_29_year)" } }, { @@ -229,7 +220,7 @@ "alias": "iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_25_29_year)" + "expression": "SUM(b.iit_6_plus_25_29_year)" } }, { @@ -237,7 +228,7 @@ "alias": "male_iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_30_34_year)" + "expression": "SUM(b.male_iit_6_plus_30_34_year)" } }, { @@ -245,7 +236,7 @@ "alias": "female_iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_30_34_year)" + "expression": "SUM(b.female_iit_6_plus_30_34_year)" } }, { @@ -253,7 +244,7 @@ "alias": "iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_30_34_year)" + "expression": "SUM(b.iit_6_plus_30_34_year)" } }, { @@ -261,7 +252,7 @@ "alias": "male_iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_35_39_year)" + "expression": "SUM(b.male_iit_6_plus_35_39_year)" } }, { @@ -269,7 +260,7 @@ "alias": "female_iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_35_39_year)" + "expression": "SUM(b.female_iit_6_plus_35_39_year)" } }, { @@ -277,7 +268,7 @@ "alias": "iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_35_39_year)" + "expression": "SUM(b.iit_6_plus_35_39_year)" } }, { @@ -285,7 +276,7 @@ "alias": "male_iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_40_44_year)" + "expression": "SUM(b.male_iit_6_plus_40_44_year)" } }, { @@ -293,7 +284,7 @@ "alias": "female_iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_40_44_year)" + "expression": "SUM(b.female_iit_6_plus_40_44_year)" } }, { @@ -301,7 +292,7 @@ "alias": "iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_40_44_year)" + "expression": "SUM(b.iit_6_plus_40_44_year)" } }, { @@ -309,7 +300,7 @@ "alias": "male_iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_45_49_year)" + "expression": "SUM(b.male_iit_6_plus_45_49_year)" } }, { @@ -317,7 +308,7 @@ "alias": "female_iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_45_49_year)" + "expression": "SUM(b.female_iit_6_plus_45_49_year)" } }, { @@ -325,7 +316,7 @@ "alias": "iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_45_49_year)" + "expression": "SUM(b.iit_6_plus_45_49_year)" } }, { @@ -333,7 +324,7 @@ "alias": "male_iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_50_54_year)" + "expression": "SUM(b.male_iit_6_plus_50_54_year)" } }, { @@ -341,7 +332,7 @@ "alias": "female_iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_50_54_year)" + "expression": "SUM(b.female_iit_6_plus_50_54_year)" } }, { @@ -349,7 +340,7 @@ "alias": "iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_50_54_year)" + "expression": "SUM(b.iit_6_plus_50_54_year)" } }, { @@ -357,7 +348,7 @@ "alias": "male_iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_55_59_year)" + "expression": "SUM(b.male_iit_6_plus_55_59_year)" } }, { @@ -365,7 +356,7 @@ "alias": "female_iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_55_59_year)" + "expression": "SUM(b.female_iit_6_plus_55_59_year)" } }, { @@ -373,7 +364,7 @@ "alias": "iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_55_59_year)" + "expression": "SUM(b.iit_6_plus_55_59_year)" } }, { @@ -381,7 +372,7 @@ "alias": "male_iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_60_64_year)" + "expression": "SUM(b.male_iit_6_plus_60_64_year)" } }, { @@ -389,7 +380,7 @@ "alias": "female_iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_60_64_year)" + "expression": "SUM(b.female_iit_6_plus_60_64_year)" } }, { @@ -397,7 +388,7 @@ "alias": "iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_60_64_year)" + "expression": "SUM(b.iit_6_plus_60_64_year)" } }, { @@ -405,7 +396,7 @@ "alias": "male_iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus_above_65_year)" + "expression": "SUM(b.male_iit_6_plus_above_65_year)" } }, { @@ -413,7 +404,7 @@ "alias": "female_iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus_above_65_year)" + "expression": "SUM(b.female_iit_6_plus_above_65_year)" } }, { @@ -421,7 +412,7 @@ "alias": "iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.iit_6_plus_above_65_year)" + "expression": "SUM(b.iit_6_plus_above_65_year)" } }, { @@ -429,7 +420,7 @@ "alias": "female_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.female_iit_6_plus)" + "expression": "SUM(b.female_iit_6_plus)" } }, { @@ -437,7 +428,7 @@ "alias": "male_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.male_iit_6_plus)" + "expression": "SUM(b.male_iit_6_plus)" } }, { @@ -445,13 +436,13 @@ "alias": "total_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitabove6b.total_iit_6_plus)" + "expression": "SUM(b.total_iit_6_plus)" } } ], "groupBy": { "groupParam": "groupByParam", - "columns": ["iitabove6b.location_id"], + "columns": ["b.location_id"], "excludeParam": "excludeParam" }, "transFormDirectives": { diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-base.json index c12f4277e..dad9e1e3f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitabove6-report-base.json @@ -7,14 +7,22 @@ "sources": [ { "table": "etl.hiv_monthly_report_dataset_frozen", - "alias": "iitabove6hm" + "alias": "hm" }, { "table": "amrs.location", "alias": "iitabove6ll", "join": { "type": "INNER", - "joinCondition": "iitabove6hm.location_id = iitabove6ll.location_id" + "joinCondition": "hm.location_id = iitabove6ll.location_id" + } + }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" } }, { @@ -22,7 +30,7 @@ "alias": "iitabovetx", "join": { "type": "LEFT", - "joinCondition": "iitabove6hm.person_id = iitabovetx.person_id AND iitabovetx.on_art_this_month = 1" + "joinCondition": "hm.person_id = iitabovetx.person_id AND iitabovetx.on_art_this_month = 1" } } ], @@ -30,12 +38,27 @@ { "type": "simple_column", "alias": "person_id", - "column": "iitabove6hm.person_id" + "column": "hm.person_id" }, { "type": "simple_column", "alias": "location_id", - "column": "iitabove6hm.location_id" + "column": "hm.location_id" + }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "iitabove6ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" }, { "type": "simple_column", @@ -50,53 +73,29 @@ { "type": "simple_column", "alias": "status", - "column": "iitabove6hm.status" + "column": "hm.status" }, { "type": "simple_column", "alias": "gender", - "column": "iitabove6hm.gender" + "column": "hm.gender" }, { "type": "simple_column", "alias": "age", - "column": "iitabove6hm.age" + "column": "hm.age" }, { "type": "simple_column", "alias": "endDate", - "column": "iitabove6hm.endDate" - }, - { - "type": "derived_column", - "alias": "male_iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "iit_6_plus_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age < 0),1,0)" - } + "column": "hm.endDate" }, { "type": "derived_column", "alias": "male_iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age >= 0 AND iitabove6hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -104,7 +103,7 @@ "alias": "female_iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age >= 0 AND iitabove6hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -112,7 +111,7 @@ "alias": "iit_6_plus_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age >= 0 AND iitabove6hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -120,7 +119,7 @@ "alias": "male_iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -128,7 +127,7 @@ "alias": "female_iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -136,7 +135,7 @@ "alias": "iit_6_plus_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -144,7 +143,7 @@ "alias": "male_iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -152,7 +151,7 @@ "alias": "female_iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -160,7 +159,7 @@ "alias": "iit_6_plus_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -168,7 +167,7 @@ "alias": "male_iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -176,7 +175,7 @@ "alias": "female_iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -184,7 +183,7 @@ "alias": "iit_6_plus_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -192,7 +191,7 @@ "alias": "male_iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -200,7 +199,7 @@ "alias": "female_iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -208,7 +207,7 @@ "alias": "iit_6_plus_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -216,7 +215,7 @@ "alias": "male_iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -224,7 +223,7 @@ "alias": "female_iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -232,7 +231,7 @@ "alias": "iit_6_plus_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -240,7 +239,7 @@ "alias": "male_iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -248,7 +247,7 @@ "alias": "female_iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -256,7 +255,7 @@ "alias": "iit_6_plus_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -264,7 +263,7 @@ "alias": "male_iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -272,7 +271,7 @@ "alias": "female_iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -280,7 +279,7 @@ "alias": "iit_6_plus_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -288,7 +287,7 @@ "alias": "male_iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -296,7 +295,7 @@ "alias": "female_iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -304,7 +303,7 @@ "alias": "iit_6_plus_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -312,7 +311,7 @@ "alias": "male_iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -320,7 +319,7 @@ "alias": "female_iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -328,7 +327,7 @@ "alias": "iit_6_plus_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -336,7 +335,7 @@ "alias": "male_iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -344,7 +343,7 @@ "alias": "female_iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -352,7 +351,7 @@ "alias": "iit_6_plus_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -360,7 +359,7 @@ "alias": "male_iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -368,7 +367,7 @@ "alias": "female_iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -376,7 +375,7 @@ "alias": "iit_6_plus_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -384,7 +383,7 @@ "alias": "male_iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -392,7 +391,7 @@ "alias": "female_iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -400,7 +399,7 @@ "alias": "iit_6_plus_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -408,7 +407,7 @@ "alias": "male_iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -416,7 +415,7 @@ "alias": "female_iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -424,7 +423,7 @@ "alias": "iit_6_plus_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -432,7 +431,7 @@ "alias": "male_iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M' AND iitabove6hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 65),1,0)" } }, { @@ -440,7 +439,7 @@ "alias": "female_iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F' AND iitabove6hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 65),1,0)" } }, { @@ -448,7 +447,7 @@ "alias": "iit_6_plus_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 65),1,0)" } }, { @@ -456,7 +455,7 @@ "alias": "female_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'F'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F'),1,0)" } }, { @@ -464,7 +463,7 @@ "alias": "male_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter' AND iitabove6hm.gender = 'M'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M'),1,0)" } }, { @@ -472,7 +471,7 @@ "alias": "total_iit_6_plus", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitabove6hm.status = 'defaulter'),1,0)" + "expression": "if((hm.status = 'defaulter'),1,0)" } } ], @@ -481,21 +480,21 @@ "conditions": [ { "filterType": "tableColumns", - "conditionExpression": "iitabove6hm.location_id IN ?", + "conditionExpression": "hm.location_id IN ?", "parameterName": "locations" }, { "filterType": "tableColumns", - "conditionExpression": "iitabove6hm.endDate = ?", + "conditionExpression": "hm.endDate = ?", "parameterName": "eDate" }, { "filterType": "tableColumns", - "conditionExpression": "iitabove6hm.on_art_this_month = 0" + "conditionExpression": "hm.on_art_this_month = 0" }, { "filterType": "tableColumns", - "conditionExpression": "(DATEDIFF(iitabove6hm.rtc_date, iitabove6hm.arv_first_regimen_start_date) >= 180)" + "conditionExpression": "(DATEDIFF(hm.rtc_date, hm.arv_first_regimen_start_date) >= 180)" }, { "filterType": "tableColumns", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-aggregate.json index 8943d68fa..d41c1c8a0 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-aggregate.json @@ -13,7 +13,7 @@ "sources": [ { "dataSet": "txmlIITless3ReportBase", - "alias": "iitless3b" + "alias": "b" } ], "columns": [ @@ -28,48 +28,39 @@ { "type": "simple_column", "alias": "location_uuid", - "column": "iitless3b.location_uuid" + "column": "b.location_uuid" }, { "type": "simple_column", "alias": "location_id", - "column": "iitless3b.location_id" + "column": "b.location_id" }, { "type": "simple_column", - "alias": "location", - "column": "iitless3b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", "alias": "male_iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_less_1_year)" + "expression": "SUM(b.male_iit_less_3_less_1_year)" } }, { @@ -77,7 +68,7 @@ "alias": "female_iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_less_1_year)" + "expression": "SUM(b.female_iit_less_3_less_1_year)" } }, { @@ -85,7 +76,7 @@ "alias": "iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_less_1_year)" + "expression": "SUM(b.iit_less_3_less_1_year)" } }, { @@ -93,7 +84,7 @@ "alias": "male_iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_one_four_year)" + "expression": "SUM(b.male_iit_less_3_one_four_year)" } }, { @@ -101,7 +92,7 @@ "alias": "female_iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_one_four_year)" + "expression": "SUM(b.female_iit_less_3_one_four_year)" } }, { @@ -109,7 +100,7 @@ "alias": "iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_one_four_year)" + "expression": "SUM(b.iit_less_3_one_four_year)" } }, { @@ -117,7 +108,7 @@ "alias": "male_iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_5_9_year)" + "expression": "SUM(b.male_iit_less_3_5_9_year)" } }, { @@ -125,7 +116,7 @@ "alias": "female_iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_5_9_year)" + "expression": "SUM(b.female_iit_less_3_5_9_year)" } }, { @@ -133,7 +124,7 @@ "alias": "iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_5_9_year)" + "expression": "SUM(b.iit_less_3_5_9_year)" } }, { @@ -141,7 +132,7 @@ "alias": "male_iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_10_14_year)" + "expression": "SUM(b.male_iit_less_3_10_14_year)" } }, { @@ -149,7 +140,7 @@ "alias": "female_iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_10_14_year)" + "expression": "SUM(b.female_iit_less_3_10_14_year)" } }, { @@ -157,7 +148,7 @@ "alias": "iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_10_14_year)" + "expression": "SUM(b.iit_less_3_10_14_year)" } }, { @@ -165,7 +156,7 @@ "alias": "male_iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_15_19_year)" + "expression": "SUM(b.male_iit_less_3_15_19_year)" } }, { @@ -173,7 +164,7 @@ "alias": "female_iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_15_19_year)" + "expression": "SUM(b.female_iit_less_3_15_19_year)" } }, { @@ -181,7 +172,7 @@ "alias": "iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_15_19_year)" + "expression": "SUM(b.iit_less_3_15_19_year)" } }, { @@ -189,7 +180,7 @@ "alias": "male_iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_20_24_year)" + "expression": "SUM(b.male_iit_less_3_20_24_year)" } }, { @@ -197,7 +188,7 @@ "alias": "female_iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_20_24_year)" + "expression": "SUM(b.female_iit_less_3_20_24_year)" } }, { @@ -205,7 +196,7 @@ "alias": "iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_20_24_year)" + "expression": "SUM(b.iit_less_3_20_24_year)" } }, { @@ -213,7 +204,7 @@ "alias": "male_iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_25_29_year)" + "expression": "SUM(b.male_iit_less_3_25_29_year)" } }, { @@ -221,7 +212,7 @@ "alias": "female_iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_25_29_year)" + "expression": "SUM(b.female_iit_less_3_25_29_year)" } }, { @@ -229,7 +220,7 @@ "alias": "iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_25_29_year)" + "expression": "SUM(b.iit_less_3_25_29_year)" } }, { @@ -237,7 +228,7 @@ "alias": "male_iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_30_34_year)" + "expression": "SUM(b.male_iit_less_3_30_34_year)" } }, { @@ -245,7 +236,7 @@ "alias": "female_iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_30_34_year)" + "expression": "SUM(b.female_iit_less_3_30_34_year)" } }, { @@ -253,7 +244,7 @@ "alias": "iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_30_34_year)" + "expression": "SUM(b.iit_less_3_30_34_year)" } }, { @@ -261,7 +252,7 @@ "alias": "male_iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_35_39_year)" + "expression": "SUM(b.male_iit_less_3_35_39_year)" } }, { @@ -269,7 +260,7 @@ "alias": "female_iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_35_39_year)" + "expression": "SUM(b.female_iit_less_3_35_39_year)" } }, { @@ -277,7 +268,7 @@ "alias": "iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_35_39_year)" + "expression": "SUM(b.iit_less_3_35_39_year)" } }, { @@ -285,7 +276,7 @@ "alias": "male_iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_40_44_year)" + "expression": "SUM(b.male_iit_less_3_40_44_year)" } }, { @@ -293,7 +284,7 @@ "alias": "female_iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_40_44_year)" + "expression": "SUM(b.female_iit_less_3_40_44_year)" } }, { @@ -301,7 +292,7 @@ "alias": "iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_40_44_year)" + "expression": "SUM(b.iit_less_3_40_44_year)" } }, { @@ -309,7 +300,7 @@ "alias": "male_iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_45_49_year)" + "expression": "SUM(b.male_iit_less_3_45_49_year)" } }, { @@ -317,7 +308,7 @@ "alias": "female_iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_45_49_year)" + "expression": "SUM(b.female_iit_less_3_45_49_year)" } }, { @@ -325,7 +316,7 @@ "alias": "iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_45_49_year)" + "expression": "SUM(b.iit_less_3_45_49_year)" } }, { @@ -333,7 +324,7 @@ "alias": "male_iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_50_54_year)" + "expression": "SUM(b.male_iit_less_3_50_54_year)" } }, { @@ -341,7 +332,7 @@ "alias": "female_iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_50_54_year)" + "expression": "SUM(b.female_iit_less_3_50_54_year)" } }, { @@ -349,7 +340,7 @@ "alias": "iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_50_54_year)" + "expression": "SUM(b.iit_less_3_50_54_year)" } }, { @@ -357,7 +348,7 @@ "alias": "male_iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_55_59_year)" + "expression": "SUM(b.male_iit_less_3_55_59_year)" } }, { @@ -365,7 +356,7 @@ "alias": "female_iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_55_59_year)" + "expression": "SUM(b.female_iit_less_3_55_59_year)" } }, { @@ -373,7 +364,7 @@ "alias": "iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_55_59_year)" + "expression": "SUM(b.iit_less_3_55_59_year)" } }, { @@ -381,7 +372,7 @@ "alias": "male_iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_60_64_year)" + "expression": "SUM(b.male_iit_less_3_60_64_year)" } }, { @@ -389,7 +380,7 @@ "alias": "female_iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_60_64_year)" + "expression": "SUM(b.female_iit_less_3_60_64_year)" } }, { @@ -397,7 +388,7 @@ "alias": "iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_60_64_year)" + "expression": "SUM(b.iit_less_3_60_64_year)" } }, { @@ -405,7 +396,7 @@ "alias": "male_iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3_above_65_year)" + "expression": "SUM(b.male_iit_less_3_above_65_year)" } }, { @@ -413,7 +404,7 @@ "alias": "female_iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3_above_65_year)" + "expression": "SUM(b.female_iit_less_3_above_65_year)" } }, { @@ -421,7 +412,7 @@ "alias": "iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.iit_less_3_above_65_year)" + "expression": "SUM(b.iit_less_3_above_65_year)" } }, { @@ -429,7 +420,7 @@ "alias": "female_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.female_iit_less_3)" + "expression": "SUM(b.female_iit_less_3)" } }, { @@ -437,7 +428,7 @@ "alias": "male_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.male_iit_less_3)" + "expression": "SUM(b.male_iit_less_3)" } }, { @@ -445,13 +436,13 @@ "alias": "total_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "SUM(iitless3b.total_iit_less_3)" + "expression": "SUM(b.total_iit_less_3)" } } ], "groupBy": { "groupParam": "groupByParam", - "columns": ["iitless3b.location_id"], + "columns": ["b.location_id"], "excludeParam": "excludeParam" }, "transFormDirectives": { diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-base.json index f287e9784..f5436c99f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-iitless3-report-base.json @@ -7,14 +7,22 @@ "sources": [ { "table": "etl.hiv_monthly_report_dataset_frozen", - "alias": "iitless3hm" + "alias": "hm" }, { "table": "amrs.location", "alias": "iitless3ll", "join": { "type": "INNER", - "joinCondition": "iitless3hm.location_id = iitless3ll.location_id" + "joinCondition": "hm.location_id = iitless3ll.location_id" + } + }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" } }, { @@ -22,7 +30,7 @@ "alias": "iitless3tx", "join": { "type": "LEFT", - "joinCondition": "iitless3hm.person_id = iitless3tx.person_id AND iitless3tx.on_art_this_month = 1" + "joinCondition": "hm.person_id = iitless3tx.person_id AND iitless3tx.on_art_this_month = 1" } } ], @@ -30,12 +38,27 @@ { "type": "simple_column", "alias": "person_id", - "column": "iitless3hm.person_id" + "column": "hm.person_id" }, { "type": "simple_column", "alias": "location_id", - "column": "iitless3hm.location_id" + "column": "hm.location_id" + }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "iitless3ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" }, { "type": "simple_column", @@ -50,53 +73,29 @@ { "type": "simple_column", "alias": "status", - "column": "iitless3hm.status" + "column": "hm.status" }, { "type": "simple_column", "alias": "gender", - "column": "iitless3hm.gender" + "column": "hm.gender" }, { "type": "simple_column", "alias": "age", - "column": "iitless3hm.age" + "column": "hm.age" }, { "type": "simple_column", "alias": "endDate", - "column": "iitless3hm.endDate" - }, - { - "type": "derived_column", - "alias": "male_iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "iit_less_3_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age < 0),1,0)" - } + "column": "hm.endDate" }, { "type": "derived_column", "alias": "male_iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age >= 0 AND iitless3hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -104,7 +103,7 @@ "alias": "female_iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age >= 0 AND iitless3hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -112,7 +111,7 @@ "alias": "iit_less_3_less_1_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age >= 0 AND iitless3hm.age < 1),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 0 AND hm.age < 1),1,0)" } }, { @@ -120,7 +119,7 @@ "alias": "male_iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -128,7 +127,7 @@ "alias": "female_iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -136,7 +135,7 @@ "alias": "iit_less_3_one_four_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 1 AND 4),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 1 AND 4),1,0)" } }, { @@ -144,7 +143,7 @@ "alias": "male_iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -152,7 +151,7 @@ "alias": "female_iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -160,7 +159,7 @@ "alias": "iit_less_3_5_9_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 5 AND 9),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 5 AND 9),1,0)" } }, { @@ -168,7 +167,7 @@ "alias": "male_iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -176,7 +175,7 @@ "alias": "female_iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -184,7 +183,7 @@ "alias": "iit_less_3_10_14_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 10 AND 14),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 10 AND 14),1,0)" } }, { @@ -192,7 +191,7 @@ "alias": "male_iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -200,7 +199,7 @@ "alias": "female_iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -208,7 +207,7 @@ "alias": "iit_less_3_15_19_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 15 AND 19),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 15 AND 19),1,0)" } }, { @@ -216,7 +215,7 @@ "alias": "male_iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -224,7 +223,7 @@ "alias": "female_iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -232,7 +231,7 @@ "alias": "iit_less_3_20_24_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 20 AND 24),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 20 AND 24),1,0)" } }, { @@ -240,7 +239,7 @@ "alias": "male_iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -248,7 +247,7 @@ "alias": "female_iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -256,7 +255,7 @@ "alias": "iit_less_3_25_29_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 25 AND 29),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 25 AND 29),1,0)" } }, { @@ -264,7 +263,7 @@ "alias": "male_iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -272,7 +271,7 @@ "alias": "female_iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -280,7 +279,7 @@ "alias": "iit_less_3_30_34_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 30 AND 34),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 30 AND 34),1,0)" } }, { @@ -288,7 +287,7 @@ "alias": "male_iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -296,7 +295,7 @@ "alias": "female_iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -304,7 +303,7 @@ "alias": "iit_less_3_35_39_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 35 AND 39),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 35 AND 39),1,0)" } }, { @@ -312,7 +311,7 @@ "alias": "male_iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -320,7 +319,7 @@ "alias": "female_iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -328,7 +327,7 @@ "alias": "iit_less_3_40_44_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 40 AND 44),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 40 AND 44),1,0)" } }, { @@ -336,7 +335,7 @@ "alias": "male_iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -344,7 +343,7 @@ "alias": "female_iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -352,7 +351,7 @@ "alias": "iit_less_3_45_49_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 45 AND 49),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 45 AND 49),1,0)" } }, { @@ -360,7 +359,7 @@ "alias": "male_iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -368,7 +367,7 @@ "alias": "female_iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -376,7 +375,7 @@ "alias": "iit_less_3_50_54_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 50 AND 54),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 50 AND 54),1,0)" } }, { @@ -384,7 +383,7 @@ "alias": "male_iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -392,7 +391,7 @@ "alias": "female_iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -400,7 +399,7 @@ "alias": "iit_less_3_55_59_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 55 AND 59),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 55 AND 59),1,0)" } }, { @@ -408,7 +407,7 @@ "alias": "male_iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -416,7 +415,7 @@ "alias": "female_iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -424,7 +423,7 @@ "alias": "iit_less_3_60_64_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age BETWEEN 60 AND 64),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age BETWEEN 60 AND 64),1,0)" } }, { @@ -432,7 +431,7 @@ "alias": "male_iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M' AND iitless3hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M' AND hm.age >= 65),1,0)" } }, { @@ -440,7 +439,7 @@ "alias": "female_iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F' AND iitless3hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F' AND hm.age >= 65),1,0)" } }, { @@ -448,7 +447,7 @@ "alias": "iit_less_3_above_65_year", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.age >= 65),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.age >= 65),1,0)" } }, { @@ -456,7 +455,7 @@ "alias": "female_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'F'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'F'),1,0)" } }, { @@ -464,7 +463,7 @@ "alias": "male_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter' AND iitless3hm.gender = 'M'),1,0)" + "expression": "if((hm.status = 'defaulter' AND hm.gender = 'M'),1,0)" } }, { @@ -472,7 +471,7 @@ "alias": "total_iit_less_3", "expressionType": "simple_expression", "expressionOptions": { - "expression": "if((iitless3hm.status = 'defaulter'),1,0)" + "expression": "if((hm.status = 'defaulter'),1,0)" } } ], @@ -481,21 +480,21 @@ "conditions": [ { "filterType": "tableColumns", - "conditionExpression": "iitless3hm.location_id IN ?", + "conditionExpression": "hm.location_id IN ?", "parameterName": "locations" }, { "filterType": "tableColumns", - "conditionExpression": "iitless3hm.endDate = ?", + "conditionExpression": "hm.endDate = ?", "parameterName": "eDate" }, { "filterType": "tableColumns", - "conditionExpression": "iitless3hm.on_art_this_month = 0" + "conditionExpression": "hm.on_art_this_month = 0" }, { "filterType": "tableColumns", - "conditionExpression": "(DATEDIFF(iitless3hm.rtc_date, iitless3hm.arv_first_regimen_start_date) between 1 and 89)" + "conditionExpression": "(DATEDIFF(hm.rtc_date, hm.arv_first_regimen_start_date) between 1 and 89)" }, { "filterType": "tableColumns", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-aggregate.json index b0774cd06..628c49ffd 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_died_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_died_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.died_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-base.json index 29daa4182..62c15218f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.hiv_monthly_report_dataset_frozen", "alias": "tx", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'Dead' AND hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'Dead' AND hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "died_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'Dead' AND hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_died_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-indicators.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-indicators.json index 0d676ea1d..30a6fe420 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-indicators.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-report-indicators.json @@ -11,14 +11,6 @@ { "sectionTitle": "Died", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_died_unknown_year", - "male_died_unknown_year", - "died_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -152,14 +144,6 @@ { "sectionTitle": "Interruption in Treatment After being on Treatment for < 3 months", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_iit_less_3_unknown_year", - "male_iit_less_3_unknown_year", - "iit_less_3_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -293,14 +277,6 @@ { "sectionTitle": "Interruption in Treatment After being on Treatment for 3 - 5 months", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_iit_3_5_unknown_year", - "male_iit_3_5_unknown_year", - "iit_3_5_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -434,14 +410,6 @@ { "sectionTitle": "Interruption in Treatment After being on Treatment for 6+ months", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_iit_6_plus_unknown_year", - "male_iit_6_plus_unknown_year", - "iit_6_plus_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -549,9 +517,9 @@ { "label": "60 - 64 years", "indicator": [ - "female_iit_6_plus_60_65_year", - "male_iit_6_plus_60_65_year", - "iit_6_plus_60_65_year" + "female_iit_6_plus_60_64_year", + "male_iit_6_plus_60_64_year", + "iit_6_plus_60_64_year" ] }, { @@ -575,14 +543,6 @@ { "sectionTitle": "Transferred Out", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_to_unknown_year", - "male_to_unknown_year", - "to_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -708,14 +668,6 @@ { "sectionTitle": "Refused (Stopped) Treatment", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_rst_unknown_year", - "male_rst_unknown_year", - "rst_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-aggregate.json index 7440be364..5657d3ab6 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_rst_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_rst_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.rst_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-base.json index e1467e121..717639460 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-rst-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.hiv_monthly_report_dataset_frozen", "alias": "tx", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'ltfu' AND hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'ltfu' AND hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "rst_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'ltfu' AND hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_rst_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-aggregate.json index 36ced3a07..4eb4e4cd0 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "male_to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_to_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "female_to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_to_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.to_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-base.json index d09e89194..c0043825f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-ml/tx-ml-to-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.hiv_monthly_report_dataset_frozen", "alias": "tx", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'transfer_out' AND hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'transfer_out' AND hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "to_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.status = 'transfer_out' AND hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_to_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-aggregate.json index e6451f4a2..6e07e70f4 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "1mms_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.1mms_male_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "1mms_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.1mms_female_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "1mms_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.1mms_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-base.json index 8869b19ec..bebd1d95d 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-1mms-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "1mms_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "1mms_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "1mms_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "1mms_male_less_1_year", @@ -491,7 +490,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 0 and 30" + "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) < 56" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-aggregate.json index 510af9b84..f745ce129 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "2mms_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.2mms_male_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "2mms_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.2mms_female_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "2mms_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.2mms_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-base.json index 6908f6aee..f0fc22854 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-2mms-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "2mms_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "2mms_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "2mms_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "2mms_male_less_1_year", @@ -491,7 +490,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 31 and 60" + "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 56 and 83" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-aggregate.json index 1b52eb807..aabf25536 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-aggregate.json @@ -37,32 +37,23 @@ }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "mfl_code", + "column": "b.mfl_code" }, { - "type": "derived_column", - "alias": "3mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.3mmd_male_unknown_year)" - } + "type": "simple_column", + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "3mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.3mmd_female_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "3mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.3mmd_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-base.json index baed6c30a..779de0d21 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-3mmd-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "3mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "3mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "3mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "3mmd_male_less_1_year", @@ -495,7 +494,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "fhs.med_pickup_rtc_date IS NULL AND DATEDIFF(hm.rtc_date, hm.encounter_date) BETWEEN 61 AND 90 OR fhs.med_pickup_rtc_date IS NOT NULL" + "conditionExpression": "fhs.med_pickup_rtc_date IS NULL AND DATEDIFF(hm.rtc_date, hm.encounter_date) BETWEEN 84 AND 111 OR fhs.med_pickup_rtc_date IS NOT NULL" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-aggregate.json index e86789661..45381d290 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "4mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.4mmd_male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "4mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.4mmd_female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "4mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.4mmd_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-base.json index d927ec684..574d774d5 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-4mmd-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "4mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "4mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "4mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "4mmd_male_less_1_year", @@ -491,7 +490,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 91 and 120" + "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 112 and 139" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-aggregate.json index 5d1eb28f7..73a309397 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "5mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.5mmd_male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "5mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.5mmd_female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "5mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.5mmd_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-base.json index 1cb6bb43d..2ffd5c529 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-5mmd-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "5mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "5mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "5mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "5mmd_male_less_1_year", @@ -491,7 +490,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 121 and 150" + "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) between 140 and 167" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-aggregate.json index e4bd79360..8acc79c93 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "6mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.6mmd_male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "6mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.6mmd_female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "6mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.6mmd_unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-base.json index 9e7fb4ca6..c9f2d295f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-6mmd-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.flat_hiv_summary_v15b", "alias": "fhs", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "6mmd_male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "6mmd_female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "6mmd_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "6mmd_male_less_1_year", @@ -491,7 +490,7 @@ }, { "filterType": "tableColumns", - "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) > 150" + "conditionExpression": "hm.on_art_this_month = 1 AND hm.status = 'active' AND fhs.med_pickup_rtc_date is null AND DATEDIFF(hm.rtc_date, hm.encounter_date) > 167" } ] }, diff --git a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-mmd-report-indicators.json b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-mmd-report-indicators.json index 1957ebe7d..2fb6ea4a6 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-mmd-report-indicators.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-mmd/tx-mmd-report-indicators.json @@ -11,14 +11,6 @@ { "sectionTitle": "1-MMS", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "1mms_female_unknown_year", - "1mms_male_unknown_year", - "1mms_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -152,14 +144,6 @@ { "sectionTitle": "2-MMS", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "2mms_female_unknown_year", - "2mms_male_unknown_year", - "2mms_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -293,14 +277,6 @@ { "sectionTitle": "3-MMD", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "3mmd_female_unknown_year", - "3mmd_male_unknown_year", - "3mmd_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -434,14 +410,6 @@ { "sectionTitle": "4-MMD", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "4mmd_female_unknown_year", - "4mmd_male_unknown_year", - "4mmd_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -575,14 +543,6 @@ { "sectionTitle": "5-MMD", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "5mmd_female_unknown_year", - "5mmd_male_unknown_year", - "5mmd_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ @@ -716,14 +676,6 @@ { "sectionTitle": "6-MMD", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "6mmd_female_unknown_year", - "6mmd_male_unknown_year", - "6mmd_unknown_year" - ] - }, { "label": "<1 year", "indicator": [ diff --git a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-aggregate.json index 346a760be..12a583cb3 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-base.json index c1890767a..9e6fdc91f 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-base.json @@ -16,6 +16,14 @@ "type": "INNER", "joinCondition": "hm.location_id = ll.location_id" } + }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } } ], "columns": [ @@ -29,6 +37,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -59,30 +82,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-indicators.json b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-indicators.json index 41ed3341a..cc4961487 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-indicators.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-new/tx-new-report-indicators.json @@ -11,14 +11,6 @@ { "sectionTitle": "TX_NEW Report", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_unknown_year", - "male_unknown_year", - "unknown_year" - ] - }, { "label": "<1 year", "indicator": ["female_less_1_year", "male_less_1_year", "less_1_year"] diff --git a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-aggregate.json b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-aggregate.json index 5f837715f..660f1f8ae 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-aggregate.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-aggregate.json @@ -32,37 +32,28 @@ }, { "type": "simple_column", - "alias": "location_id", - "column": "b.location_id" + "alias": "mfl_code", + "column": "b.mfl_code" }, { "type": "simple_column", - "alias": "location", - "column": "b.location" + "alias": "county", + "column": "b.county" }, { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.male_unknown_year)" - } + "type": "simple_column", + "alias": "facility", + "column": "b.facility" }, { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.female_unknown_year)" - } + "type": "simple_column", + "alias": "location_id", + "column": "b.location_id" }, { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "SUM(b.unknown_year)" - } + "type": "simple_column", + "alias": "location", + "column": "b.location" }, { "type": "derived_column", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-base.json b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-base.json index b90f59275..dc5378747 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-base.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-base.json @@ -17,6 +17,14 @@ "joinCondition": "hm.location_id = ll.location_id" } }, + { + "table": "ndwr.mfl_codes", + "alias": "mc", + "join": { + "type": "LEFT", + "joinCondition": "mc.location_id = hm.location_id" + } + }, { "table": "etl.hiv_monthly_report_dataset_frozen", "alias": "tx", @@ -37,6 +45,21 @@ "alias": "location_id", "column": "hm.location_id" }, + { + "type": "simple_column", + "alias": "mfl_code", + "column": "mc.mfl_code" + }, + { + "type": "simple_column", + "alias": "county", + "column": "ll.state_province" + }, + { + "type": "simple_column", + "alias": "facility", + "column": "mc.Facility" + }, { "type": "simple_column", "alias": "location", @@ -67,30 +90,6 @@ "alias": "endDate", "column": "hm.endDate" }, - { - "type": "derived_column", - "alias": "male_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'M' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "female_unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.gender = 'F' AND hm.age < 0),1,0)" - } - }, - { - "type": "derived_column", - "alias": "unknown_year", - "expressionType": "simple_expression", - "expressionOptions": { - "expression": "if((hm.age < 0),1,0)" - } - }, { "type": "derived_column", "alias": "male_less_1_year", diff --git a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-indicators.json b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-indicators.json index 1e332df51..990146a89 100644 --- a/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-indicators.json +++ b/app/reporting-framework/json-reports/tx-reports/tx-rtt/tx-rtt-report-indicators.json @@ -11,14 +11,6 @@ { "sectionTitle": "TX_RTT Report", "indicators": [ - { - "label": "Unknown Age", - "indicator": [ - "female_unknown_year", - "male_unknown_year", - "unknown_year" - ] - }, { "label": "<1 year", "indicator": ["female_less_1_year", "male_less_1_year", "less_1_year"]