HIV-566: Add Client Due for Viral Load on Differenciated Report (AMPA…

…TH#991) Co-authored-by: Felix Maiko <[email protected]>
jecihjoy · Oct 8, 2020 · 6725868 · 6725868
1 parent bdcc95b
commit 6725868
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/app/reporting-framework/json-reports/differentiated-care-program-aggregate.json b/app/reporting-framework/json-reports/differentiated-care-program-aggregate.json
@@ -77,6 +77,14 @@
             "expressionOptions": {
                 "expression": "count(distinct concat(dcp.enrolled_in_dc_active, dcp.person_id))"
             }
+        },
+        {
+            "type": "derived_column",
+            "alias": "enrolled_and_vl_due",
+            "expressionType": "simple_expression",
+            "expressionOptions": {
+                "expression": "count(distinct concat(dcp.enrolled_and_vl_due, dcp.person_id))"
+            }
         }
     ],
     "filters": {

diff --git a/app/reporting-framework/json-reports/differentiated-care-program-base.json b/app/reporting-framework/json-reports/differentiated-care-program-base.json
@@ -72,6 +72,14 @@
                 "expression": "dcr.enrolled_in_dc"
             }
         },
+        {
+            "type": "derived_column",
+            "alias": "enrolled_and_vl_due",
+            "expressionType": "simple_expression",
+            "expressionOptions": {
+                "expression": "if(dcr.enrolled_in_dc = 1 and dcr.patients_due_for_vl = 1, 1, 0)"
+            }
+        },
         {
             "type": "simple_column",
             "alias": "vl_1",