Ресурс для ArchiveInfo

Добавлен move метод
Правка в поиске

app/Http/Controllers/ArchiveHistoryController.php

@@ -2,8 +2,10 @@
 
 namespace App\Http\Controllers;
 
+use App\Http\Resources\ArchiveHistoryResource;
 use App\Models\ArchiveHistory;
 use Illuminate\Http\Request;
+use Illuminate\Support\Carbon;
 
 class ArchiveHistoryController extends Controller
 {
@@ -18,4 +20,34 @@ class ArchiveHistoryController extends Controller
 
         return response()->json($archiveHistory);
     }
+
+    public function move(Request $request)
+    {
+        $data = $request->validate([
+            'issue_at' => 'nullable|numeric:',
+            'return_at' => 'nullable|numeric:',
+            'org_id' => 'required|numeric',
+            'employee_name' => 'nullable|string',
+            'employee_post' => 'nullable|string',
+            'comment' => 'nullable|string',
+            'has_lost' => 'boolean',
+            'historyable_id' => 'nullable|numeric',
+        ]);
+
+        // Находим связанную модель ??
+        $historyable = SttMedicalHistory::findOrFail($data['historyable_id']);
+
+        // Преобразуем timestamp в дату, если пришли числа
+        if (isset($data['issue_at']) && is_numeric($data['issue_at'])) {
+            $data['issue_at'] = Carbon::createFromTimestampMs($data['issue_at'])->format('Y-m-d');
+        }
+
+        if (isset($data['return_at']) && is_numeric($data['return_at'])) {
+            $data['return_at'] = Carbon::createFromTimestampMs($data['return_at'])->format('Y-m-d');
+        }
+
+        $archiveHistory = ArchiveHistory::create($data);
+
+        return response()->json(ArchiveHistoryResource::make($archiveHistory));
+    }
 }

app/Http/Controllers/MedicalHistoryController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Http\Resources\ArchiveHistoryResource;
+use App\Http\Resources\ArchiveInfoResource;
 use App\Models\SI\SttMedicalHistory;
 use Illuminate\Http\Request;
 
@@ -19,6 +20,10 @@ class MedicalHistoryController extends Controller
             $archiveJournal = ArchiveHistoryResource::collection($patient->archiveHistory);
             $archiveInfo = $patient->archiveInfo;
 
+            if (!empty($archiveInfo)) {
+                $archiveInfo = ArchiveInfoResource::make($patient->archiveInfo);
+            }
+
             $patientInfo = [
                 'info' => $patient,
                 'journal' => $archiveJournal,

app/Http/Resources/ArchiveInfoResource.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class ArchiveInfoResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            'id' => $this->id,
+            'num' => $this->num,
+            'post_in' => $this->post_in,
+            'status' => $this->status
+        ];
+    }
+}

app/Http/Resources/SI/SttMedicalHistoryResource.php

@@ -20,7 +20,8 @@ class SttMedicalHistoryResource extends JsonResource
             'fullname' => $this->getFullNameAttribute(),
             'daterecipient' => Carbon::parse($this->daterecipient)->format('d.m.Y'),
             'dateextract' => Carbon::parse($this->dateextract)->format('d.m.Y'),
-            'narhiv' => $this->narhiv,
+            'card_num' => $this->archiveInfo->num ?? null,
+            'status' => $this->archiveInfo->status ?? null,
             'datearhiv' => Carbon::parse($this->datearhiv)->format('d.m.Y'),
             'statgod' => $this->statgod,
             'enp' => $this->enp,

app/Models/ArchiveHistory.php

