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-03-25 17:37:32 +09:00
parent 52a80ccd3b
commit f566ab96df
75 changed files with 3841 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Api/DepartmentController.php
View File

@@ -10,7 +10,10 @@ class DepartmentController extends Controller
{
public function index(Request $request)
{
$departments = Department::all();
$user = $request->user();
$departmentIds = $user->departments()->pluck('rf_department_id');
$departments = Department::whereIn('department_id', $departmentIds)->orderBy('name_short')->get();
return response()->json($departments);
}

8
app/Http/Controllers/Api/MetrikaFormController.php
View File

@@ -260,7 +260,9 @@ class MetrikaFormController extends Controller
->join('metrika_result_values as mv', 'mr.metrika_result_id', '=', 'mv.rf_metrika_result_id')
->join('reports as r', 'mr.rf_report_id', '=', 'r.report_id')
->where('mr.rf_metrika_group_id', $groupId)
->whereBetween('r.sent_at', [$dateStart, $dateEnd])
// ->whereBetween('r.sent_at', [$dateStart, $dateEnd])
->where('r.sent_at', '>', $dateStart)
->where('r.sent_at', '<=', $dateEnd)
->when(!$user->isAdmin() && !$user->isHeadOfDepartment(), function ($query) use ($user) {
return $query->where('r.rf_user_id', $user->id);
})
@@ -353,7 +355,9 @@ class MetrikaFormController extends Controller
$endDate = date("{$year}-{$month}-t", strtotime($startDate));
$reports = Report::where('rf_user_id', $user->id)
->whereBetween('sent_at', [$startDate, $endDate])
// ->whereBetween('sent_at', [$startDate, $endDate])
->where('sent_at', '>', $startDate)
->where('sent_at', '<=', $endDate)
->get();
// Создаем календарь

24
app/Http/Controllers/Api/OperationController.php Normal file
View File

@@ -0,0 +1,24 @@
<?php
namespace App\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use App\Http\Resources\Api\OperationsResource;
use App\Models\MisSurgicalOperation;
use Illuminate\Http\Request;
class OperationController extends Controller
{
public function operations(Request $request)
{
$validated = $request->validate([
'historyId' => 'required|integer'
]);
$operations = MisSurgicalOperation::where('rf_MedicalHistoryID', $request->historyId)->get();
return response()->json(
OperationsResource::collection($operations)
);
}
}

25
app/Http/Controllers/Api/ReportController.php
View File

@@ -45,7 +45,7 @@ class ReportController extends Controller
$endDateCarbon = Carbon::now();
// Определяем даты в зависимости от роли
[$startDate, $endDate] = $this->dateService->getDateRangeForUser($user, $request->query('startAt'), $request->query('endAt'));
[$startDate, $endDate] = $this->dateRangeService->getDateRangeForUser($user, $request->query('startAt'), $request->query('endAt'));
if (Carbon::parse($startDate)->isValid()) {
$startDateCarbon = Carbon::parse($startDate)->setTimeZone('Asia/Yakutsk');
}
@@ -737,12 +737,16 @@ class ReportController extends Controller
if ($isHeadOrAdmin) {
// Заведующий: используем whereInDepartment
$query = MisMigrationPatient::whereInDepartment($branchId)
->whereBetween('DateIngoing', [$startDate, $endDate]);
// ->whereBetween('DateIngoing', [$startDate, $endDate]);
->where('DateIngoing', '>=', $startDate)
->where('DateIngoing', '<=', $endDate);
} else {
// Врач: используем currentlyInTreatment + фильтр по дате
$query = MisMigrationPatient::currentlyInTreatment($branchId)
->when($today, function ($query) use ($startDate, $endDate) {
return $query->whereBetween('DateIngoing', [$startDate, $endDate]);
// return $query->whereBetween('DateIngoing', [$startDate, $endDate]);
return $query->where('DateIngoing', '>=', $startDate)
->where('DateIngoing', '<=', $endDate);
});
}
}
@@ -757,7 +761,9 @@ class ReportController extends Controller
// Получаем истории
$query = MisMedicalHistory::whereIn('MedicalHistoryID', $medicalHistoryIds)
->with(['surgicalOperations' => function ($query) use ($startDate, $endDate) {
$query->whereBetween('Date', [$startDate, $endDate]);
// $query->whereBetween('Date', [$startDate, $endDate]);
$query->where('Date', '>=', $startDate)
->where('Date', '<=', $endDate);
}])
->orderBy('DateRecipient', 'DESC');
@@ -874,7 +880,9 @@ class ReportController extends Controller
private function getSurgicalPatients(string $status, bool $isHeadOrAdmin, $branchId, $startDate, $endDate, bool $returnedCount = false)
{
$query = MisSurgicalOperation::where('rf_StationarBranchID', $branchId)
->whereBetween('Date', [$startDate, $endDate])
// ->whereBetween('Date', [$startDate, $endDate])
->where('Date', '>=', $startDate)
->where('Date', '<=', $endDate)
->orderBy('Date', 'DESC');
if ($status === 'plan') {
@@ -953,6 +961,7 @@ class ReportController extends Controller
})
->active()
->whereNotIn('LPUDoctorID', [0, 1])
->orderBy('FAM_V')
->get();
return response()->json([
@@ -967,8 +976,10 @@ class ReportController extends Controller
{
if (Carbon::parse($startDate)->diffInDays(Carbon::parse($endDate)) > 1.0)
return Report::where('rf_department_id', $departmentId)
->whereBetween('created_at', [$startDate, $endDate])
->orderBy('created_at', 'ASC')
// ->whereBetween('created_at', [$startDate, $endDate])
->where('sent_at', '>=', $startDate)
->where('sent_at', '<=', $endDate)
->orderBy('sent_at', 'ASC')
->get();
else
return Report::where('rf_department_id', $departmentId)

77
app/Http/Controllers/AuthController.php
View File

@@ -5,8 +5,10 @@ namespace App\Http\Controllers;
use App\Models\User;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Redis;
use Illuminate\Support\Facades\Validator;
use Illuminate\Support\Str;
use Inertia\Inertia;
class AuthController extends Controller
@@ -16,39 +18,41 @@ class AuthController extends Controller
$validator = Validator::make($request->all(), [
'login' => 'required',
'password' => 'required',
'remember' => 'boolean'
]);
$login = Str::lower($request->login);
$password = $request->password;
if ($validator->fails()) {
return response()->json([
'success' => false,
'errors' => $validator->errors()
], 422);
return back()->withErrors([
$validator->errors()
]);
}
$credentials = $request->only('login', 'password');
$credentials = [
'login' => $login,
'password' => $password,
];
if (!Auth::attempt($credentials, $request->remember)) {
return response()->json([
'success' => false,
'message' => 'Неверный login или пароль'
], 401);
if (!Auth::attempt($credentials)) {
return back()->withErrors([
'Неверный логин или пароль'
]);
}
$user = User::where('login', $request->login)->first();
$user = User::where('login', $login)->first();
if (!$user->is_active) {
Auth::logout();
return response()->json([
'success' => false,
'message' => 'Учетная запись отключена'
], 403);
return back()->withErrors([
'Учетная запись отключена'
]);
}
$request->session()->regenerate();
$deviceName = 'web-' . ($request->header('User-Agent') ?: 'browser');
$token = $user->createToken($deviceName)->plainTextToken;
$tokenName = $request->session()->getId();
$token = $user->createToken($tokenName, ['*'], now()->addYears(5))->plainTextToken;
$request->session()->put('token', $token);
@@ -65,11 +69,42 @@ class AuthController extends Controller
'role_id' => 'required|integer|exists:roles,role_id'
]);
$sessionKey = 'user_' . $user->id . '_current_role';
$sessionId = session()->getId();
$user->current_role_id = $data['role_id'];
$user->save();
$token = $user->tokens()->where('name', $sessionId)->first();
if ($token) {
$token->abilities = ['role:' . $request->role_id];
$token->save();
}
DB::table('sessions')
->where('id', $sessionId)
->update(['role_id' => $request->role_id]);
// $sessionKey = 'user_' . $user->id . '_current_role';
//
// $user->current_role_id = $data['role_id'];
// $user->save();
return redirect()->route('start')->setStatusCode(302);
}
public function logout(Request $request)
{
$user = Auth::user();
if ($user) {
$tokenName = $request->session()->getId();
// Удаляем все токены пользователя
$user->tokens()->where('name', $tokenName)->delete();
// Очищаем сессию
$request->session()->invalidate();
$request->session()->regenerateToken();
}
return redirect()->route('login');
}
}

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

