feat(insurance): bill an appointment with a chosen service kind and insurance
An appointment can now carry the insurance it is billed with: the service kind (outpatient/inpatient) and the basic insurance. Confirming it no longer hands the whole amount to the patient — the visit is split through BillingCalculator with the coverage percent of that service kind, and the choice travels to the encounter and the invoice built from it. The enabled service kinds are a tenant-wide setting (all of that tenant's insurances share it), so a tenant covering only one kind is never asked which one: the panel resolves it the same way the server does. - add tenant_service_category_settings + TenantServiceCategoryService, exposed on the existing insurance-pricing endpoint (service_categories, default_service_category); at least one kind must stay enabled - add appointments.insurance_service_category / insurance_base_id with AppointmentInsuranceService validating them against the tenant's own settings and active contracts (basic only), accepted by PATCH and by confirm - snapshot the kind on patient_sessions and invoices; the visit's coverage rule is resolved per kind (services keep using their own ServiceItem.service_category) - lib/insuranceShares becomes the single client-side mirror of BillingCalculator, shared by the confirm modal, the appointment edit page and the session form - surface the selection: confirm modal (with live shares), turns timeline chip, appointment edit page, patient record service card and invoice summary - the session form shows the insurance block whenever the tenant has an active contract and prefills the patient's own insurance, so it can be changed - fix: the confirm modal showed a zero visit price when the appointment had none — it now falls back to the tenant's free-visit price like the server - fix: useServiceCategories read one level too shallow, so Persian labels never arrived and raw enum keys leaked into the contract summary - fix: BlogsPage test asserted the public blogs endpoint after the page moved to the admin one Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -42,6 +42,7 @@ class AppointmentController extends BaseController
|
||||
private readonly \App\Staff\Repository\ClinicStaffRepository $staffRepo,
|
||||
private readonly \App\Appointment\Repository\AppointmentEventRepository $eventRepo,
|
||||
private readonly \App\Appointment\Security\AppointmentAccessChecker $accessChecker,
|
||||
private readonly \App\Appointment\Service\AppointmentInsuranceService $appointmentInsurance,
|
||||
private readonly \Psr\Log\LoggerInterface $logger,
|
||||
) {}
|
||||
|
||||
@@ -1026,6 +1027,10 @@ class AppointmentController extends BaseController
|
||||
];
|
||||
}
|
||||
|
||||
// انتخاب بیمه سرِ پذیرش: قبل از ساخت مراجعه روی نوبت مینشیند تا سهمها با
|
||||
// همان بیمه محاسبه شوند.
|
||||
$this->appointmentInsurance->apply($appointment, $data);
|
||||
|
||||
try {
|
||||
$session = $this->appointmentConfirmation->confirmWithPayments($appointment, $version, $payments, $user);
|
||||
} catch (OptimisticLockException) {
|
||||
@@ -1043,6 +1048,13 @@ class AppointmentController extends BaseController
|
||||
'paid_total_rials' => $session->getPaidTotalRials(),
|
||||
'remaining_rials' => $session->getRemainingRials(),
|
||||
'is_paid' => $session->getRemainingRials() === 0,
|
||||
// تفکیک بیمه — مودالِ قطعیکردن همان مبلغی را نشان میدهد که ثبت شده.
|
||||
'insurance_service_category' => $session->getInsuranceServiceCategory()?->value,
|
||||
'insurance_base_id' => $session->getInsuranceBaseId(),
|
||||
'gross_total_rials' => $session->getGrossTotalRials(),
|
||||
'base_insurance_rials' => $session->getBaseInsuranceRials(),
|
||||
'supplementary_insurance_rials' => $session->getSupplementaryInsuranceRials(),
|
||||
'patient_share_rials' => $session->getPatientShareRials(),
|
||||
],
|
||||
]);
|
||||
}
|
||||
@@ -1126,6 +1138,7 @@ class AppointmentController extends BaseController
|
||||
if (array_key_exists('note', $data)) {
|
||||
$appointment->setNote($data['note'] !== null ? trim((string) $data['note']) : null);
|
||||
}
|
||||
$this->appointmentInsurance->apply($appointment, $data);
|
||||
// جایگزینی نوبت — swap the person occupying the slot.
|
||||
if (array_key_exists('patient_name', $data)) {
|
||||
$appointment->setPatientName($data['patient_name'] !== null ? trim((string) $data['patient_name']) : null);
|
||||
|
||||
Reference in New Issue
Block a user