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

30
app/Models/LifeMisMigrationPatient.php
View File

@@ -37,7 +37,7 @@ class LifeMisMigrationPatient extends Model
{
$query->where('rf_kl_VisitResultID', 0)
->where('rf_kl_StatCureResultID', 0)
->whereBetween('DateIngoing', [$dateRange->startSql(), $dateRange->endSql()])
// ->whereBetween('DateIngoing', [$dateRange->startSql(), $dateRange->endSql()])
// ->whereHas('medicalHistory', function ($query) use ($branchId, $dateRange) {
// $query->whereDate('DateExtract', '1900-01-01');
// })
@@ -48,7 +48,9 @@ class LifeMisMigrationPatient 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 +81,9 @@ class LifeMisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -102,7 +106,9 @@ class LifeMisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -125,7 +131,9 @@ class LifeMisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -148,7 +156,9 @@ class LifeMisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -168,7 +178,9 @@ class LifeMisMigrationPatient extends Model
}
if ($dateRange) {
$query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
// $query->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
$query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
}
return $query;
@@ -182,7 +194,9 @@ class LifeMisMigrationPatient 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->whereBetween('DateOut', [$dateRange->startSql(), $dateRange->endSql()]);
return $query->where('DateOut', '>=', $dateRange->startSql())
->where('DateOut', '<=', $dateRange->endSql());
});
if ($branchId) {