|
|
@@ -912,13 +912,8 @@ SELECT client.name_first, client.name_last, client.uid as client_uid,
|
|
|
client.rme_pro_id,
|
|
|
client.cell_number
|
|
|
FROM care_month join client on care_month.client_id = client.id
|
|
|
-WHERE (
|
|
|
- (client.mcp_pro_id = {$performer->pro->id})
|
|
|
- OR (client.rmm_pro_id = {$performer->pro->id})
|
|
|
- OR (client.rme_pro_id = {$performer->pro->id})
|
|
|
- OR (client.default_na_pro_id = {$performer->pro->id})
|
|
|
- )
|
|
|
- AND EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "
|
|
|
+WHERE
|
|
|
+ EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "
|
|
|
AND EXTRACT(YEAR from care_month.start_date) = " . ($request->input('y') ?: 'EXTRACT(YEAR from now())') . "
|
|
|
{$filters}
|
|
|
ORDER BY care_month.number_of_days_with_remote_measurements DESC NULLS LAST, client.name_first ASC, client.name_last ASC
|
