Много чего

app/Http/Resources/ArchiveHistoryResource.php

@@ -21,7 +21,7 @@ class ArchiveHistoryResource extends JsonResource
             'return_at' => $this->return_at ? Carbon::parse($this->return_at)->format('d.m.Y') : null,
             'comment' => $this->comment,
             'org_id' => $this->org_id,
-            'org' => $this->org->name,
+            'org' => $this->org?->name,
             'employee_name' => $this->employee_name,
             'employee_post' => $this->employee_post,
             'has_lost' => $this->has_lost,

app/Http/Resources/ArchiveInfoResource.php

@@ -16,11 +16,12 @@ class ArchiveInfoResource extends JsonResource
     {
         return [
             'id' => $this->id,
-            'num' => $this->num,
+            'num' => $this->archive_num,
             'post_in' => $this->post_in,
             'status' => $this->status,
-            'historyable_id' => $this->historyable_id,
-            'historyable_type' => $this->historyable_type,
+            'foxpro_num' => $this->foxpro_num,
+            'mis_num' => $this->mis_num,
+            'type' => $this->historyType()
         ];
     }
 }

app/Http/Resources/Mis/SttMedicalHistoryResource.php

@@ -2,9 +2,9 @@
 
 namespace App\Http\Resources\Mis;
 
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use Illuminate\Http\Resources\Json\JsonResource;
-use Illuminate\Support\Carbon;
 
 class SttMedicalHistoryResource extends JsonResource
 {
@@ -15,17 +15,114 @@ class SttMedicalHistoryResource extends JsonResource
      */
     public function toArray(Request $request): array
     {
+        // Определяем источник данных
+        $isFromArchive = $this->resource['in_archive'] ?? false;
+        $isTemporary = $this->resource['is_temporary'] ?? false;
+        $historyType = $this->resource['history_type'] ?? 'mis';
+
+        // Формируем ФИО
+        $family = $this->resource['family'] ?? '';
+        $name = $this->resource['name'] ?? '';
+        $ot = $this->resource['ot'] ?? '';
+
+        // Для временных записей (не в архиве) используем данные из MIS
+        if ($isTemporary) {
+            // Данные из stt_medicalhistory (не в архиве)
+            $fullName = trim("{$family} {$name} {$ot}");
+            $birthDate = $this->resource['birth_date'] ?? null;
+            $dateExtract = $this->resource['date_extract'] ?? null;
+            $dateRecipient = null; // Для MIS записей не в архиве может не быть
+            $cardNumber = $this->resource['card_number'] ?? null;
+            $archiveNum = null;
+            $postIn = null;
+            $status = $this->resource['status_text'] ?? 'Не в архиве';
+        } else {
+            // Данные из archive_infos (в архиве)
+            $fullName = trim("{$family} {$name} {$ot}");
+            $birthDate = $this->resource['birth_date'] ?? null;
+
+            // Для архивных записей date_extract может быть из MIS или FoxPro
+            $dateExtract = $this->resource['date_extract'] ?? null;
+
+            // Для MIS записей в архиве
+            if ($historyType === 'mis') {
+                $dateRecipient = $this->resource['date_recipient'] ?? null;
+            } else {
+                // Для FoxPro записей в архиве
+                $dateRecipient = $this->resource['mpostdate'] ?? null;
+            }
+
+            $cardNumber = $this->resource['card_number'] ?? null;
+            $archiveNum = $this->resource['archive_num'] ?? null;
+            $postIn = $this->resource['post_in'] ?? null;
+            $status = $this->resource['status_text'] ?? 'Неизвестно';
+        }
+
+        // Форматирование дат
+        $formattedBirthDate = $birthDate ? Carbon::parse($birthDate)->format('d.m.Y') : null;
+        $formattedDateRecipient = $dateRecipient ? Carbon::parse($dateRecipient)->format('d.m.Y') : null;
+        $formattedDateExtract = $dateExtract ? Carbon::parse($dateExtract)->format('d.m.Y') : null;
+        $formattedPostIn = $postIn ? Carbon::parse($postIn)->format('d.m.Y') : null;
+
         return [
-            'id' => $this->MedicalHistoryID,
-            'fullname' => $this->getFullNameAttribute(),
-            'daterecipient' => Carbon::parse($this->DateRecipient)->format('d.m.Y'),
-            'dateextract' => Carbon::parse($this->DateExtract)->format('d.m.Y'),
-            'card_num' => $this->archiveInfo->num ?? null,
-            'status' => $this->archiveInfo->status ?? null,
-            'datearhiv' => $this->whenLoaded('archiveInfo') ? Carbon::parse($this->archiveInfo->post_in)->format('d.m.Y') : null,
-            'medcardnum' => $this->MedCardNum,
-            'dr' => Carbon::parse($this->BD)->format('d.m.Y'),
-            'can_be_issue' => $this->canBeIssued()
+            'id' => $this->resource['id'],
+            'history_type' => $historyType,
+            'in_archive' => $isFromArchive,
+            'is_temporary' => $isTemporary,
+            'source' => $this->resource['source'] ?? 'archive',
+
+            // Основные данные
+            'fullname' => $fullName,
+            'family' => $family,
+            'name' => $name,
+            'ot' => $ot,
+            'dr' => $formattedBirthDate,
+            'daterecipient' => $formattedDateRecipient,
+            'dateextract' => $formattedDateExtract,
+
+            // Номера карт
+            'medcardnum' => $cardNumber, // MIS номер или FoxPro номер
+            'mis_card_number' => $this->resource['mis_card_number'] ?? null, // Оригинальный MIS номер
+            'foxpro_card_number' => $this->resource['foxpro_card_number'] ?? null, // Оригинальный FoxPro номер
+            'card_num' => $archiveNum, // Архивный номер
+            'datearhiv' => $formattedPostIn,
+
+            // Статус и возможности
+            'status' => $status,
+            'status_id' => $this->resource['status_id'] ?? 0,
+            'can_be_issued' => $this->resource['can_be_issued'] ?? false,
+            'can_add_to_archive' => $this->resource['can_add_to_archive'] ?? false,
+
+            // Дополнительные идентификаторы
+            'mis_history_id' => $this->resource['mis_history_id'] ?? null,
+            'foxpro_history_id' => $this->resource['foxpro_history_id'] ?? null,
+
+            // Дополнительные данные
+            'snils' => $this->resource['snils'] ?? null,
+            'enp' => $this->resource['enp'] ?? null,
+//            'created_at' => $this->resource->created_at ? Carbon::parse($this->resource->created_at)->format('d.m.Y H:i') : null,
+//            'updated_at' => $this->resource->updated_at ? Carbon::parse($this->resource->updated_at)->format('d.m.Y H:i') : null,
+
+            // Стили для фронта
+            'row_class' => $this->resource['row_class'] ?? '',
+            'status_color' => $this->getStatusColor($this->resource['status_id'] ?? 0, $isFromArchive),
         ];
     }
+
+    /**
+     * Получение цвета статуса для фронта
+     */
+    private function getStatusColor(int $statusId, bool $inArchive): string
+    {
+        if (!$inArchive) {
+            return 'warning'; // Желтый для не в архиве
+        }
+
+        return match($statusId) {
+            1 => 'success', // Зеленый для в архиве
+            2 => 'info',    // Синий для выдано
+            3, 4 => 'danger', // Красный для утрачено/списано
+            default => 'secondary',
+        };
+    }
 }

app/Http/Resources/PatientInfoResource.php

@@ -15,10 +15,10 @@ class PatientInfoResource extends JsonResource
     public function toArray(Request $request): array
     {
         return [
-            'id' => $this->id ?? $this->MedicalHistoryID,
-            'medcardnum' => $this->medcardnum ?? $this->MedCardNum,
-            'family' => $this->family ?? $this->FAMILY,
-            'name' => $this->name ?? $this->Name,
+            'id' => $this->keykarta ?? $this->MedicalHistoryID,
+            'medcardnum' => $this->nkarta ?? $this->MedCardNum,
+            'family' => $this->fam ?? $this->FAMILY,
+            'name' => $this->im ?? $this->Name,
             'ot' => $this->ot ?? $this->OT,
         ];
     }