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-05-05 17:06:15 +09:00
parent 51a4b5b9de
commit 717641e4bb
18 changed files with 712 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/Models/MigrationPatient.php
View File

@@ -69,7 +69,7 @@ class MigrationPatient extends MaterializedViewModel
{
return $query->where('out_date', '>', $from)
->where('out_date', '<=', $to)
->whereNotIn('stat_cure_result_id', [3, 4, 7])
->whereNotIn('visit_result_id', [3, 4, 5, 6])
->whereNull('death_date'); // умершие не считаются "выбывшими домой"
}
@@ -77,7 +77,7 @@ class MigrationPatient extends MaterializedViewModel
{
return $query->where('out_date', '>', $from)
->where('out_date', '<=', $to)
->whereIn('stat_cure_result_id', [3, 4, 7]);
->whereIn('visit_result_id', [3, 4]);
}
public function scopeDeceased($query, string $from, string $to)
@@ -89,17 +89,13 @@ class MigrationPatient extends MaterializedViewModel
public function scopeCurrent($query, DateRange $dateRange)
{
// return $query->where('ingoing_date', '<', $dateRange->startSql())
// ->where(function ($q) use ($dateRange) {
// $q->whereNull('out_date')->orWhere('out_date', '>', $dateRange->endSql());
// });
// return $query->where('ingoing_date', '<=', $dateRange->endSql())
// ->has('medicalHistory')
// ->where(function ($q) use ($dateRange) {
// $q->whereNull('out_date')
// ->orWhere('out_date', '>=', $dateRange->startSql())
// ->where('out_date', '<=', $dateRange->endSql());
// });
return $query->where('is_actually_current', true);
}
public function scopeCurrentMigration($query, $historyId)
{
return $query->where('medical_history_id', $historyId)
->orderBy('ingoing_date', 'desc')
->limit(1)->first();
}
}

31
app/Models/MigrationPatientCorrection.php Normal file
View File

@@ -0,0 +1,31 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class MigrationPatientCorrection extends Model
{
protected $fillable = [
'migration_patient_id',
'medical_history_id',
'ingoing_date',
'out_date',
'diagnosis_id',
'diagnosis_code',
'diagnosis_name',
'interrupted_event_id',
'stationar_branch_id',
'department_id',
'visit_result_id',
'stat_cure_result_id',
'user_id',
'mis_user_id',
'comment',
];
protected $casts = [
'ingoing_date' => 'datetime:UTC',
'out_date' => 'datetime:UTC',
];
}

25
app/Models/MigrationPatientNurse.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class MigrationPatientNurse extends Model
{
protected $fillable = [
'medical_history_id',
'ingoing_date',
'out_date',
'diagnosis_id',
'diagnosis_code',
'diagnosis_name',
'interrupted_event_id',
'stationar_branch_id',
'department_id',
'visit_result_id',
'stat_cure_result_id',
'user_id',
'mis_user_id',
'comment',
];
}

19
app/Models/ReportNurse.php
View File