@@ -6,6 +6,7 @@ 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;
@@ -35,8 +36,9 @@ class ReportController extends Controller
$statistics = $this->reportService->getReportStatistics($department, $user, $dateRange);
// Получаем метрики
$metrikaGroup = MetrikaGroup::whereMetrikaGroupId(2)->first();
$metrikaItems = $metrikaGroup->metrikaItems;
// $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);
@@ -47,6 +49,8 @@ class ReportController extends Controller
'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' => [

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

@@ -2,6 +2,7 @@
namespace App\Http\Controllers\Web;
use App\Exports\StatisticsExport;
use App\Http\Controllers\Controller;
use App\Models\Department;
use App\Models\MetrikaForm;
@@ -18,6 +19,7 @@ use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Validator;
use Inertia\Inertia;
use Maatwebsite\Excel\Facades\Excel;
class StatisticController extends Controller
{
@@ -54,6 +56,21 @@ class StatisticController extends Controller
'isHeadOrAdmin' => $isHeadOrAdmin,
'date' => $date,
'isOneDay' => $isRangeOneDay,
'recipientPlanOfYear' => $finalData['recipientPlanOfYear']
]);
}
public function report(Request $request)
{
$user = $request->user();
$queryStartDate = $request->query('startAt');
$queryEndDate = $request->query('endAt');
[$startDate, $endDate] = $this->dateService->getStatisticsDateRange($user, $queryStartDate, $queryEndDate);
$isRangeOneDay = $this->dateService->isRangeOneDay($startDate, $endDate);
$finalData = $this->statisticsService->getStatisticsData($user, $startDate, $endDate, $isRangeOneDay);
return Excel::download(new StatisticsExport($finalData['data'], [$startDate, $endDate]), 'statistics.xlsx');
}
}

