modified: .gitignore

This commit is contained in:
brusnitsyn
2026-04-21 10:08:14 +09:00
parent 0e8b6f61b4
commit 2041ab54ea
74 changed files with 7533 additions and 1544 deletions

View File

@@ -3,23 +3,18 @@
namespace App\Http\Controllers\Web;
use App\Http\Controllers\Controller;
use App\Http\Resources\Mis\FormattedPatientResource;
use App\Models\Department;
use App\Models\MetrikaGroup;
use App\Models\MetrikaItem;
use App\Models\MisLpuDoctor;
use App\Models\Report;
use App\Models\UnwantedEvent;
use App\Services\DateRangeService;
use App\Services\ReportPageService;
use App\Services\ReportService;
use Illuminate\Http\Request;
use Illuminate\Support\Carbon;
use Illuminate\Support\Facades\Auth;
use Inertia\Inertia;
class ReportController extends Controller
{
public function __construct(
protected ReportPageService $reportPageService,
protected ReportService $reportService,
protected DateRangeService $dateRangeService
) {}
@@ -28,40 +23,10 @@ class ReportController extends Controller
{
$user = Auth::user();
$departmentId = $request->query('departmentId', $user->department->department_id);
$department = Department::where('department_id', $departmentId)->first(); //$user->department;
$department = Department::where('department_id', $departmentId)->firstOrFail();
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
// Получаем статистику
$statistics = $this->reportService->getReportStatistics($department, $user, $dateRange);
// Получаем метрики
// $metrikaGroup = MetrikaGroup::whereMetrikaGroupId(2)->first();
// $metrikaItems = $metrikaGroup->metrikaItems;
$metrikaItems = MetrikaItem::whereIn('metrika_item_id', [3, 7, 8, 17])->get();
// Получаем информацию о текущем отчете
$reportInfo = $this->reportService->getCurrentReportInfo($department, $user, $dateRange);
return Inertia::render('Report/Index', [
'department' => [
'department_name' => $department->name_full,
'department_id' => $department->department_id,
'beds' => $department->beds,
'percentLoadedBeds' => $this->calculateBedOccupancy($department, $user),
'recipientPlanOfYear' => $this->reportService->getRecipientPlanOfYear($department, $dateRange)['plan'],
'progressPlanOfYear' => $this->reportService->getRecipientPlanOfYear($department, $dateRange)['progress'],
...$statistics,
],
'dates' => [
'startAt' => $dateRange->startTimestamp(),
'endAt' => $dateRange->endTimestamp()
],
'report' => $reportInfo,
'metrikaItems' => $metrikaItems,
'userId' => $reportInfo['userId'],
'userName' => $reportInfo['userName']
]);
return Inertia::render('Report/Index', $this->reportPageService->build($department, $user, $dateRange));
}
public function store(Request $request)
@@ -76,90 +41,8 @@ class ReportController extends Controller
'reportId' => 'nullable|integer'
]);
$report = $this->reportService->storeReport($validated, Auth::user(), false);
$this->reportService->storeReport($validated, Auth::user(), false);
return redirect()->route('start');
}
public function getPatients(Request $request)
{
$user = Auth::user();
$validated = $request->validate([
'status' => 'required|string',
'startAt' => 'nullable',
'endAt' => 'nullable',
]);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$patients = $this->reportService->getPatientsByStatus(
Auth::user(),
$validated['status'],
$dateRange,
);
return response()->json(FormattedPatientResource::collection($patients));
}
public function getPatientsCount(Request $request)
{
$user = Auth::user();
$validated = $request->validate([
'status' => 'required|string',
'startAt' => 'nullable',
'endAt' => 'nullable',
]);
$dateRange = $this->dateRangeService->getDateRangeFromRequest($request, $user);
$count = $this->reportService->getPatientsCountByStatus(
Auth::user(),
$validated['status'],
$dateRange,
);
return response()->json($count);
}
public function removeObservation(Request $request)
{
$validated = $request->validate(['id' => 'required|integer']);
$this->reportService->removeObservationPatient($validated['id']);
return response()->json(['message' => 'Удалено'], 200);
}
public function removeUnwantedEvent(UnwantedEvent $unwantedEvent)
{
$unwantedEvent->delete();
return response()->json(['message' => 'Удалено'], 200);
}
public function getDepartmentUsers()
{
$users = MisLpuDoctor::select(['LPUDoctorID', 'FAM_V', 'IM_V', 'OT_V'])
->active()
->inMyDepartment()
->get();
return response()->json($users, 200);
}
/**
* Рассчитать загруженность коек
*/
private function calculateBedOccupancy(Department $department, $user): int
{
$beds = (int)$department->metrikaDefault()->where('rf_metrika_item_id', 1)->first()->value;
$occupiedBeds = optional(Report::where('rf_department_id', $department->department_id)
->join('metrika_results', 'reports.report_id', '=', 'metrika_results.rf_report_id')
->where('metrika_results.rf_metrika_item_id', 8)
->orderBy('sent_at', 'desc')
->first())->value ?? 0;
return $beds > 0 ? round(intval($occupiedBeds) * 100 / $beds) : 0;
}
}