POC-261: commit for gain losses (#1250)

AMPATH · May 18, 2023 · bcc796e · bcc796e
1 parent d79172d
commit bcc796e
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 0 deletions.
diff --git a/app/reporting-framework/json-reports/hiv-monthly-gains-base.json b/app/reporting-framework/json-reports/hiv-monthly-gains-base.json
@@ -17,6 +17,14 @@
         "joinCondition": "c.person_id = p.person_id AND p.endDate = '{startingMonth}'"
       }
     },
+    {
+      "table": "etl.flat_patient_identifiers_v1",
+      "alias": "flat_identifiers",
+      "join": {
+        "type": "LEFT",
+        "joinCondition": "c.person_id = flat_identifiers.patient_id"
+      }
+    },
     {
       "table": "amrs.location",
       "alias": "cl",
@@ -58,6 +66,21 @@
       "alias": "start_month",
       "column": "DATE_FORMAT(p.endDate,'%Y-%m')"
     },
+    {
+      "type": "simple_column",
+      "alias": "ccc_number",
+      "column": "flat_identifiers.ccc"
+    },
+    {
+      "type": "simple_column",
+      "alias": "ovcid_id",
+      "column": "flat_identifiers.ovcid"
+    },
+    {
+      "type": "simple_column",
+      "alias": "upi_number",
+      "column": "flat_identifiers.nupi"
+    },
     {
       "type": "simple_column",
       "alias": "end_month",

diff --git a/app/reporting-framework/json-reports/hiv-monthly-losses-base.json b/app/reporting-framework/json-reports/hiv-monthly-losses-base.json
@@ -25,6 +25,14 @@
         "joinCondition": "nl.location_id = n.location_id"
       }
     },
+    {
+      "table": "etl.flat_patient_identifiers_v1",
+      "alias": "flat_identifiers",
+      "join": {
+        "type": "LEFT",
+        "joinCondition": "c.person_id = flat_identifiers.patient_id"
+      }
+    },
     {
       "table": "amrs.location",
       "alias": "cl",
@@ -61,6 +69,21 @@
       "alias": "end_date",
       "column": "DATE_FORMAT(n.endDate,'%Y-%m-%d')"
     },
+    {
+      "type": "simple_column",
+      "alias": "ccc_number",
+      "column": "flat_identifiers.ccc"
+    },
+    {
+      "type": "simple_column",
+      "alias": "ovcid_id",
+      "column": "flat_identifiers.ovcid"
+    },
+    {
+      "type": "simple_column",
+      "alias": "upi_number",
+      "column": "flat_identifiers.nupi"
+    },
     {
       "type": "simple_column",
       "alias": "start_month",