Добавлено ДР в выборку и подгрузка связи
This commit is contained in:
@@ -24,7 +24,8 @@ class MedicalHistoryRepository
|
|||||||
'ot',
|
'ot',
|
||||||
'daterecipient',
|
'daterecipient',
|
||||||
'dateextract',
|
'dateextract',
|
||||||
'medcardnum'
|
'medcardnum',
|
||||||
|
'dr'
|
||||||
];
|
];
|
||||||
|
|
||||||
protected array $defaultFieldsMis = [
|
protected array $defaultFieldsMis = [
|
||||||
@@ -34,7 +35,8 @@ class MedicalHistoryRepository
|
|||||||
'OT',
|
'OT',
|
||||||
'DateRecipient',
|
'DateRecipient',
|
||||||
'DateExtract',
|
'DateExtract',
|
||||||
'MedCardNum'
|
'MedCardNum',
|
||||||
|
'BD'
|
||||||
];
|
];
|
||||||
|
|
||||||
public function __construct(
|
public function __construct(
|
||||||
@@ -66,6 +68,7 @@ class MedicalHistoryRepository
|
|||||||
|
|
||||||
return $query->select($this->defaultFieldsSI)
|
return $query->select($this->defaultFieldsSI)
|
||||||
->orderBy($sortBy, $sortDir)
|
->orderBy($sortBy, $sortDir)
|
||||||
|
->with(['archiveInfo'])
|
||||||
->paginate($pageSize)
|
->paginate($pageSize)
|
||||||
->through(function ($item) {
|
->through(function ($item) {
|
||||||
$item->database_source = 'postgresql';
|
$item->database_source = 'postgresql';
|
||||||
@@ -94,6 +97,7 @@ class MedicalHistoryRepository
|
|||||||
|
|
||||||
return $query->select($this->defaultFieldsMis)
|
return $query->select($this->defaultFieldsMis)
|
||||||
->orderBy($sortBy, $sortDir)
|
->orderBy($sortBy, $sortDir)
|
||||||
|
->with(['archiveInfo'])
|
||||||
->paginate($pageSize)
|
->paginate($pageSize)
|
||||||
->through(function ($item) {
|
->through(function ($item) {
|
||||||
$item->database_source = 'mssql';
|
$item->database_source = 'mssql';
|
||||||
|
|||||||
Reference in New Issue
Block a user