Форматирование
This commit is contained in:
@@ -9,6 +9,7 @@ use Illuminate\Support\Carbon;
|
||||
class LifeMisMigrationPatient extends Model
|
||||
{
|
||||
protected $table = 'life_stt_migrationpatient';
|
||||
|
||||
protected $primaryKey = 'MigrationPatientID';
|
||||
|
||||
public function branch()
|
||||
@@ -34,7 +35,7 @@ class LifeMisMigrationPatient extends Model
|
||||
/**
|
||||
* Находятся на лечении
|
||||
*/
|
||||
public function scopeCurrentlyInTreatment($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeCurrentlyInTreatment($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
$query->where('rf_kl_VisitResultID', 0)
|
||||
->where('rf_kl_StatCureResultID', 0)
|
||||
@@ -49,7 +50,7 @@ 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());
|
||||
}
|
||||
@@ -71,7 +72,7 @@ class LifeMisMigrationPatient extends Model
|
||||
/**
|
||||
* Выбывшие пациенты (все исходы)
|
||||
*/
|
||||
public function scopeOutcomePatients($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeOutcomePatients($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
$query->where('rf_MedicalHistoryID', '<>', 0);
|
||||
|
||||
@@ -94,7 +95,7 @@ class LifeMisMigrationPatient extends Model
|
||||
/**
|
||||
* Выписанные пациенты
|
||||
*/
|
||||
public function scopeOutcomeDischarged($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeOutcomeDischarged($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
// По уточненному SQL: Выписано за период
|
||||
$dischargeCodes = [1, 11, 2, 12, 7, 18, 48];
|
||||
@@ -121,7 +122,7 @@ class LifeMisMigrationPatient extends Model
|
||||
/**
|
||||
* Перевод в другое отделение
|
||||
*/
|
||||
public function scopeOutcomeTransferred($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeOutcomeTransferred($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
// По заданному SQL: только эти коды перевода
|
||||
$transferCodes = [4, 14];
|
||||
@@ -148,7 +149,7 @@ class LifeMisMigrationPatient extends Model
|
||||
/**
|
||||
* Умершие пациенты
|
||||
*/
|
||||
public function scopeDeceasedOutcome($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeDeceasedOutcome($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
// ID умершего
|
||||
$deceasedCodes = [5, 6, 15, 16];
|
||||
@@ -172,7 +173,7 @@ class LifeMisMigrationPatient extends Model
|
||||
return $query;
|
||||
}
|
||||
|
||||
public function scopeOutcomeWithoutTransferred($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeOutcomeWithoutTransferred($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
$query->whereNotIn('rf_kl_VisitResultID', [4, 14])
|
||||
->where('rf_kl_VisitResultID', '<>', 0)
|
||||
@@ -194,16 +195,17 @@ class LifeMisMigrationPatient extends Model
|
||||
return $query;
|
||||
}
|
||||
|
||||
public function scopeExtractedToday($query, $branchId = null, DateRange $dateRange = null)
|
||||
public function scopeExtractedToday($query, $branchId = null, ?DateRange $dateRange = null)
|
||||
{
|
||||
// if (is_null($startDate)) $startDate = Carbon::now()->addDays(-1)->format('Y-m-d');
|
||||
// if (is_null($endDate)) $endDate = Carbon::now()->format('Y-m-d');
|
||||
// if (is_null($startDate)) $startDate = Carbon::now()->addDays(-1)->format('Y-m-d');
|
||||
// if (is_null($endDate)) $endDate = Carbon::now()->format('Y-m-d');
|
||||
|
||||
$query->where('rf_kl_VisitResultID', '<>', 0)
|
||||
->where('rf_MedicalHistoryID', '<>', 0)
|
||||
->when($dateRange, function($query) use ($dateRange) {
|
||||
->when($dateRange, function ($query) use ($dateRange) {
|
||||
$startDate = Carbon::parse($dateRange->startSql())->toDateString();
|
||||
$endDate = Carbon::parse($dateRange->endSql())->toDateString();
|
||||
|
||||
return $query->whereHas('medicalHistory', function ($mhQuery) use ($startDate, $endDate) {
|
||||
$mhQuery->whereDate('DateExtract', '>', $startDate)
|
||||
->whereDate('DateExtract', '<=', $endDate);
|
||||
|
||||
Reference in New Issue
Block a user