AOKB/onboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* работа над функционалом автоматического заполнения

Browse Source 
* исправил фантомный сдвиг даты
* переделал получение ФИО врачей из отделений
* добавил возможность поиска врача
* переписал сохранение отчета
This commit is contained in:
brusnitsyn
2026-02-05 17:11:43 +09:00
parent eab78a0291
commit 10fb138c30
22 changed files with 1192 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Http/Controllers/Web/ReportController.php
View File

@@ -68,12 +68,9 @@ class ReportController extends Controller
'reportId' => 'nullable|integer'
]);
$report = $this->reportService->storeReport($validated, Auth::user());
$report = $this->reportService->storeReport($validated, Auth::user(), false);
return response()->json([
'message' => 'success',
'report_id' => $report->report_id
]);
return redirect()->route('start');
}
public function getPatients(Request $request)

20
app/Http/Controllers/Web/StatisticController.php
View File

@@ -71,16 +71,16 @@ class StatisticController extends Controller
$emergencyCount = 0; $planSurgical = 0; $emergencySurgical = 0; $transferredCount = 0;
$deceasedCount = 0;
foreach ($reports as $report) {
$allCount += $this->getMetrikaResultFromReport($report, 3, $isRangeOneDay);
$currentCount += $this->getMetrikaResultFromReport($report, 8, false);
$occupiedBeds += $this->getMetrikaResultFromReport($report, 8, $isRangeOneDay);
$planCount += $this->getMetrikaResultFromReport($report, 4, $isRangeOneDay);
$emergencyCount += $this->getMetrikaResultFromReport($report, 12, $isRangeOneDay);
$planSurgical += $this->getMetrikaResultFromReport($report, 11, $isRangeOneDay);
$emergencySurgical += $this->getMetrikaResultFromReport($report, 10, $isRangeOneDay);
$transferredCount += $this->getMetrikaResultFromReport($report, 13, $isRangeOneDay);
$outcomeCount += $this->getMetrikaResultFromReport($report, 7, $isRangeOneDay);
$deceasedCount += $this->getMetrikaResultFromReport($report, 9, $isRangeOneDay);
$allCount += $this->getMetrikaResultFromReport($report, 3, $isRangeOneDay); // Поступило
$currentCount += $this->getMetrikaResultFromReport($report, 8, false); // Состоит
$occupiedBeds += $this->getMetrikaResultFromReport($report, 8, $isRangeOneDay); // Состоит
$planCount += $this->getMetrikaResultFromReport($report, 4, $isRangeOneDay); // Поступление - Планово
$emergencyCount += $this->getMetrikaResultFromReport($report, 12, $isRangeOneDay); // Поступление - Экстренно
$planSurgical += $this->getMetrikaResultFromReport($report, 11, $isRangeOneDay); // Операции - Планово
$emergencySurgical += $this->getMetrikaResultFromReport($report, 10, $isRangeOneDay); // Операции - Экстренно
$transferredCount += $this->getMetrikaResultFromReport($report, 13, $isRangeOneDay); // Поступление - Перевод
$outcomeCount += $this->getMetrikaResultFromReport($report, 7, $isRangeOneDay); // Выбыло
$deceasedCount += $this->getMetrikaResultFromReport($report, 9, $isRangeOneDay); // Умерло
}
// Независимые метрики (установки по умолчанию и т.п.)