POC-42: Fix covid report monthly screening numbers (#1218)

Co-authored-by: Drizzentic <[email protected]>

Author: corneliouzbett

app/reporting-framework/json-reports/covid-19-summary-report-base.json

@@ -16,6 +16,14 @@
         "type": "INNER",
         "joinCondition": "ce.location_id = l.location_id"
       }
+    },
+    {
+      "table": "amrs.person",
+      "alias": "per",
+      "join": {
+        "type": "INNER",
+        "joinCondition": "ce.person_id = per.person_id"
+      }
     }
   ],
   "columns": [
@@ -97,7 +105,7 @@
       "alias": "not_vaccinated_this_month",
       "expressionType": "simple_expression",
       "expressionOptions": {
-        "expression": "if(ce.received_covid_19_vaccine = 1066 AND ce.screened_this_month = 1,1,null)"
+        "expression": "if(ce.received_covid_19_vaccine = 1066 AND ce.vaccination_status_this_month is null AND ce.screened_this_month = 1,1,null)"
       }
     },
     {
@@ -169,6 +177,10 @@
         "filterType": "tableColumns",
         "conditionExpression": "ce.endDate = ?",
         "parameterName": "endingMonth"
+      },
+      {
+        "filterType": "tableColumns",
+        "conditionExpression": "(EXTRACT(YEAR FROM (FROM_DAYS(DATEDIFF(NOW(), per.birthdate)))) >= 15)"
       }
     ]
   },

app/reporting-framework/json-reports/patient-list-with-contacts-template.json

@@ -205,11 +205,11 @@
             "value": "Partially Vaccinated"
           },
           {
-            "condition": "c.person_id IS NULL AND c.second_dose_vaccine_administered IS NULL AND EXTRACT(YEAR FROM (FROM_DAYS(DATEDIFF(NOW(), t1.birthdate)))) >= 15",
+            "condition": "c.person_id IS NULL AND c.second_dose_vaccine_administered IS NULL AND c.vaccination_status is null AND EXTRACT(YEAR FROM (FROM_DAYS(DATEDIFF(NOW(), t1.birthdate)))) >= 15",
             "value": "Unknown Covid 19 Vaccination"
           },
           {
-            "condition": "c.received_covid_19_vaccine = 1066 AND EXTRACT(YEAR FROM (FROM_DAYS(DATEDIFF(NOW(), t1.birthdate)))) >= 15",
+            "condition": "c.received_covid_19_vaccine = 1066 AND c.vaccination_status is null AND EXTRACT(YEAR FROM (FROM_DAYS(DATEDIFF(NOW(), t1.birthdate)))) >= 15",
             "value": "Not vaccinated"
           }
         ]