POC-341: Revise Patient Requiring Viral Order report to Generate the report as per the selected Filters

Author: Alfred-Mutai

app/reporting-framework/json-reports/differentiated-care-program-base.json

@@ -8,6 +8,14 @@
     {
       "table": "etl.dc_monthly_report_dataset",
       "alias": "dcr"
+    },
+    {
+      "table": "(SELECT fli.person_id, fli.hiv_viral_load as vl_1, fli.test_datetime as vl_1_date FROM etl.flat_labs_and_imaging fli INNER JOIN (SELECT person_id, MAX(test_datetime) AS max_vl_1_date FROM etl.flat_labs_and_imaging fli where fli.hiv_viral_load is not null GROUP BY person_id) max_dates ON fli.person_id = max_dates.person_id AND fli.test_datetime = max_dates.max_vl_1_date and fli.hiv_viral_load is not null)",
+      "alias": "fli1",
+      "join": {
+        "type": "LEFT",
+        "joinCondition": "fli1.person_id = dcr.person_id"
+      }
     }
   ],
   "columns": [

app/reporting-framework/json-reports/labs-report-aggregate.json

@@ -72,7 +72,7 @@
       {
         "filterType": "tableColumns",
         "conditionExpression": "(t1.next_clinical_datetime_hiv is null or date(t1.next_clinical_datetime_hiv) > ?)",
-        "parameterName": "endDate"
+        "parameterName": "reportMonth"
       },
       {
         "filterType": "tableColumns",

app/reporting-framework/json-reports/labs-report-base.json

@@ -69,7 +69,7 @@
       "alias": "needs_vl_in_period",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "if(case when (t2.cur_arv_meds is not null and t2.vl_1 > 1000) and (timestampdiff(day,t2.vl_1_date, '{endDate}') >= 90) then true when (timestampdiff(month,t2.arv_start_date, '{endDate}') <= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{endDate}') >= 6)  and (timestampdiff(month,t2.arv_start_date, '{endDate}')>=6) then true when (timestampdiff(month,t2.arv_start_date, '{endDate}') >= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{endDate}') >= 12) then true else false end,1,0)"
+        "expression": "if(case when (t2.cur_arv_meds is not null and t2.vl_1 > 1000) and (timestampdiff(day,t2.vl_1_date, '{reportMonth}') >= 90) then true when (timestampdiff(month,t2.arv_start_date, '{reportMonth}') <= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{reportMonth}') >= 6)  and (timestampdiff(month,t2.arv_start_date, '{reportMonth}')>=6) then true when (timestampdiff(month,t2.arv_start_date, '{reportMonth}') >= 12) and (t2.vl_1_date is null or timestampdiff(month,t2.vl_1_date, '{reportMonth}') >= 12) then true else false end,1,0)"
       }
     },
     {
@@ -152,7 +152,7 @@
       {
         "filterType": "tableColumns",
         "conditionExpression": "(t2.next_clinical_datetime_hiv is null or date(t2.next_clinical_datetime_hiv) > ?)",
-        "parameterName": "endDate"
+        "parameterName": "reportMonth"
       },
       {
         "filterType": "tableColumns",

etl-routes.js

@@ -4375,6 +4375,9 @@ module.exports = (function () {
             endDate: Joi.string()
               .optional()
               .description('The end date to filter by'),
+            reportMonth: Joi.string()
+              .required()
+              .description('The report month in the format "YYYY-MM-DD"'),
             startIndex: Joi.number()
               .required()
               .description('The startIndex to control pagination'),