From c857bd9f72bf59269540681561f7869b2668e499 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Wed, 3 Jun 2026 11:03:12 +0900
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=20=D0=B2=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BE=D1=82=D1=87?=
 =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B2=20=D0=BE=D1=82=20=D1=81=D0=B8=D1=81?=
 =?UTF-8?q?=D1=82=D0=B5=D0=BC=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Console/Commands/GenerateDutyReport.php |  2 +-
 app/Services/DutyReportService.php          |  2 +-
 resources/js/Pages/Report/Index.vue         | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/app/Console/Commands/GenerateDutyReport.php b/app/Console/Commands/GenerateDutyReport.php
index 74fd451..3fd408d 100644
--- a/app/Console/Commands/GenerateDutyReport.php
+++ b/app/Console/Commands/GenerateDutyReport.php
@@ -178,7 +178,7 @@ class GenerateDutyReport extends Command
 
         // Формируем DateRange через ваш сервис (учёт смен, часовых поясов)
         $user = User::find($userId);
-        $lpuDoctorId = $user->rf_lpudoctor_id ?? 1;
+        $lpuDoctorId = 0;
         $dateRange = $dateRangeService->createDateRangeForDate($shiftEnd, $user);
 
         // Цепочка из вашего контроллера
diff --git a/app/Services/DutyReportService.php b/app/Services/DutyReportService.php
index 8435c59..0e02292 100644
--- a/app/Services/DutyReportService.php
+++ b/app/Services/DutyReportService.php
@@ -49,7 +49,7 @@ class DutyReportService
         $departmentId = $departmentId ?? $user->rf_department_id;
 
         $data = [
-            'report_date' => Carbon::now()->format('Y-m-d'),
+            'report_date' => $dateRange->endSql(),
             'sent_at' => Carbon::now()->format('Y-m-d H:i:s'),
             'period_type' => 'day',
             'period_start' => $dateRange->startSql(),
diff --git a/resources/js/Pages/Report/Index.vue b/resources/js/Pages/Report/Index.vue
index 6d5879d..b158f6c 100644
--- a/resources/js/Pages/Report/Index.vue
+++ b/resources/js/Pages/Report/Index.vue
@@ -1,7 +1,7 @@
 <script setup>
 import AppLayout from "../../Layouts/AppLayout.vue";
 import {useReportStore} from "../../Stores/report.js";
-import {onMounted, ref, watch, provide} from "vue";
+import {onMounted, ref, watch, provide, computed} from "vue";
 import {useAuthStore} from "../../Stores/auth.js";
 import {
     NFormItem,
@@ -184,6 +184,17 @@ const syncPageProps = (pageProps = props) => {
 
 onMounted(syncPageProps)
 
+const reportCreator = computed(() => {
+    if (latestReportObj.value === null) return ''
+    if (latestReportObj.value.doctor.LPUDoctorID === 0) return 'Отчет создан системой'
+    else return `Отчет создан: ${latestReportObj.value.doctor.FAM_V} ${latestReportObj.value.doctor.IM_V} ${latestReportObj.value.doctor.OT_V}`
+})
+const reportCreatorType = computed(() => {
+    if (latestReportObj.value === null) return 'warning'
+    if (latestReportObj.value.doctor.LPUDoctorID === 0) return 'error'
+    else return 'warning'
+})
+
 watch(() => props, (newProps) => {
     syncPageProps(newProps)
 }, {
@@ -206,8 +217,8 @@ watch(() => props, (newProps) => {
                         <NTag type="info" :bordered="false">
                             {{ department.name_full }}
                         </NTag>
-                        <NTag v-if="props.latestReport" type="warning" :bordered="false">
-                            Отчет создан: {{ `${props.latestReport.doctor.FAM_V} ${props.latestReport.doctor.IM_V} ${props.latestReport.doctor.OT_V}` }}
+                        <NTag v-if="props.latestReport" :type="reportCreatorType" :bordered="false">
+                            {{ reportCreator }}
                         </NTag>
                     </NSpace>
                     <DatePickerQuery :date="dates" :is-head-or-admin="true" class="text-lg!" />