Изменения в основном report

This commit is contained in:
brusnitsyn
2026-05-06 22:32:11 +09:00
parent c5da85763c
commit 723ccee8d3
56 changed files with 1911 additions and 3814 deletions

View File

@@ -1,33 +0,0 @@
<?php
namespace App\Domain\Reports\Calculators;
use App\Domain\Reports\Models\MetricAggregate;
use App\Domain\Reports\Models\StayInterval;
final class BedDaysCalculator
{
/**
* @param iterable<StayInterval> $intervals
*/
public function calculate(iterable $intervals): MetricAggregate
{
$totalDays = 0;
$patientCount = 0;
foreach ($intervals as $interval) {
if ($interval->endAt < $interval->startAt) {
continue;
}
$totalDays += $interval->startAt->setTime(0, 0)->diff($interval->endAt->setTime(0, 0))->days;
$patientCount++;
}
return new MetricAggregate(
total: $totalDays,
count: $patientCount,
average: $patientCount > 0 ? round($totalDays / $patientCount, 2) : 0.0,
);
}
}

View File

@@ -1,15 +0,0 @@
<?php
namespace App\Domain\Reports\Calculators;
final class DepartmentLoadCalculator
{
public function calculate(int|float $currentCount, int|float $bedsCount): int
{
if ($bedsCount <= 0) {
return 0;
}
return (int) round($currentCount * 100 / $bedsCount);
}
}

View File

@@ -1,33 +0,0 @@
<?php
namespace App\Domain\Reports\Calculators;
use App\Domain\Reports\Models\MetricAggregate;
use App\Domain\Reports\Models\OperationInterval;
final class PreoperativeDaysCalculator
{
/**
* @param iterable<OperationInterval> $intervals
*/
public function calculate(iterable $intervals): MetricAggregate
{
$totalDays = 0;
$patientCount = 0;
foreach ($intervals as $interval) {
if ($interval->operationAt < $interval->admittedAt) {
continue;
}
$totalDays += $interval->admittedAt->setTime(0, 0)->diff($interval->operationAt->setTime(0, 0))->days;
$patientCount++;
}
return new MetricAggregate(
total: $totalDays,
count: $patientCount,
average: $patientCount > 0 ? round($totalDays / $patientCount, 1) : 0.0,
);
}
}

View File

@@ -1,10 +0,0 @@
<?php
namespace App\Domain\Reports\Contracts;
use App\Application\Reports\DTO\ReportComparisonResult;
interface AuditLogger
{
public function logComparison(ReportComparisonResult $result): void;
}

View File

@@ -1,12 +0,0 @@
<?php
namespace App\Domain\Reports\Contracts;
use App\Domain\Reports\Models\MetricResultCollection;
use App\Domain\Reports\Models\PatientCollection;
use App\Domain\Reports\Models\ReportContext;
interface MetricCalculator
{
public function calculate(ReportContext $context, PatientCollection $patients): MetricResultCollection;
}

View File

@@ -1,11 +0,0 @@
<?php
namespace App\Domain\Reports\Contracts;
use App\Domain\Reports\Models\PatientCollection;
use App\Domain\Reports\Models\ReportContext;
interface PatientSource
{
public function load(ReportContext $context): PatientCollection;
}

View File

@@ -1,13 +0,0 @@
<?php
namespace App\Domain\Reports\Contracts;
use App\Domain\Reports\Models\ReportSnapshot;
use App\Domain\Reports\Models\SavedReportResult;
interface ReportRepository
{
public function save(ReportSnapshot $snapshot): SavedReportResult;
public function findSnapshot(int $reportId): ?ReportSnapshot;
}

View File

@@ -1,12 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
final readonly class MetricAggregate
{
public function __construct(
public int $total,
public int $count,
public float $average,
) {}
}

View File