@@ -6,6 +6,51 @@ use Illuminate\Database\Eloquent\Model;
 
 class ArchiveHistory extends Model
 {
+    protected static function booted()
+    {
+        static::created(function ($archiveHistory) {
+            $archiveHistory->updateArchiveInfoStatus();
+        });
+
+        static::updated(function ($archiveHistory) {
+            $archiveHistory->updateArchiveInfoStatus();
+        });
+    }
+
+    public function updateArchiveInfoStatus()
+    {
+        // Получаем связанную модель через морф
+        $historyable = $this->historyable;
+
+        if (!$historyable) {
+            return;
+        }
+
+        // Проверяем, есть ли у модели архивная информация
+        if (method_exists($historyable, 'archiveInfo') && $historyable->archiveInfo) {
+            $historyable->archiveInfo->update([
+                'status_id' => $this->determineStatusId()
+            ]);
+        }
+    }
+
+    public function determineStatusId()
+    {
+        if ($this->has_lost) {
+            return 4; // Утерян
+        }
+
+        if ($this->issue_at && !$this->return_at) {
+            return 3; // Выдан
+        }
+
+        if ($this->return_at) {
+            return 2; // В архиве
+        }
+
+        return 2; // По умолчанию
+    }
+
     protected $fillable = [
         'historyable_type',
         'historyable_id',

app/Models/ArchiveInfo.php

@@ -18,4 +18,9 @@ class ArchiveInfo extends Model
     {
         return $this->morphTo();
     }
+
+    public function status()
+    {
+        return $this->belongsTo(ArchiveStatus::class);
+    }
 }

app/Models/SI/SttMedicalHistory.php

@@ -43,12 +43,19 @@ class SttMedicalHistory extends Model
     {
         return $query->where(function($q) use ($searchText) {
             if (is_numeric($searchText)) {
-                $q->where('medcardnum', 'ILIKE', "$searchText%");
+                $q->where('medcardnum', 'ILIKE', "$searchText");
             } else {
-                // Ищем по всем частям ФИО
-                $q->where('family', 'ILIKE', "%$searchText%")
-                    ->orWhere('name', 'ILIKE', "%$searchText%")
-                    ->orWhere('ot', 'ILIKE', "%$searchText%");
+                // Ищем в объединенном ФИО и в отдельных полях
+                $searchPattern = "%{$searchText}%";
+
+                $q->where(function($subQ) use ($searchPattern) {
+                    // Поиск в объединенной строке
+                    $subQ->whereRaw("CONCAT(family, ' ', name, ' ', COALESCE(ot, '')) ILIKE ?", [$searchPattern])
+                        // И дополнительно в отдельных полях для точности
+                        ->orWhere('family', 'ILIKE', $searchPattern)
+                        ->orWhere('name', 'ILIKE', $searchPattern)
+                        ->orWhere('ot', 'ILIKE', $searchPattern);
+                });
             }
         });
     }

resources/js/Pages/Home/ArchiveHistoryModal/Index.vue

@@ -92,8 +92,8 @@ watch(() => props.patientId, (newId) => {
             <NFlex inline justify="space-between" align="center" :wrap="false">
                 <NForm inline :show-feedback="false">
                     <NFormItem label="Статус карты">
-                        <NTag type="default" :bordered="false" round>
-                            Не определен
+                        <NTag :type="patient.archiveInfo?.status?.variant ?? 'error'" :bordered="false" round>
+                            {{ patient.archiveInfo?.status?.text ?? 'Нет в архиве' }}
                         </NTag>
                     </NFormItem>
                     <NFormItem label="№ в архиве">

resources/js/Pages/Home/ArchiveHistoryMoveModal/Index.vue

@@ -11,6 +11,7 @@ const emits = defineEmits(['closeWithoutSave'])
 
 const loading = ref(false)
 const archiveHistory = ref({
+    historyable_id: props.archiveHistoryId,
     issue_at: null,
     org_id: null,
     return_at: null,
@@ -23,6 +24,7 @@ const orgs = ref([])
 
 const onResetData = () => {
     archiveHistory.value = {
+        historyable_id: props.archiveHistoryId,
         issue_at: null,
         org_id: null,
         return_at: null,
@@ -39,13 +41,13 @@ const onCloseWithoutSave = () => {
 
 const loadArchiveHistoryData = async () => {
     try {
-        axios.get('/api/orgs').then(res => {
+        await axios.get('/api/orgs').then(res => {
             orgs.value = res.data
         })
 
         if (!props.archiveHistoryId) return
 
-        axios.get(`/api/archive/histories/${props.archiveHistoryId}`).then(res => {
+        await axios.get(`/api/archive/histories/${props.archiveHistoryId}`).then(res => {
             archiveHistory.value = res.data
         })
     } catch (error) {
@@ -55,10 +57,22 @@ const loadArchiveHistoryData = async () => {
     }
 }
 
+const submit = () => {
+    try {
+        axios.post('/api/archive/histories/move', archiveHistory.value).then(res => {
+            onCloseWithoutSave()
+        })
+    } catch (error) {
+        console.error(error)
+    } finally {
+        loading.value = false
+    }
+}
+
 // Наблюдаем за изменением archiveHistoryId
-watch(() => props.archiveHistoryId, (newId) => {
+watch(() => props.archiveHistoryId, async (newId) => {
     if (newId) {
-        loadArchiveHistoryData()
+        await loadArchiveHistoryData()
     } else {
         onResetData()
     }
@@ -101,7 +115,7 @@ watch(() => props.archiveHistoryId, (newId) => {
                         Закрыть без сохранения
                     </NButton>
                     <NDivider vertical />
-                    <NButton secondary type="primary">
+                    <NButton secondary type="primary" @click="submit">
                         Сохранить
                     </NButton>
                 </NSpace>

resources/js/Pages/Home/DataTable/Index.vue

@@ -1,5 +1,5 @@
 <script setup>
-import {NDataTable, NEllipsis} from "naive-ui"
+import {NDataTable, NEllipsis, NTag} from "naive-ui"
 import {computed, h, reactive, ref} from "vue"
 import {useMedicalHistoryFilter} from "../../../Composables/useMedicalHistoryFilter.js";
 import ArchiveHistoryModal from '../ArchiveHistoryModal/Index.vue'
@@ -25,6 +25,19 @@ const props = defineProps({
 
 const { isLoading, handlePageChange, handlePageSizeChange, meta } = useMedicalHistoryFilter(props.filters)
 
+const archiveStatusColumn = (status) => {
+    const tagType = status?.variant ?? 'error'
+    const tagText = status?.text ?? 'Нет в архиве'
+    console.log(tagType)
+
+    return h(
+        NEllipsis,
+        null,
+        {
+            default: () => h(NTag, {type: tagType, round: true, size: 'small'}, tagText)
+        })
+}
+
 const columns = ref([
     {
         title: '№ карты',
@@ -58,9 +71,9 @@ const columns = ref([
     },
     {
         title: '№ архива',
-        key: 'narhiv',
+        key: 'card_num',
         width: 120,
-        render: (row) => h(NEllipsis, null, { default: () => row.narhiv || '-' })
+        render: (row) => h(NEllipsis, null, { default: () => row.card_num || '-' })
     },
     {
         title: 'Дата архива',
@@ -72,7 +85,7 @@ const columns = ref([
         title: 'Статус',
         key: 'status',
         width: 100,
-        render: (row) => h(NEllipsis, null, { default: () => row.status || '-' })
+        render: (row) => archiveStatusColumn(row.status)
     }
 ])
 const showArchiveHistoryModal = ref(false)

routes/api.php

@@ -16,6 +16,9 @@ Route::prefix('si')->group(function () {
 Route::prefix('archive')->group(function () {
     Route::prefix('histories')->group(function () {
         Route::get('{id}', [\App\Http\Controllers\ArchiveHistoryController::class, 'show']);
+        Route::prefix('move')->group(function () {
+            Route::post('/', [\App\Http\Controllers\ArchiveHistoryController::class, 'move']);
+        });
     });
 });