Профиль хирургии

app/Http/Controllers/Api/MetrikaFormController.php

@@ -260,7 +260,9 @@ class MetrikaFormController extends Controller
             ->join('metrika_result_values as mv', 'mr.metrika_result_id', '=', 'mv.rf_metrika_result_id')
             ->join('reports as r', 'mr.rf_report_id', '=', 'r.report_id')
             ->where('mr.rf_metrika_group_id', $groupId)
-            ->whereBetween('r.sent_at', [$dateStart, $dateEnd])
+//            ->whereBetween('r.sent_at', [$dateStart, $dateEnd])
+            ->where('r.sent_at', '>', $dateStart)
+            ->where('r.sent_at', '<=', $dateEnd)
             ->when(!$user->isAdmin() && !$user->isHeadOfDepartment(), function ($query) use ($user) {
                 return $query->where('r.rf_user_id', $user->id);
             })
@@ -353,7 +355,9 @@ class MetrikaFormController extends Controller
         $endDate = date("{$year}-{$month}-t", strtotime($startDate));
 
         $reports = Report::where('rf_user_id', $user->id)
-            ->whereBetween('sent_at', [$startDate, $endDate])
+//            ->whereBetween('sent_at', [$startDate, $endDate])
+            ->where('sent_at', '>', $startDate)
+            ->where('sent_at', '<=', $endDate)
             ->get();
 
         // Создаем календарь