AOKB/onboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Профиль хирургии

Browse Source
This commit is contained in:
brusnitsyn
2026-03-25 17:37:32 +09:00
parent 52a80ccd3b
commit f566ab96df
75 changed files with 3841 additions and 1009 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
app/Models/MisMigrationPatient.php
View File

@@ -21,6 +21,11 @@ class MisMigrationPatient extends Model
return $this->hasMany(MisDiagnos::class, 'rf_MigrationPatientID', 'MigrationPatientID');
}
public function mainDiagnosis()
{
return $this->hasOne(MisDiagnos::class, 'rf_MigrationPatientID', 'MigrationPatientID')->where('rf_DiagnosTypeID', 3);
}
public function mkb()
{
return $this->hasOne(MisMKB::class, 'MKBID', 'rf_MKBID');
@@ -48,7 +53,9 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateIngoing', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateIngoing', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateIngoing', '>=', $dateRange->startSql())
->where('DateIngoing', '<=', $dateRange->endSql());
}
return $query;
@@ -79,7 +86,9 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
}
return $query;
@@ -102,7 +111,8 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -125,7 +135,8 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -148,7 +159,8 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -168,7 +180,8 @@ class MisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -182,7 +195,8 @@ class MisMigrationPatient extends Model
$query->where('rf_kl_VisitResultID', '<>', 0)
->where('rf_MedicalHistoryID', '<>', 0)
->when($dateRange, function($query) use ($dateRange) {
return $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
return $query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
});
if ($branchId) {