From 1bfd60ee0d480a07829f1936a0d8200720c3ca66 Mon Sep 17 00:00:00 2001 From: brusnitsyn Date: Thu, 16 Jul 2026 10:17:40 +0900 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=B2=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B0?= =?UTF-8?q?=20=D0=BC=D0=B5=D0=B4.=20=D1=81=D0=B5=D1=81=D1=82=D1=80=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Services/NurseReportService.php | 35 ++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/app/Services/NurseReportService.php b/app/Services/NurseReportService.php index 4dbdc53..9409781 100644 --- a/app/Services/NurseReportService.php +++ b/app/Services/NurseReportService.php @@ -54,17 +54,32 @@ class NurseReportService ->where('period_end', $data['period_end']) ->exists(); - if ($existsReport) unset($data['rf_lpudoctor_id']); +// if ($existsReport) unset($data['rf_lpudoctor_id']); - $report = ReportNurse::updateOrCreate( - [ - 'report_date' => $data['report_date'], - 'period_start' => $data['period_start'], - 'period_end' => $data['period_end'], - 'rf_department_id' => $data['rf_department_id'], - ], - $data - ); +// $report = ReportNurse::updateOrCreate( +// [ +// 'report_date' => $data['report_date'], +// 'period_start' => $data['period_start'], +// 'period_end' => $data['period_end'], +// 'rf_department_id' => $data['rf_department_id'], +// ], +// $data +// ); + + if ($existsReport) { + $data = array_diff_key($data, array_flip(['rf_lpudoctor_id', 'rf_user_id'])); + $report = ReportNurse::updateOrCreate( + [ + 'report_date' => $data['report_date'], + 'period_start' => $data['period_start'], + 'period_end' => $data['period_end'], + 'rf_department_id' => $data['rf_department_id'], + ], + $data + ); + } else { + $report = ReportNurse::create($data); + } return $report; }