35
app/Http/Middleware/Authenticate.php Normal file
View File

@@ -0,0 +1,35 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Auth\AuthenticationException;
use Illuminate\Http\Request;
use Symfony\Component\HttpFoundation\Response;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
class Authenticate extends Middleware
{
public function handle($request, Closure $next, ...$guards)
{
if ($request->user() === null) {
// Проверяем, не находится ли пользователь на странице входа или в процессе авторизации
if ($request->is('login') || $request->is('auth/login')) {
return $next($request);
}
throw new AuthenticationException(
'Unauthenticated.',
$guards,
$request->expectsJson() ? null : $this->redirectTo($request),
);
}
return $next($request);
}
protected function redirectTo($request): ?string
{
return $request->expectsJson() ? null : route('login');
}
}

6
app/Http/Middleware/HandleInertiaRequests.php
View File

@@ -40,6 +40,10 @@ class HandleInertiaRequests extends Middleware
$user = $request->user() ?? Auth::guard('sanctum')->user();
return [
...parent::share($request),
'app' => [
'version' => config('app.version'),
'tag' => config('app.tag')
],
'user' => $user ? [
'name' => $user->name,
'token' => Session::get('token'),
@@ -47,7 +51,7 @@ class HandleInertiaRequests extends Middleware
'role' => $user->currentRole(),
'available_roles' => $user->roles,
'available_departments' => $user->availableDepartments(),
'current_department' => $user->department
'current_department' => $user->department->load('departmentType')
] : null,
];
}

29
app/Http/Resources/Api/OperationsResource.php Normal file
View File

@@ -0,0 +1,29 @@
<?php
namespace App\Http\Resources\Api;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Carbon;
class OperationsResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @return array<string, mixed>
*/
public function toArray(Request $request): array
{
return [
'id' => $this->SurgicalOperationID,
'num' => $this->Num,
'description' => trim($this->Description),
'startAt' => $this->Date,
'endAt' => $this->DataEnd,
'duration' => $this->Date && $this->DataEnd ?
Carbon::parse($this->Date)->diffInMinutes(Carbon::parse($this->DataEnd)) : null,
'service' => $this->serviceMedical,
];
}
}

8
app/Http/Resources/Mis/FormattedPatientResource.php
View File

@@ -20,10 +20,14 @@ class FormattedPatientResource extends JsonResource
return [
'id' => $this->MedicalHistoryID,
'num' => $this->num,
'mkb.ds' => $this->migrations->first()->diagnosis->first()?->mkb?->DS,
'mkb' => [
'ds' => $this->outcomeMigration->first()->mainDiagnosis?->mkb?->DS,
'name' => $this->outcomeMigration->first()->mainDiagnosis?->mkb?->NAME
],
'operations' => $this->surgicalOperations->map(function ($operation) {
return [
'code' => $operation->serviceMedical->ServiceMedicalCode
'code' => $operation->serviceMedical->ServiceMedicalCode,
'name' => $operation->serviceMedical->ServiceMedicalName,
];
}),
'fullname' => Str::ucwords(Str::lower("$this->FAMILY $this->Name $this->OT")),