@@ -1,23 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
use App\Domain\Reports\ValueObjects\MetrikaConfig;
final readonly class MetricResultCollection
{
/**
* @param array<int|string, int|float|string|null> $metrics
*/
public function __construct(
public array $metrics = [],
) {}
/**
* @return array<int, int|float|string|null>
*/
public function normalized(): array
{
return MetrikaConfig::normalizeMetrics($this->metrics);
}
}

View File

@@ -1,13 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
use DateTimeImmutable;
final readonly class OperationInterval
{
public function __construct(
public DateTimeImmutable $admittedAt,
public DateTimeImmutable $operationAt,
) {}
}

View File

@@ -1,20 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
final readonly class PatientCollection
{
/**
* @param array<int, array<string, mixed>> $items
* @param array<string, mixed> $metadata
*/
public function __construct(
public array $items = [],
public array $metadata = [],
) {}
public function metadata(string $key, mixed $default = null): mixed
{
return $this->metadata[$key] ?? $default;
}
}

View File

@@ -1,21 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
use DateTimeImmutable;
final readonly class ReportContext
{
/**
* @param array<string, mixed> $metadata
*/
public function __construct(
public int $departmentId,
public int $userId,
public ?int $actorUserId,
public DateTimeImmutable $periodStart,
public DateTimeImmutable $periodEnd,
public string $reportType = 'daily',
public array $metadata = [],
) {}
}

View File

@@ -1,85 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
use App\Domain\Reports\ValueObjects\MetrikaConfig;
use DateTimeImmutable;
use InvalidArgumentException;
final readonly class ReportSnapshot
{
/**
* @param array<int|string, int|float|string|null> $metrics
* @param array<int, array<string, mixed>> $observationPatients
* @param array<int, array<string, mixed>> $unwantedEvents
*/
public function __construct(
public int $departmentId,
public int $userId,
public ?int $actorUserId,
public DateTimeImmutable $periodStart,
public DateTimeImmutable $periodEnd,
public string $status = 'draft',
public bool $autoFill = false,
public array $metrics = [],
public array $observationPatients = [],
public array $unwantedEvents = [],
public ?int $reportId = null,
public ?DateTimeImmutable $createdAt = null,
public ?DateTimeImmutable $sentAt = null,
public string $reportType = 'daily',
) {
if ($this->departmentId <= 0) {
throw new InvalidArgumentException('departmentId must be positive.');
}
if ($this->userId <= 0) {
throw new InvalidArgumentException('userId must be positive.');
}
if ($this->periodEnd < $this->periodStart) {
throw new InvalidArgumentException('periodEnd must not be earlier than periodStart.');
}
}
/**
* @return array<int, int|float|string|null>
*/
public function normalizedMetrics(): array
{
return MetrikaConfig::normalizeMetrics($this->metrics);
}
/**
* @return array<string, int|float|string|null>
*/
public function payloadMetrics(): array
{
return MetrikaConfig::toPayloadMetrics($this->normalizedMetrics());
}
/**
* @return array<string, mixed>
*/
public function toComparableArray(): array
{
$observationPatients = $this->observationPatients;
$unwantedEvents = $this->unwantedEvents;
sort($observationPatients);
sort($unwantedEvents);
return [
'department_id' => $this->departmentId,
'user_id' => $this->userId,
'actor_user_id' => $this->actorUserId,
'period_start' => $this->periodStart->format('Y-m-d H:i:s'),
'period_end' => $this->periodEnd->format('Y-m-d H:i:s'),
'status' => $this->status,
'auto_fill' => $this->autoFill,
'metrics' => $this->normalizedMetrics(),
'observation_patients' => $observationPatients,
'unwanted_events' => $unwantedEvents,
];
}
}

View File

@@ -1,11 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
final readonly class SavedReportResult
{
public function __construct(
public int $reportId,
public ReportSnapshot $snapshot,
) {}
}

View File

@@ -1,13 +0,0 @@
<?php
namespace App\Domain\Reports\Models;
use DateTimeImmutable;
final readonly class StayInterval
{
public function __construct(
public DateTimeImmutable $startAt,
public DateTimeImmutable $endAt,
) {}
}