Labs/kartoteka
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Рефакторинг
Some checks failed
Build and Push Docker Image / test (push) Failing after 3s
Details
Build and Push Docker Image / build (push) Has been cancelled
Details

Browse Source
This commit is contained in:
brusnitsyn
2026-02-27 15:36:32 +09:00
parent b72a7f0ee1
commit 47543fedba
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/IndexController.php
View File

@@ -47,8 +47,6 @@ class IndexController extends Controller
$pageSize $pageSize
); );
// dd($data);
$statuses = ArchiveStatus::all()->map(function ($status) { $statuses = ArchiveStatus::all()->map(function ($status) {
return [ return [
'value' => $status->id, 'value' => $status->id,

4
app/Http/Controllers/MedicalHistoryController.php
View File

@@ -23,7 +23,7 @@ class MedicalHistoryController extends Controller
else $patient = MisSttMedicalHistory::where('MedicalHistoryID', $id)->first(); else $patient = MisSttMedicalHistory::where('MedicalHistoryID', $id)->first();
if($patient instanceof MisSttMedicalHistory) { 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; $foxproCardId = $patient->archiveInfo->foxpro_history_id;
$foxproPatient = SiSttMedicalHistory::where('keykarta', $foxproCardId)->first(); $foxproPatient = SiSttMedicalHistory::where('keykarta', $foxproCardId)->first();
@@ -44,7 +44,7 @@ class MedicalHistoryController extends Controller
...PatientInfoResource::make($patient)->toArray(request()), ...PatientInfoResource::make($patient)->toArray(request()),
'can_be_issued' => $patient->canBeIssued() 'can_be_issued' => $patient->canBeIssued()
], ],
'journal' => ArchiveHistoryResource::collection($journalHistory), 'journal' => $journalHistory ? ArchiveHistoryResource::collection($journalHistory) : [],
'archiveInfo' => $archiveInfo ? ArchiveInfoResource::make($archiveInfo) : null 'archiveInfo' => $archiveInfo ? ArchiveInfoResource::make($archiveInfo) : null
]; ];