Задача #8
Убран фильтр по номеру карты Добавлена загрузка связи visitResult Правка размеров колонок Добавлена колонка исход Исправлено определение последнего движения в SttMedicalHistory
This commit is contained in:
@@ -57,7 +57,9 @@ class IndexSttMedicalHistoryResource extends JsonResource
|
||||
? "$archiveInfoMisCardNumber / $archiveInfoFoxproCardNumber"
|
||||
: $archiveInfoMisCardNumber ?? $archiveInfoFoxproCardNumber;
|
||||
|
||||
$department = $historyType === 'mis' ? $model->outcomeMigration?->stationarBranch->department : null;
|
||||
$department = $historyType === 'mis' ? $model->outcomeMigration?->first()?->stationarBranch->department : null;
|
||||
|
||||
$visitResult = $historyType === 'mis' ? $this->visitResult->NAME : null;
|
||||
|
||||
return [
|
||||
'id' => $id,
|
||||
@@ -71,7 +73,8 @@ class IndexSttMedicalHistoryResource extends JsonResource
|
||||
'dr' => $formattedBirthDate,
|
||||
'daterecipient' => $formattedDateRecipient,
|
||||
'dateextract' => $formattedDateExtract,
|
||||
'department' => $department ? '[' . $department->DepartmentCODE . '] ' . $department->DepartmentNAME : '',
|
||||
'department' => $department ? '[' . $department->DepartmentCODE . '] ' . $department->DepartmentNAME : 'Н/д',
|
||||
'visitresult' => $visitResult,
|
||||
|
||||
// Номера карт
|
||||
'medcardnum' => $cardNumber, // MIS номер или FoxPro номер
|
||||
|
||||
Reference in New Issue
Block a user