POC-386: Updated datim feedback (#1306)

* POC-386: Datim Feedback * POC-386: Datim Feedback * POC-386: Datim Feedback * POC-386: Datim Feedback
AMPATH · Aug 3, 2023 · d227fe1 · d227fe1
1 parent 25db876
commit d227fe1
Show file tree

Hide file tree

Showing 36 changed files with 966 additions and 1,220 deletions.
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
@@ -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
@@ -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
@@ -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"]