Профиль хирургии
This commit is contained in:
@@ -36,12 +36,14 @@ class BedDayService
|
||||
|
||||
// Для одного дня берем последние 30 дней для статистической значимости
|
||||
$actualStartDate = $isRangeOneDay
|
||||
? Carbon::parse($endDate)->subDays(30)->format('Y-m-d')
|
||||
? Carbon::now('Asia/Yakutsk')->startOfYear()->format('Y-m-d')
|
||||
: $startDate;
|
||||
|
||||
// Находим отчеты за период
|
||||
$reports = Report::where('rf_department_id', $departmentId)
|
||||
->whereBetween('created_at', [$actualStartDate, $endDate])
|
||||
// ->whereBetween('created_at', [$actualStartDate, $endDate])
|
||||
->where('sent_at', '>=', $actualStartDate)
|
||||
->where('sent_at', '<=', $endDate)
|
||||
->pluck('report_id');
|
||||
|
||||
if ($reports->isEmpty()) {
|
||||
@@ -107,7 +109,9 @@ class BedDayService
|
||||
|
||||
// Находим все отчеты за период по отделениям
|
||||
$reportsByDepartment = Report::whereIn('rf_department_id', $departmentIds)
|
||||
->whereBetween('created_at', [$actualStartDate, $endDate])
|
||||
// ->whereBetween('created_at', [$actualStartDate, $endDate])
|
||||
->where('sent_at', '>=', $actualStartDate)
|
||||
->where('sent_at', '<=', $endDate)
|
||||
->select('report_id', 'rf_department_id')
|
||||
->get()
|
||||
->groupBy('rf_department_id');
|
||||
@@ -186,7 +190,9 @@ class BedDayService
|
||||
public function getDetailedStatsFromSnapshots(int $departmentId, string $startDate, string $endDate): array
|
||||
{
|
||||
$reports = Report::where('rf_department_id', $departmentId)
|
||||
->whereBetween('created_at', [$startDate, $endDate])
|
||||
// ->whereBetween('created_at', [$startDate, $endDate])
|
||||
->where('sent_at', '>', $startDate)
|
||||
->where('sent_at', '<=', $endDate)
|
||||
->pluck('report_id');
|
||||
|
||||
if ($reports->isEmpty()) {
|
||||
@@ -292,7 +298,6 @@ class BedDayService
|
||||
// Для каждого отчета считаем средний койко-день за последние 30 дней до даты отчета
|
||||
$endDate = $report->created_at;
|
||||
$startDate = Carbon::startOfYear();
|
||||
dd($startDate);
|
||||
|
||||
$avg = $this->getAverageBedDaysFromSnapshots(
|
||||
$report->rf_department_id,
|
||||
|
||||
Reference in New Issue
Block a user