dashboard measurements - limit to current month

app/Http/Controllers/HomeController.php

@@ -593,15 +593,14 @@ WHERE ((client.mcp_pro_id = {$performer->pro->id}) OR (client.rmm_pro_id = {$per
 SELECT count(measurement.id) as cnt
 FROM measurement
          join client on measurement.client_id = client.id
-         join care_month on client.id = care_month.client_id
 WHERE measurement.label NOT IN ('SBP', 'DBP')
   AND (measurement.is_cellular_zero = FALSE or measurement.is_cellular_zero IS NULL)
   AND measurement.is_removed IS FALSE
   AND measurement.ts IS NOT NULL
   AND measurement.client_bdt_measurement_id IS NOT NULL
   AND (measurement.status IS NULL OR (measurement.status <> 'ACK' AND measurement.status <> 'INVALID_ACK'))
-  AND EXTRACT(MONTH from care_month.start_date) = EXTRACT(MONTH from now())
-  AND EXTRACT(YEAR from care_month.start_date) = EXTRACT(YEAR from now())
+  AND EXTRACT(MONTH from measurement.created_at) = EXTRACT(MONTH from NOW())
+  AND EXTRACT(YEAR from measurement.created_at) = EXTRACT(YEAR from NOW())
 " .
                 (
                 $performer->pro->pro_type != 'ADMIN' ? $ifNotAdmin : ''
@@ -644,8 +643,10 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
   AND measurement.ts IS NOT NULL
   AND measurement.client_bdt_measurement_id IS NOT NULL
   AND (measurement.status IS NULL OR (measurement.status <> 'ACK' AND measurement.status <> 'INVALID_ACK'))
-  AND EXTRACT(MONTH from care_month.start_date) = EXTRACT(MONTH from now())
-  AND EXTRACT(YEAR from care_month.start_date) = EXTRACT(YEAR from now())
+  AND EXTRACT(MONTH from measurement.created_at) = EXTRACT(MONTH from NOW())
+  AND EXTRACT(YEAR from measurement.created_at) = EXTRACT(YEAR from NOW())
+  AND EXTRACT(MONTH from care_month.start_date) = EXTRACT(MONTH from NOW())
+  AND EXTRACT(YEAR from care_month.start_date) = EXTRACT(YEAR from NOW())
 " .
                 (
                 $performer->pro->pro_type != 'ADMIN' ? $ifNotAdmin : ''