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

Добавил возможность ограничения выборки пациентов по диагнозу

Browse Source
This commit is contained in:
brusnitsyn
2026-07-16 16:09:15 +09:00
parent 1bfd60ee0d
commit 70ceecd966
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Services/DutyReportService.php
View File

@@ -127,6 +127,7 @@ class DutyReportService
return MedicalHistory::query() return MedicalHistory::query()
->whereHas('migrations', function ($q) use ($departmentId, $dateRange, $startYear) { ->whereHas('migrations', function ($q) use ($departmentId, $dateRange, $startYear) {
$q->where('department_id', $departmentId) $q->where('department_id', $departmentId)
// ->whereNotIn('diagnosis_code', ['Z00.8', 'Z76.1', 'Z76.2', 'Z76.3']) // Исключаем осмотры и наблюдения
->where('ingoing_date', '<=', $dateRange->endSql()) ->where('ingoing_date', '<=', $dateRange->endSql())
->where(function ($sub) use ($dateRange, $startYear) { ->where(function ($sub) use ($dateRange, $startYear) {
// Миграции без out_date (еще лежат) // Миграции без out_date (еще лежат)

1
app/Services/MedicalHistoryService.php
View File

@@ -14,6 +14,7 @@ class MedicalHistoryService
$startYear = $dateRange->startDate->copy()->startOfYear()->format('Y-m-d'); $startYear = $dateRange->startDate->copy()->startOfYear()->format('Y-m-d');
$periodMigrationFilter = function ($q) use ($departmentId, $dateRange, $startYear) { $periodMigrationFilter = function ($q) use ($departmentId, $dateRange, $startYear) {
$q->where('department_id', $departmentId) $q->where('department_id', $departmentId)
// ->whereNotIn('diagnosis_code', ['Z76.1', 'Z76.2', 'Z76.3']) // Исключаем осмотры и наблюдения
->where('ingoing_date', '<=', $dateRange->endSql()) ->where('ingoing_date', '<=', $dateRange->endSql())
->where(function ($sub) use ($dateRange, $startYear) { ->where(function ($sub) use ($dateRange, $startYear) {
// Миграции без out_date (еще лежат) // Миграции без out_date (еще лежат)

2
app/Services/NurseReportService.php
View File

@@ -96,6 +96,7 @@ class NurseReportService
$query = UnifiedMedicalHistory::query() $query = UnifiedMedicalHistory::query()
->whereHas('migrations', function ($q) use ($departmentId, $dateRange, $startYear) { ->whereHas('migrations', function ($q) use ($departmentId, $dateRange, $startYear) {
$q->where('department_id', $departmentId) $q->where('department_id', $departmentId)
// ->whereNotIn('diagnosis_code', ['Z00.8', 'Z76.1', 'Z76.2', 'Z76.3']) // Исключаем осмотры и наблюдения
->where('ingoing_date', '<=', $dateRange->endSql()) ->where('ingoing_date', '<=', $dateRange->endSql())
->where(function ($sub) use ($dateRange, $startYear) { ->where(function ($sub) use ($dateRange, $startYear) {
$sub->whereNull('out_date') $sub->whereNull('out_date')
@@ -110,6 +111,7 @@ class NurseReportService
}) })
->with(['migrations' => function ($q) use ($departmentId, $dateRange, $startYear) { ->with(['migrations' => function ($q) use ($departmentId, $dateRange, $startYear) {
$q->where('department_id', $departmentId) $q->where('department_id', $departmentId)
// ->whereNotIn('diagnosis_code', ['Z00.8', 'Z76.1', 'Z76.2', 'Z76.3']) // Исключаем осмотры и наблюдения
->where('ingoing_date', '<=', $dateRange->endSql()) ->where('ingoing_date', '<=', $dateRange->endSql())
->where(function ($sub) use ($dateRange, $startYear) { ->where(function ($sub) use ($dateRange, $startYear) {
$sub->whereNull('out_date') $sub->whereNull('out_date')