From 47543fedba91cfc0dc6ff0ca2daa548494950e53 Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Fri, 27 Feb 2026 15:36:32 +0900
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/IndexController.php          | 2 --
 app/Http/Controllers/MedicalHistoryController.php | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/IndexController.php b/app/Http/Controllers/IndexController.php
index 393be0b..c5f2d3c 100644
--- a/app/Http/Controllers/IndexController.php
+++ b/app/Http/Controllers/IndexController.php
@@ -47,8 +47,6 @@ class IndexController extends Controller
             $pageSize
         );
 
-//        dd($data);
-
         $statuses = ArchiveStatus::all()->map(function ($status) {
             return [
                 'value' => $status->id,
diff --git a/app/Http/Controllers/MedicalHistoryController.php b/app/Http/Controllers/MedicalHistoryController.php
index 0ccfb09..0e77812 100644
--- a/app/Http/Controllers/MedicalHistoryController.php
+++ b/app/Http/Controllers/MedicalHistoryController.php
@@ -23,7 +23,7 @@ class MedicalHistoryController extends Controller
         else $patient = MisSttMedicalHistory::where('MedicalHistoryID', $id)->first();
 
         if($patient instanceof MisSttMedicalHistory) {
-            if ($patient->archiveHistory->count() === 0) {
+            if ($patient->archiveHistory->count() === 0 && $patient->archiveInfo->foxpro_history_id) {
                 $foxproCardId = $patient->archiveInfo->foxpro_history_id;
                 $foxproPatient = SiSttMedicalHistory::where('keykarta', $foxproCardId)->first();
 
@@ -44,7 +44,7 @@ class MedicalHistoryController extends Controller
                 ...PatientInfoResource::make($patient)->toArray(request()),
                 'can_be_issued' => $patient->canBeIssued()
             ],
-            'journal' => ArchiveHistoryResource::collection($journalHistory),
+            'journal' => $journalHistory ? ArchiveHistoryResource::collection($journalHistory) : [],
             'archiveInfo' => $archiveInfo ? ArchiveInfoResource::make($archiveInfo) : null
         ];