|
@@ -744,13 +744,6 @@ ORDER BY care_month.number_of_days_with_remote_measurements DESC NULLS LAST, cli
|
|
|
|
|
|
$performer = $this->performer();
|
|
$performer = $this->performer();
|
|
|
|
|
|
- date_default_timezone_set('US/Eastern');
|
|
|
|
-
|
|
|
|
- $start = strtotime(date($careMonth->start_date));
|
|
|
|
- $end = date_add(date_create(date($careMonth->start_date)), date_interval_create_from_date_string("1 month"))->getTimestamp();
|
|
|
|
- $start *= 1000;
|
|
|
|
- $end *= 1000;
|
|
|
|
-
|
|
|
|
$measurements = DB::select(
|
|
$measurements = DB::select(
|
|
DB::raw(
|
|
DB::raw(
|
|
"
|
|
"
|
|
@@ -778,7 +771,7 @@ WHERE
|
|
AND (measurement.is_cellular_zero = FALSE or measurement.is_cellular_zero IS NULL)
|
|
AND (measurement.is_cellular_zero = FALSE or measurement.is_cellular_zero IS NULL)
|
|
AND measurement.is_removed IS FALSE
|
|
AND measurement.is_removed IS FALSE
|
|
AND measurement.client_bdt_measurement_id IS NOT NULL
|
|
AND measurement.client_bdt_measurement_id IS NOT NULL
|
|
- AND measurement.ts >= {$start} AND measurement.ts < {$end}
|
|
|
|
|
|
+ AND measurement.care_month_id = {$careMonth->id}
|
|
AND (
|
|
AND (
|
|
(client.mcp_pro_id = {$performer->pro->id} AND measurement.has_been_stamped_by_mcp IS FALSE)
|
|
(client.mcp_pro_id = {$performer->pro->id} AND measurement.has_been_stamped_by_mcp IS FALSE)
|
|
OR (client.rmm_pro_id = {$performer->pro->id} AND measurement.has_been_stamped_by_rmm IS FALSE)
|
|
OR (client.rmm_pro_id = {$performer->pro->id} AND measurement.has_been_stamped_by_rmm IS FALSE)
|