Перевод на доменную архитектуру
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Domain\Reports\ValueObjects\MetrikaConfig;
|
||||
use App\Models\MedicalHistorySnapshot;
|
||||
use App\Models\MetrikaResult;
|
||||
use App\Models\Report;
|
||||
@@ -142,7 +143,7 @@ class FillAverageBedDaysMetric extends Command
|
||||
|
||||
// Get a sample of recently updated reports
|
||||
$sampleQuery = Report::whereHas('metrikaResults', function ($q) {
|
||||
$q->where('rf_metrika_item_id', 18);
|
||||
$q->where('rf_metrika_item_id', MetrikaConfig::AVERAGE_BED_DAYS);
|
||||
})
|
||||
->orderBy('report_id', 'desc')
|
||||
->limit(5);
|
||||
@@ -160,7 +161,7 @@ class FillAverageBedDaysMetric extends Command
|
||||
|
||||
$sample = $sampleQuery->get()->map(function ($report) {
|
||||
$metric = $report->metrikaResults
|
||||
->where('rf_metrika_item_id', 18)
|
||||
->where('rf_metrika_item_id', MetrikaConfig::AVERAGE_BED_DAYS)
|
||||
->first();
|
||||
|
||||
return [
|
||||
@@ -189,7 +190,7 @@ class FillAverageBedDaysMetric extends Command
|
||||
{
|
||||
// Check if metric already exists
|
||||
$existingMetric = MetrikaResult::where('rf_report_id', $report->report_id)
|
||||
->where('rf_metrika_item_id', 18)
|
||||
->where('rf_metrika_item_id', MetrikaConfig::AVERAGE_BED_DAYS)
|
||||
->first();
|
||||
|
||||
if ($existingMetric && ! $force) {
|
||||
@@ -206,7 +207,7 @@ class FillAverageBedDaysMetric extends Command
|
||||
MetrikaResult::updateOrCreate(
|
||||
[
|
||||
'rf_report_id' => $report->report_id,
|
||||
'rf_metrika_item_id' => 18,
|
||||
'rf_metrika_item_id' => MetrikaConfig::AVERAGE_BED_DAYS,
|
||||
],
|
||||
['value' => 0]
|
||||
);
|
||||
@@ -221,7 +222,7 @@ class FillAverageBedDaysMetric extends Command
|
||||
MetrikaResult::updateOrCreate(
|
||||
[
|
||||
'rf_report_id' => $report->report_id,
|
||||
'rf_metrika_item_id' => 18,
|
||||
'rf_metrika_item_id' => MetrikaConfig::AVERAGE_BED_DAYS,
|
||||
],
|
||||
['value' => $avgBedDays]
|
||||
);
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
namespace App\Console\Commands;
|
||||
|
||||
use App\Domain\Reports\ValueObjects\MetrikaConfig;
|
||||
use App\Models\MedicalHistorySnapshot;
|
||||
use App\Models\MetrikaResult;
|
||||
use App\Models\Report;
|
||||
@@ -135,14 +136,14 @@ class RecalculatePreoperativeMetric extends Command
|
||||
$this->info('📋 Примеры обновленных отчетов:');
|
||||
|
||||
$samples = Report::whereHas('metrikaResults', function ($q) {
|
||||
$q->where('rf_metrika_item_id', 21);
|
||||
$q->where('rf_metrika_item_id', MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS);
|
||||
})
|
||||
->orderBy('report_id', 'desc')
|
||||
->limit(5)
|
||||
->get()
|
||||
->map(function ($report) {
|
||||
$metric = $report->metrikaResults
|
||||
->where('rf_metrika_item_id', 21)
|
||||
->where('rf_metrika_item_id', MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS)
|
||||
->first();
|
||||
|
||||
return [
|
||||
@@ -169,7 +170,7 @@ class RecalculatePreoperativeMetric extends Command
|
||||
{
|
||||
// Проверяем, есть ли уже метрика
|
||||
$existing = MetrikaResult::where('rf_report_id', $report->report_id)
|
||||
->where('rf_metrika_item_id', 21)
|
||||
->where('rf_metrika_item_id', MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS)
|
||||
->first();
|
||||
|
||||
if ($existing && ! $force) {
|
||||
@@ -186,7 +187,7 @@ class RecalculatePreoperativeMetric extends Command
|
||||
MetrikaResult::updateOrCreate(
|
||||
[
|
||||
'rf_report_id' => $report->report_id,
|
||||
'rf_metrika_item_id' => 21,
|
||||
'rf_metrika_item_id' => MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS,
|
||||
],
|
||||
['value' => 0]
|
||||
);
|
||||
@@ -213,7 +214,7 @@ class RecalculatePreoperativeMetric extends Command
|
||||
MetrikaResult::updateOrCreate(
|
||||
[
|
||||
'rf_report_id' => $report->report_id,
|
||||
'rf_metrika_item_id' => 21,
|
||||
'rf_metrika_item_id' => MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS,
|
||||
],
|
||||
['value' => 0]
|
||||
);
|
||||
@@ -240,7 +241,7 @@ class RecalculatePreoperativeMetric extends Command
|
||||
MetrikaResult::updateOrCreate(
|
||||
[
|
||||
'rf_report_id' => $report->report_id,
|
||||
'rf_metrika_item_id' => 21,
|
||||
'rf_metrika_item_id' => MetrikaConfig::PREOPERATIVE_AVERAGE_DAYS,
|
||||
],
|
||||
['value' => $avgDays]
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user