Форматирование

2026-04-24 16:46:10 +09:00
parent fd0e6ee817
commit 63daa62888
87 changed files with 1380 additions and 791 deletions
--- a/database/migrations/2025_12_27_055140_create_metrika_group_items_table.php
+++ b/database/migrations/2025_12_27_055140_create_metrika_group_items_table.php
@@ -13,7 +13,7 @@ return new class extends Migration
    {
        Schema::create('metrika_group_items', function (Blueprint $table) {
            $table->id('metrika_group_item_id');
-            $table->foreignIdFor( \App\Models\MetrikaGroup::class, 'rf_metrika_group_id')
+            $table->foreignIdFor(\App\Models\MetrikaGroup::class, 'rf_metrika_group_id')
                ->comment('Идентификатор группы метрик')
                ->constrained()
                ->cascadeOnDelete();
--- a/database/seeders/DatabaseSeeder.php
+++ b/database/seeders/DatabaseSeeder.php
@@ -2,7 +2,6 @@

 namespace Database\Seeders;

-use App\Models\User;
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;

--- a/database/seeders/TestDepartmentDataSeeder.php
+++ b/database/seeders/TestDepartmentDataSeeder.php
@@ -5,10 +5,7 @@ namespace Database\Seeders;
 use App\Models\Department;
 use App\Models\DepartmentMetrikaDefault;
 use App\Models\DepartmentType;
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\Schema;

 class TestDepartmentDataSeeder extends Seeder
 {
@@ -19,15 +16,15 @@ class TestDepartmentDataSeeder extends Seeder
    {
        DepartmentType::create([
            'name_short' => 'Хирургические',
-            'name_full' => 'Хирургические отделения'
+            'name_full' => 'Хирургические отделения',
        ]);
        DepartmentType::create([
            'name_short' => 'Терапевтические',
-            'name_full' => 'Терапевтические отделения'
+            'name_full' => 'Терапевтические отделения',
        ]);
        DepartmentType::create([
            'name_short' => 'Перинатальный',
-            'name_full' => 'Перинатальный центр'
+            'name_full' => 'Перинатальный центр',
        ]);

        /**
@@ -37,67 +34,67 @@ class TestDepartmentDataSeeder extends Seeder
            'name_full' => 'Гинекологическое отделение',
            'name_short' => 'Гинекологическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1054
+            'rf_mis_department_id' => 1054,
        ]);
        Department::create([
            'name_full' => 'Нейрохирургическое отделение',
            'name_short' => 'Нейрохирургическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1049
+            'rf_mis_department_id' => 1049,
        ]);
        Department::create([
            'name_full' => 'Отделение термических поражений',
            'name_short' => 'Термических поражений',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1059
+            'rf_mis_department_id' => 1059,
        ]);
        Department::create([
            'name_full' => 'Отоларингологическое отделение',
            'name_short' => 'Отоларингологическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1061
+            'rf_mis_department_id' => 1061,
        ]);
        Department::create([
            'name_full' => 'Проктологическое отделение',
            'name_short' => 'Проктологическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1065
+            'rf_mis_department_id' => 1065,
        ]);
        Department::create([
            'name_full' => 'Отделение сосудистой хирургии',
            'name_short' => 'Сосудистой хирургии',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1050
+            'rf_mis_department_id' => 1050,
        ]);
        Department::create([
            'name_full' => 'Отделение торакальной хирургии',
            'name_short' => 'Торакальной хирургии',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1069
+            'rf_mis_department_id' => 1069,
        ]);
        Department::create([
            'name_full' => 'Травматологическое отделение',
            'name_short' => 'Травматологическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1070
+            'rf_mis_department_id' => 1070,
        ]);
        Department::create([
            'name_full' => 'Урологическое отделение',
            'name_short' => 'Урологическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1071
+            'rf_mis_department_id' => 1071,
        ]);
        Department::create([
            'name_full' => 'Хирургическое отделение',
            'name_short' => 'Хирургическое',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1072
+            'rf_mis_department_id' => 1072,
        ]);
        Department::create([
            'name_full' => 'Отделение ЧЛХ',
            'name_short' => 'ЧЛХ',
            'rf_department_type' => 1,
-            'rf_mis_department_id' => 1073
+            'rf_mis_department_id' => 1073,
        ]);

        /**
@@ -107,61 +104,61 @@ class TestDepartmentDataSeeder extends Seeder
            'name_full' => 'Гастроэнтерологическое отделение',
            'name_short' => 'Гастроэнтерологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1052
+            'rf_mis_department_id' => 1052,
        ]);
        Department::create([
            'name_full' => 'Гематологическое отделение',
            'name_short' => 'Гематологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1053
+            'rf_mis_department_id' => 1053,
        ]);
        Department::create([
            'name_full' => 'Кардиологическое отделение',
            'name_short' => 'Кардиологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1056
+            'rf_mis_department_id' => 1056,
        ]);
        Department::create([
            'name_full' => 'Неврологическое отделение',
            'name_short' => 'Неврологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1057
+            'rf_mis_department_id' => 1057,
        ]);
        Department::create([
            'name_full' => 'Нефрологическое отделение',
            'name_short' => 'Нефрологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1058
+            'rf_mis_department_id' => 1058,
        ]);
        Department::create([
            'name_full' => 'Пульмонологическое отделение',
            'name_short' => 'Пульмонологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1066
+            'rf_mis_department_id' => 1066,
        ]);
        Department::create([
            'name_full' => 'Ревматологическое отделение',
            'name_short' => 'Ревматологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1068
+            'rf_mis_department_id' => 1068,
        ]);
        Department::create([
            'name_full' => 'РСЦ кардиологическое отделение',
            'name_short' => 'РСЦ кардиологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 1047
+            'rf_mis_department_id' => 1047,
        ]);
        Department::create([
            'name_full' => 'РСЦ неврологическое отделение',
            'name_short' => 'РСЦ неврологическое',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 2162
+            'rf_mis_department_id' => 2162,
        ]);
        Department::create([
            'name_full' => 'Отделение медицинской реабилитации',
            'name_short' => 'Медицинской реабилитации',
            'rf_department_type' => 2,
-            'rf_mis_department_id' => 2042
+            'rf_mis_department_id' => 2042,
        ]);

        /**
@@ -170,57 +167,57 @@ class TestDepartmentDataSeeder extends Seeder
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 1,
            'rf_metrika_item_id' => 1,
-            'value' => '50'
+            'value' => '50',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 2,
            'rf_metrika_item_id' => 1,
-            'value' => '42'
+            'value' => '42',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 3,
            'rf_metrika_item_id' => 1,
-            'value' => '39'
+            'value' => '39',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 4,
            'rf_metrika_item_id' => 1,
-            'value' => '30'
+            'value' => '30',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 5,
            'rf_metrika_item_id' => 1,
-            'value' => '34'
+            'value' => '34',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 6,
            'rf_metrika_item_id' => 1,
-            'value' => '40'
+            'value' => '40',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 7,
            'rf_metrika_item_id' => 1,
-            'value' => '25'
+            'value' => '25',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 8,
            'rf_metrika_item_id' => 1,
-            'value' => '48'
+            'value' => '48',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 9,
            'rf_metrika_item_id' => 1,
-            'value' => '27'
+            'value' => '27',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 10,
            'rf_metrika_item_id' => 1,
-            'value' => '58'
+            'value' => '58',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 11,
            'rf_metrika_item_id' => 1,
-            'value' => '25'
+            'value' => '25',
        ]);

        /**
@@ -229,47 +226,47 @@ class TestDepartmentDataSeeder extends Seeder
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 12,
            'rf_metrika_item_id' => 1,
-            'value' => '22'
+            'value' => '22',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 13,
            'rf_metrika_item_id' => 1,
-            'value' => '27'
+            'value' => '27',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 14,
            'rf_metrika_item_id' => 1,
-            'value' => '40'
+            'value' => '40',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 15,
            'rf_metrika_item_id' => 1,
-            'value' => '30'
+            'value' => '30',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 16,
            'rf_metrika_item_id' => 1,
-            'value' => '25'
+            'value' => '25',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 17,
            'rf_metrika_item_id' => 1,
-            'value' => '40'
+            'value' => '40',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 18,
            'rf_metrika_item_id' => 1,
-            'value' => '55'
+            'value' => '55',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 19,
            'rf_metrika_item_id' => 1,
-            'value' => '55'
+            'value' => '55',
        ]);
        DepartmentMetrikaDefault::create([
            'rf_department_id' => 20,
            'rf_metrika_item_id' => 1,
-            'value' => '30'
+            'value' => '30',
        ]);
    }
 }
--- a/database/seeders/TestMetrikaSeeder.php
+++ b/database/seeders/TestMetrikaSeeder.php
@@ -5,7 +5,6 @@ namespace Database\Seeders;
 use App\Models\MetrikaGroup;
 use App\Models\MetrikaGroupItem;
 use App\Models\MetrikaItem;
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;

 class TestMetrikaSeeder extends Seeder
@@ -17,27 +16,27 @@ class TestMetrikaSeeder extends Seeder
    {
        MetrikaItem::create([
            'name' => 'Коек',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);
        MetrikaItem::create([
            'name' => 'Состояло',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);
        MetrikaItem::create([
            'name' => 'Поступило',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);
        MetrikaItem::create([
            'name' => 'План',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);
        MetrikaItem::create([
            'name' => 'Самотек',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);
        MetrikaItem::create([
            'name' => 'Скорая',
-            'data_type' => 'integer'
+            'data_type' => 'integer',
        ]);

        MetrikaGroup::create([
@@ -47,7 +46,7 @@ class TestMetrikaSeeder extends Seeder
        foreach (MetrikaItem::all() as $item) {
            MetrikaGroupItem::create([
                'rf_metrika_group_id' => 1,
-                'rf_metrika_item_id' => $item->metrika_item_id
+                'rf_metrika_item_id' => $item->metrika_item_id,
            ]);
        }

@@ -68,15 +67,15 @@ class TestMetrikaSeeder extends Seeder

        MetrikaGroupItem::create([
            'rf_metrika_group_id' => 2,
-            'rf_metrika_item_id' => 3
+            'rf_metrika_item_id' => 3,
        ]);
        MetrikaGroupItem::create([
            'rf_metrika_group_id' => 2,
-            'rf_metrika_item_id' => 7
+            'rf_metrika_item_id' => 7,
        ]);
        MetrikaGroupItem::create([
            'rf_metrika_group_id' => 2,
-            'rf_metrika_item_id' => 8
+            'rf_metrika_item_id' => 8,
        ]);
    }
 }
--- a/database/seeders/TestUserSeeder.php
+++ b/database/seeders/TestUserSeeder.php
@@ -5,7 +5,6 @@ namespace Database\Seeders;
 use App\Models\Role;
 use App\Models\User;
 use App\Models\UserRole;
-use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;

 class TestUserSeeder extends Seeder
@@ -37,13 +36,13 @@ class TestUserSeeder extends Seeder
            'login' => 'test',
            'password' => \Hash::make('test'),
            'rf_department_id' => 1,
-            'rf_lpudoctor_id' => null
+            'rf_lpudoctor_id' => null,
        ]);

        UserRole::create([
            'rf_user_id' => 1,
            'rf_role_id' => 1,
-            'is_default' => true
+            'is_default' => true,
        ]);
        UserRole::create([
            'rf_user_id' => 1,