Исправил индиктор заполнения отчета в статистике
Добавил вывод прошедшего отчета в статистике Исправил выбор дат в календаре статистики
This commit is contained in:
@@ -255,6 +255,8 @@ class StatisticsService
|
||||
|
||||
$departmentName = $dept->user_name ?? $dept->name_short;
|
||||
|
||||
$isReportToday = $lastReport ? Carbon::parse($lastReport->period_end)->isSameDay($endDate) && $lastReport->rf_lpudoctor_id !== 0 : null;
|
||||
|
||||
$data = [
|
||||
'department' => $departmentName,
|
||||
'department_id' => $deptId,
|
||||
@@ -305,7 +307,7 @@ class StatisticsService
|
||||
'lethality' => $lethality,
|
||||
'type' => $typeName,
|
||||
'isDepartment' => true,
|
||||
'isReportToday' => $lastReport ? Carbon::parse($lastReport->period_end)->isSameDay($endDate) : null,
|
||||
'isReportToday' => $isReportToday,
|
||||
];
|
||||
|
||||
$groupedData[$typeName][] = $data;
|
||||
|
||||
Reference in New Issue
Block a user