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
         ];