CM measurements matrix - where clause fix

app/Models/Client.php

@@ -676,9 +676,12 @@ SELECT m.id   AS measurement_id,
 FROM measurement m
          JOIN care_month cm ON m.care_month_id = cm.id
 WHERE m.care_month_id = :careMonthID
+        AND m.label NOT IN ('SBP', 'DBP')
         AND m.bdt_measurement_id IS NOT NULL
-        AND m.is_cellular_zero IS FALSE
         AND m.is_removed IS FALSE
+        AND (m.is_cellular_zero = FALSE or m.is_cellular_zero IS NULL)
+        AND m.ts IS NOT NULL
+        AND m.client_bdt_measurement_id IS NOT NULL
 ORDER BY m.effective_date
             ",
             ['careMonthID' => $_careMonth->id]