@@ -7,14 +7,29 @@ use Illuminate\Database\Eloquent\Model;
class ReportNurse extends Model
{
protected $fillable = [
'date_report',
'report_date',
'sent_at',
'period_type',
'period_start',
'period_end',
'status_id'
'status_id',
'rf_lpudoctor_id',
'rf_department_id',
'rf_user_id',
];
protected $casts = [
'report_date' => 'date:Y-m-d',
'sent_at' => 'datetime:Y-m-d H:i:s',
'period_start' => 'datetime:Y-m-d H:i:s',
'period_end' => 'datetime:Y-m-d H:i:s',
];
public function department()
{
return $this->belongsTo(Department::class, 'rf_department_id', 'department_id');
}
public function patients()
{
return $this->hasMany(ReportNursePatient::class, 'report_nurse_id');

34
app/Models/ReportNursePatient.php Normal file
View File

@@ -0,0 +1,34 @@
<?php
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
class ReportNursePatient extends Model
{
protected $fillable = [
'report_nurse_id',
'source_type',
'original_id',
'medical_card_number',
'full_name',
'birth_date',
'recipient_date',
'extract_date',
'death_date',
'male',
'urgency_id',
'hospital_result_id',
'visit_result_id',
'comment',
'user_id'
];
protected $casts = [
'birth_date' => 'date',
'recipient_date' => 'datetime',
'extract_date' => 'datetime',
'death_date' => 'datetime',
'male' => 'boolean',
];
}

12
app/Models/UnifiedMedicalHistory.php
View File

@@ -10,16 +10,16 @@ class UnifiedMedicalHistory extends MaterializedViewModel
protected $primaryKey = 'id';
protected $casts = [
'birth_date' => 'date',
'recipient_date' => 'datetime',
'extract_date' => 'datetime',
'death_date' => 'datetime',
'birth_date' => 'date:Y-m-d',
'recipient_date' => 'datetime:Y-m-d H:i:s',
'extract_date' => 'datetime:Y-m-d H:i:s',
'death_date' => 'datetime:Y-m-d H:i:s',
'male' => 'boolean',
];
public function migrations(): \Illuminate\Database\Eloquent\Relations\HasMany|MedicalHistory
{
return $this->hasMany(MigrationPatient::class, 'medical_history_id', 'id');
return $this->hasMany(UnifiedMigrationPatient::class, 'medical_history_id', 'id');
}
public function operations(): \Illuminate\Database\Eloquent\Relations\HasMany|MedicalHistory
@@ -29,7 +29,7 @@ class UnifiedMedicalHistory extends MaterializedViewModel
public function latestMigration()
{
return $this->hasOne(MigrationPatient::class, 'medical_history_id', 'id')
return $this->hasOne(UnifiedMigrationPatient::class, 'medical_history_id', 'id')
->latest('ingoing_date');
}

110
app/Models/UnifiedMigrationPatient.php Normal file
View File

@@ -0,0 +1,110 @@
<?php
namespace App\Models;
use App\Services\DateRange;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
class UnifiedMigrationPatient extends Model
{
protected $table = 'v_unified_migration_patient_nurse';
protected $primaryKey = 'id';
protected $casts = [
'ingoing_date' => 'datetime:Y-m-d H:i:s',
'out_date' => 'datetime:Y-m-d H:i:s',
];
public function medicalHistory()
{
return $this->belongsTo(UnifiedMedicalHistory::class, 'medical_history_id', 'id');
}
public function operations()
{
return $this->hasMany(SurgicalOperation::class, 'migration_patient_id', 'id');
}
// Пересечение с отчетным периодом
public function scopeDateRange($query, string $from, string $to)
{
return $query->where('ingoing_date', '<=', $to)
->where(function ($q) use ($from) {
$q->whereNull('out_date')->orWhere('out_date', '>=', $from);
});
}
// Фильтр по подразделению (получает ID отделений)
public function scopeDepartment($query, int $departmentId)
{
$branchIds = DB::table('stt_stationarbranch')
->where('rf_DepartmentID', $departmentId)
->pluck('StationarBranchID');
return $query->whereIn('stationar_branch_id', $branchIds);
}
// Добавляет вычисляемый столбец `category` (только для отображения)
public function scopeWithCategory($query, string $from, string $to)
{
$sql = "CASE
WHEN ingoing_date BETWEEN ? AND ? THEN 'admitted'
WHEN out_date BETWEEN ? AND ? THEN
CASE
WHEN death_date IS NOT NULL AND death_date BETWEEN ? AND ? THEN 'deceased'
WHEN stat_cure_result_id IN (3,4,7) THEN 'transferred'
ELSE 'discharged'
END
WHEN ingoing_date < ? AND (out_date IS NULL OR out_date > ?) THEN 'current'
ELSE 'historical'
END as category";
return $query->selectRaw($sql, [$from, $to, $from, $to, $from, $to, $to, $to]);
}
// Быстрые фильтры по статусам (используют индексы MV, а не computed column)
public function scopeAdmitted($query, string $from, string $to)
{
return $query->where('ingoing_date', '>', $from)
->where('ingoing_date', '<=', $to);
}
public function scopeDischarged($query, string $from, string $to)
{
return $query->where('out_date', '>', $from)
->where('out_date', '<=', $to)
->whereNotIn('visit_result_id', [3, 4, 5, 6])
->whereNull('death_date'); // умершие не считаются "выбывшими домой"
}
public function scopeTransferred($query, string $from, string $to)
{
return $query->where('out_date', '>', $from)
->where('out_date', '<=', $to)
->whereIn('visit_result_id', [3, 4]);
}
public function scopeDeceased($query, string $from, string $to)
{
return $query->whereNotNull('death_date')
->where('death_date', '>', $from)
->where('death_date', '<=', $to);
}
public function scopeCurrent($query, DateRange $dateRange)
{
return $query->whereNull('out_date')
->whereNotNull('medical_history_id')
->whereHas('medicalHistory', function ($q) use ($dateRange) {
$q->whereNull('extract_date');
});
}
public function scopeCurrentMigration($query, $historyId)
{
return $query->where('medical_history_id', $historyId)
->orderBy('ingoing_date', 'desc')
->limit(1)->first();
}
}