diff --git a/app/Http/Controllers/Web/StatisticController.php b/app/Http/Controllers/Web/StatisticController.php
index 83212fd..53a7439 100644
--- a/app/Http/Controllers/Web/StatisticController.php
+++ b/app/Http/Controllers/Web/StatisticController.php
@@ -25,7 +25,7 @@ class StatisticController extends Controller
         $queryEndDate = $request->query('endAt');
         $queryDateRange = $this->dateService->getDateRangeFromRequest($request, $user, false);
         $isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate);
-        $dateRange = $this->dateService->getDateRangeFromRequest($request, $user);
+        $dateRange = $this->dateService->getDateRangeFromRequest($request, $user, true);
         $isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
 
         $queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
@@ -49,7 +49,7 @@ class StatisticController extends Controller
             'isHeadOrAdmin' => $isHeadOrAdmin,
             'date' => [
                 $dateRange->startDate->getTimestampMs(),
-                $isRangeOneDayQuery ? $dateRange->endDate->getTimestampMs() : $dateRange->displayEnd()->getTimestampMs(),
+                $dateRange->displayEnd()->getTimestampMs(),
             ],
             'isOneDay' => $isRangeOneDay,
             'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],
diff --git a/resources/js/Components/DatePickerQuery.vue b/resources/js/Components/DatePickerQuery.vue
index e7704f4..809bd02 100644
--- a/resources/js/Components/DatePickerQuery.vue
+++ b/resources/js/Components/DatePickerQuery.vue
@@ -153,7 +153,7 @@ const shortcuts = {
     'Вчера': () => getPreviousShift(),
     'За 7 дней': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end)
         start.setDate(start.getDate() - 7)
         start.setHours(9, 0, 0, 0)
@@ -161,7 +161,7 @@ const shortcuts = {
     },
     'За 30 дней': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end)
         start.setDate(start.getDate() - 30)
         start.setHours(9, 0, 0, 0)
@@ -169,7 +169,7 @@ const shortcuts = {
     },
     'Текущий год': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end.getFullYear(), 0, 1)
         start.setHours(9, 0, 0, 0)
         return [start, end]