HIV-873: Add ARV start date under Daily schedule and Monthly Report (A…

…MPATH#1075)
jecihjoy · May 17, 2021 · dcec491 · dcec491
1 parent 270c74d
commit dcec491
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 0 deletions.
diff --git a/app/reporting-framework/json-reports/daily-appointments-base.json b/app/reporting-framework/json-reports/daily-appointments-base.json
@@ -97,6 +97,11 @@
       "expressionOptions": {
         "expression": "if(DATE_FORMAT(t2.scheduled_date, '%Y-%m-%d') = '{startDate}',1,null)"
       }
+    },
+    {
+      "type": "simple_column",
+      "alias": "arv_first_regimen_start_date",
+      "column": "date_format(fhs.arv_first_regimen_start_date,'%Y-%m-%d')"
     }
   ],
   "indexDirectives": [

diff --git a/app/reporting-framework/json-reports/daily-attendance-base.json b/app/reporting-framework/json-reports/daily-attendance-base.json
@@ -16,6 +16,14 @@
         "type": "LEFT",
         "joinCondition": "pr.program_id  = t2.program_id"
       }
+    },
+    {
+      "table": "etl.flat_hiv_summary_v15b",
+      "alias": "fhs",
+      "join": {
+        "type": "LEFT",
+        "joinCondition": "t2.encounter_id  = fhs.encounter_id"
+      }
     }
   ],
   "columns": [
@@ -51,6 +59,11 @@
       "expressionOptions": {
         "expression": "if(DATE_FORMAT(t2.encounter_datetime, '%Y-%m-%d') = '{startDate}',1,null)"
       }
+    },
+    {
+      "type": "simple_column",
+      "alias": "arv_first_regimen_start_date",
+      "column": "date_format(fhs.arv_first_regimen_start_date,'%Y-%m-%d')"
     }
   ],
   "filters": {

diff --git a/app/reporting-framework/json-reports/daily-has-not-returned-base.json b/app/reporting-framework/json-reports/daily-has-not-returned-base.json
@@ -128,6 +128,11 @@
       "expressionOptions": {
         "expression": "if((date(t2.scheduled_date) = DATE('{startDate}')) and (t2.scheduled_date = t7.latest_rtc_date)AND  t2.next_program_clinical_datetime IS NULL, 1, null)"
       }
+    },
+    {
+      "type": "simple_column",
+      "alias": "arv_first_regimen_start_date",
+      "column": "date_format(t9.arv_first_regimen_start_date,'%Y-%m-%d')"
     }
   ],
   "filters": {