Add full Radiology, Cardiology, and Psychiatry specialty clinical suites.

Mirror the Ophthalmology/Maternity shell pattern with stages, stage_tabs,
workspace clinical records, reports/print, demo seeds, and suite tests.

Co-authored-by: Cursor <cursoragent@cursor.com>

app/Http/Controllers/Care/CardiologyWorkspaceController.php

@@ -0,0 +1,215 @@
+<?php
+
+namespace App\Http\Controllers\Care;
+
+use App\Http\Controllers\Care\Concerns\ScopesToAccount;
+use App\Http\Controllers\Controller;
+use App\Models\SpecialtyClinicalRecord;
+use App\Models\Visit;
+use App\Services\Care\Cardiology\CardiologyAnalyticsService;
+use App\Services\Care\Cardiology\CardiologyWorkflowService;
+use App\Services\Care\SpecialtyClinicalRecordService;
+use App\Services\Care\SpecialtyModuleService;
+use App\Services\Care\SpecialtyShellService;
+use App\Services\Care\SpecialtyVisitStageService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class CardiologyWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertCardiologyAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'cardiology'), 403);
+    }
+
+    protected function assertCardiologyManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'cardiology'), 403);
+    }
+
+    protected function assertVisit(Request $request, Visit $visit): void
+    {
+        abort_unless($visit->organization_id === $this->organization($request)->id, 404);
+        $this->authorizeBranch($request, (int) $visit->branch_id);
+    }
+
+    public function setStage(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyVisitStageService $stages,
+        SpecialtyShellService $shell,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertCardiologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'cardiology',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'cardiology',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('cardiology', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function saveProcedure(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        CardiologyWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertCardiologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('cardiology', 'cardio_procedure') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'procedures']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('cardiology', 'cardio_procedure')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'cardiology',
+            'cardio_procedure',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            CardiologyWorkflowService::STAGE_PROCEDURE,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'cardiology',
+                CardiologyWorkflowService::STAGE_PROCEDURE,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'cardiology',
+                    CardiologyWorkflowService::STAGE_COMPLETED,
+                    $owner,
+                    $owner,
+                );
+            } catch (\InvalidArgumentException) {
+            }
+
+            $visit->refresh();
+            if ($visit->status !== Visit::STATUS_COMPLETED) {
+                $visit->update([
+                    'status' => Visit::STATUS_COMPLETED,
+                    'completed_at' => $visit->completed_at ?? now(),
+                ]);
+            }
+
+            $appointment = $visit->appointment;
+            if ($appointment && $appointment->status !== \App\Models\Appointment::STATUS_COMPLETED) {
+                $appointment->update([
+                    'status' => \App\Models\Appointment::STATUS_COMPLETED,
+                    'completed_at' => $appointment->completed_at ?? now(),
+                ]);
+            }
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', ['module' => 'cardiology', 'visit' => $visit, 'tab' => 'procedures'])
+            ->with('success', 'Procedure / intervention saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        CardiologyAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertCardiologyAccess($request, $modules);
+
+        $organization = $this->organization($request);
+        $branchScope = app(\App\Services\Care\OrganizationResolver::class)->branchScope($this->member($request));
+
+        $report = $analytics->report(
+            $organization,
+            $this->ownerRef($request),
+            $branchScope,
+            $request->query('from'),
+            $request->query('to'),
+        );
+
+        return view('care.specialty.cardiology.reports', [
+            'moduleKey' => 'cardiology',
+            'definition' => $modules->definition('cardiology'),
+            'shellNav' => $shell->navItems('cardiology'),
+            'report' => $report,
+            'currency' => strtoupper((string) config('care.billing.currency', config('care.currency', 'GHS'))),
+        ]);
+    }
+
+    public function printSummary(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertCardiologyAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.cardiology.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'history' => $clinical->findForVisit($visit, 'cardiology', 'cardio_history'),
+            'exam' => $clinical->findForVisit($visit, 'cardiology', 'cardiac_exam'),
+            'investigation' => $clinical->findForVisit($visit, 'cardiology', 'cardio_investigation'),
+            'plan' => $clinical->findForVisit($visit, 'cardiology', 'cardio_plan'),
+            'procedure' => $clinical->findForVisit($visit, 'cardiology', 'cardio_procedure'),
+        ]);
+    }
+}

app/Http/Controllers/Care/PsychiatryWorkspaceController.php

@@ -0,0 +1,214 @@
+<?php
+
+namespace App\Http\Controllers\Care;
+
+use App\Http\Controllers\Care\Concerns\ScopesToAccount;
+use App\Http\Controllers\Controller;
+use App\Models\SpecialtyClinicalRecord;
+use App\Models\Visit;
+use App\Services\Care\Psychiatry\PsychiatryAnalyticsService;
+use App\Services\Care\Psychiatry\PsychiatryWorkflowService;
+use App\Services\Care\SpecialtyClinicalRecordService;
+use App\Services\Care\SpecialtyModuleService;
+use App\Services\Care\SpecialtyShellService;
+use App\Services\Care\SpecialtyVisitStageService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class PsychiatryWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertPsychiatryAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'psychiatry'), 403);
+    }
+
+    protected function assertPsychiatryManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'psychiatry'), 403);
+    }
+
+    protected function assertVisit(Request $request, Visit $visit): void
+    {
+        abort_unless($visit->organization_id === $this->organization($request)->id, 404);
+        $this->authorizeBranch($request, (int) $visit->branch_id);
+    }
+
+    public function setStage(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyVisitStageService $stages,
+        SpecialtyShellService $shell,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertPsychiatryManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'psychiatry',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'psychiatry',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('psychiatry', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function saveFollowUp(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        PsychiatryWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertPsychiatryManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('psychiatry', 'psych_followup') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'followup']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('psychiatry', 'psych_followup')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'psychiatry',
+            'psych_followup',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            PsychiatryWorkflowService::STAGE_REVIEW,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'psychiatry',
+                PsychiatryWorkflowService::STAGE_REVIEW,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'psychiatry',
+                    PsychiatryWorkflowService::STAGE_COMPLETED,
+                    $owner,
+                    $owner,
+                );
+            } catch (\InvalidArgumentException) {
+            }
+
+            $visit->refresh();
+            if ($visit->status !== Visit::STATUS_COMPLETED) {
+                $visit->update([
+                    'status' => Visit::STATUS_COMPLETED,
+                    'completed_at' => $visit->completed_at ?? now(),
+                ]);
+            }
+
+            $appointment = $visit->appointment;
+            if ($appointment && $appointment->status !== \App\Models\Appointment::STATUS_COMPLETED) {
+                $appointment->update([
+                    'status' => \App\Models\Appointment::STATUS_COMPLETED,
+                    'completed_at' => $appointment->completed_at ?? now(),
+                ]);
+            }
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', ['module' => 'psychiatry', 'visit' => $visit, 'tab' => 'followup'])
+            ->with('success', 'Follow-up review saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        PsychiatryAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertPsychiatryAccess($request, $modules);
+
+        $organization = $this->organization($request);
+        $branchScope = app(\App\Services\Care\OrganizationResolver::class)->branchScope($this->member($request));
+
+        $report = $analytics->report(
+            $organization,
+            $this->ownerRef($request),
+            $branchScope,
+            $request->query('from'),
+            $request->query('to'),
+        );
+
+        return view('care.specialty.psychiatry.reports', [
+            'moduleKey' => 'psychiatry',
+            'definition' => $modules->definition('psychiatry'),
+            'shellNav' => $shell->navItems('psychiatry'),
+            'report' => $report,
+            'currency' => strtoupper((string) config('care.billing.currency', config('care.currency', 'GHS'))),
+        ]);
+    }
+
+    public function printSummary(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertPsychiatryAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.psychiatry.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'history' => $clinical->findForVisit($visit, 'psychiatry', 'mental_status'),
+            'risk' => $clinical->findForVisit($visit, 'psychiatry', 'risk_assessment'),
+            'plan' => $clinical->findForVisit($visit, 'psychiatry', 'psych_plan'),
+            'followup' => $clinical->findForVisit($visit, 'psychiatry', 'psych_followup'),
+        ]);
+    }
+}

app/Http/Controllers/Care/RadiologyWorkspaceController.php

@@ -0,0 +1,214 @@
+<?php
+
+namespace App\Http\Controllers\Care;
+
+use App\Http\Controllers\Care\Concerns\ScopesToAccount;
+use App\Http\Controllers\Controller;
+use App\Models\SpecialtyClinicalRecord;
+use App\Models\Visit;
+use App\Services\Care\Radiology\RadiologyAnalyticsService;
+use App\Services\Care\Radiology\RadiologyWorkflowService;
+use App\Services\Care\SpecialtyClinicalRecordService;
+use App\Services\Care\SpecialtyModuleService;
+use App\Services\Care\SpecialtyShellService;
+use App\Services\Care\SpecialtyVisitStageService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class RadiologyWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertRadiologyAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'radiology'), 403);
+    }
+
+    protected function assertRadiologyManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'radiology'), 403);
+    }
+
+    protected function assertVisit(Request $request, Visit $visit): void
+    {
+        abort_unless($visit->organization_id === $this->organization($request)->id, 404);
+        $this->authorizeBranch($request, (int) $visit->branch_id);
+    }
+
+    public function setStage(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyVisitStageService $stages,
+        SpecialtyShellService $shell,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertRadiologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'radiology',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'radiology',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('radiology', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function saveVerification(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        RadiologyWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertRadiologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('radiology', 'imaging_verification') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'verification']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('radiology', 'imaging_verification')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'radiology',
+            'imaging_verification',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            RadiologyWorkflowService::STAGE_VERIFIED,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'radiology',
+                RadiologyWorkflowService::STAGE_VERIFIED,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'radiology',
+                    RadiologyWorkflowService::STAGE_COMPLETED,
+                    $owner,
+                    $owner,
+                );
+            } catch (\InvalidArgumentException) {
+            }
+
+            $visit->refresh();
+            if ($visit->status !== Visit::STATUS_COMPLETED) {
+                $visit->update([
+                    'status' => Visit::STATUS_COMPLETED,
+                    'completed_at' => $visit->completed_at ?? now(),
+                ]);
+            }
+
+            $appointment = $visit->appointment;
+            if ($appointment && $appointment->status !== \App\Models\Appointment::STATUS_COMPLETED) {
+                $appointment->update([
+                    'status' => \App\Models\Appointment::STATUS_COMPLETED,
+                    'completed_at' => $appointment->completed_at ?? now(),
+                ]);
+            }
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', ['module' => 'radiology', 'visit' => $visit, 'tab' => 'verification'])
+            ->with('success', 'Verification saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        RadiologyAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertRadiologyAccess($request, $modules);
+
+        $organization = $this->organization($request);
+        $branchScope = app(\App\Services\Care\OrganizationResolver::class)->branchScope($this->member($request));
+
+        $report = $analytics->report(
+            $organization,
+            $this->ownerRef($request),
+            $branchScope,
+            $request->query('from'),
+            $request->query('to'),
+        );
+
+        return view('care.specialty.radiology.reports', [
+            'moduleKey' => 'radiology',
+            'definition' => $modules->definition('radiology'),
+            'shellNav' => $shell->navItems('radiology'),
+            'report' => $report,
+            'currency' => strtoupper((string) config('care.billing.currency', config('care.currency', 'GHS'))),
+        ]);
+    }
+
+    public function printSummary(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertRadiologyAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.radiology.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'imagingRequest' => $clinical->findForVisit($visit, 'radiology', 'imaging_request'),
+            'acquisition' => $clinical->findForVisit($visit, 'radiology', 'imaging_acquisition'),
+            'imagingReport' => $clinical->findForVisit($visit, 'radiology', 'imaging_report'),
+            'verification' => $clinical->findForVisit($visit, 'radiology', 'imaging_verification'),
+        ]);
+    }
+}

app/Http/Controllers/Care/SpecialtyModuleController.php

@@ -156,6 +156,9 @@ class SpecialtyModuleController extends Controller
                 'ophthalmology' => 'refraction',
                 'physiotherapy' => 'assessment',
                 'maternity' => 'history',
+                'radiology' => 'protocol',
+                'cardiology' => 'history',
+                'psychiatry' => 'history',
                 default => (collect(array_keys($shellTabs))
                     ->first(fn (string $tab) => $clinical->recordTypeForTab($module, $tab) !== null)
                     ?? 'clinical_notes'),
@@ -230,6 +233,9 @@ class SpecialtyModuleController extends Controller
             'ophthalmology' => 'refraction',
             'physiotherapy' => 'assessment',
             'maternity' => 'history',
+            'radiology' => 'protocol',
+            'cardiology' => 'history',
+            'psychiatry' => 'history',
             default => (collect(array_keys($shellTabs))
                 ->first(fn (string $tab) => $clinical->recordTypeForTab($module, $tab) !== null)
                 ?? 'clinical_notes'),
@@ -510,6 +516,146 @@ class SpecialtyModuleController extends Controller
             }
         }
 
+        if ($module === 'radiology' && in_array($recordType, ['imaging_request', 'imaging_acquisition', 'imaging_report'], true)) {
+            $workflow = app(\App\Services\Care\Radiology\RadiologyWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'imaging_request' => $workflow->stageFromRequest($record->payload ?? []),
+                'imaging_acquisition' => $workflow->stageFromAcquisition($record->payload ?? []),
+                'imaging_report' => $workflow->stageFromReport($record->payload ?? []),
+                default => null,
+            };
+            $current = $visit->specialty_stage;
+            $early = ['check_in', 'waiting', 'request', null, ''];
+            $order = [
+                'check_in' => 0,
+                'protocol' => 1,
+                'acquisition' => 2,
+                'reporting' => 3,
+                'verified' => 4,
+                'completed' => 5,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'radiology',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'radiology',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
+        if ($module === 'cardiology' && in_array($recordType, ['cardio_history', 'cardiac_exam', 'cardio_investigation', 'cardio_plan'], true)) {
+            $workflow = app(\App\Services\Care\Cardiology\CardiologyWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'cardio_history' => $workflow->stageFromHistory($record->payload ?? []),
+                'cardiac_exam' => $workflow->stageFromExam($record->payload ?? []),
+                'cardio_investigation' => $workflow->stageFromInvestigation($record->payload ?? []),
+                'cardio_plan' => $workflow->stageFromPlan($record->payload ?? []),
+                default => null,
+            };
+            $current = $visit->specialty_stage;
+            $early = ['check_in', 'waiting', null, ''];
+            $order = [
+                'check_in' => 0,
+                'history' => 1,
+                'exam' => 2,
+                'investigation' => 3,
+                'plan' => 4,
+                'procedure' => 5,
+                'completed' => 6,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'cardiology',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'cardiology',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
+        if ($module === 'psychiatry' && in_array($recordType, ['mental_status', 'risk_assessment', 'psych_plan'], true)) {
+            $workflow = app(\App\Services\Care\Psychiatry\PsychiatryWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'mental_status' => $workflow->stageFromHistory($record->payload ?? []),
+                'risk_assessment' => $workflow->stageFromRisk($record->payload ?? []),
+                'psych_plan' => $workflow->stageFromFormulation($record->payload ?? []),
+                default => null,
+            };
+            $current = $visit->specialty_stage;
+            $early = ['check_in', 'waiting', null, ''];
+            $order = [
+                'check_in' => 0,
+                'history' => 1,
+                'risk' => 2,
+                'formulation' => 3,
+                'review' => 4,
+                'completed' => 5,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'psychiatry',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage(
+                        $organization,
+                        $visit,
+                        'psychiatry',
+                        $suggested,
+                        $this->ownerRef($request),
+                        $this->ownerRef($request),
+                    );
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
         return redirect()
             ->route('care.specialty.workspace', [
                 'module' => $module,
@@ -926,6 +1072,25 @@ class SpecialtyModuleController extends Controller
         $maternityPostnatal = null;
         $maternityStageCodes = [];
         $maternityStageFlow = [];
+        $radiologyRequest = null;
+        $radiologyAcquisition = null;
+        $radiologyReport = null;
+        $radiologyVerification = null;
+        $radiologyStageCodes = [];
+        $radiologyStageFlow = [];
+        $cardiologyHistory = null;
+        $cardiologyExam = null;
+        $cardiologyInvestigation = null;
+        $cardiologyPlan = null;
+        $cardiologyProcedure = null;
+        $cardiologyStageCodes = [];
+        $cardiologyStageFlow = [];
+        $psychiatryHistory = null;
+        $psychiatryRisk = null;
+        $psychiatryPlan = null;
+        $psychiatryFollowup = null;
+        $psychiatryStageCodes = [];
+        $psychiatryStageFlow = [];
         $activeTab = (string) $request->query('tab', array_key_first($shell->workspaceTabs($module)) ?: 'overview');
         $clinical = app(SpecialtyClinicalRecordService::class);
 
@@ -1062,6 +1227,34 @@ class SpecialtyModuleController extends Controller
                 $maternityStageFlow = app(\App\Services\Care\Maternity\MaternityWorkflowService::class)->stageFlow();
             }
 
+            if ($module === 'radiology') {
+                $radiologyRequest = $clinical->findForVisit($workspaceVisit, 'radiology', 'imaging_request');
+                $radiologyAcquisition = $clinical->findForVisit($workspaceVisit, 'radiology', 'imaging_acquisition');
+                $radiologyReport = $clinical->findForVisit($workspaceVisit, 'radiology', 'imaging_report');
+                $radiologyVerification = $clinical->findForVisit($workspaceVisit, 'radiology', 'imaging_verification');
+                $radiologyStageCodes = collect($shell->stages('radiology'))->pluck('code')->all();
+                $radiologyStageFlow = app(\App\Services\Care\Radiology\RadiologyWorkflowService::class)->stageFlow();
+            }
+
+            if ($module === 'cardiology') {
+                $cardiologyHistory = $clinical->findForVisit($workspaceVisit, 'cardiology', 'cardio_history');
+                $cardiologyExam = $clinical->findForVisit($workspaceVisit, 'cardiology', 'cardiac_exam');
+                $cardiologyInvestigation = $clinical->findForVisit($workspaceVisit, 'cardiology', 'cardio_investigation');
+                $cardiologyPlan = $clinical->findForVisit($workspaceVisit, 'cardiology', 'cardio_plan');
+                $cardiologyProcedure = $clinical->findForVisit($workspaceVisit, 'cardiology', 'cardio_procedure');
+                $cardiologyStageCodes = collect($shell->stages('cardiology'))->pluck('code')->all();
+                $cardiologyStageFlow = app(\App\Services\Care\Cardiology\CardiologyWorkflowService::class)->stageFlow();
+            }
+
+            if ($module === 'psychiatry') {
+                $psychiatryHistory = $clinical->findForVisit($workspaceVisit, 'psychiatry', 'mental_status');
+                $psychiatryRisk = $clinical->findForVisit($workspaceVisit, 'psychiatry', 'risk_assessment');
+                $psychiatryPlan = $clinical->findForVisit($workspaceVisit, 'psychiatry', 'psych_plan');
+                $psychiatryFollowup = $clinical->findForVisit($workspaceVisit, 'psychiatry', 'psych_followup');
+                $psychiatryStageCodes = collect($shell->stages('psychiatry'))->pluck('code')->all();
+                $psychiatryStageFlow = app(\App\Services\Care\Psychiatry\PsychiatryWorkflowService::class)->stageFlow();
+            }
+
             if ($patientHeader !== null) {
                 $patientHeader['clinical_alerts'] = $clinicalAlerts;
             }
@@ -1170,6 +1363,25 @@ class SpecialtyModuleController extends Controller
             'maternityPostnatal' => $maternityPostnatal,
             'maternityStageCodes' => $maternityStageCodes,
             'maternityStageFlow' => $maternityStageFlow,
+            'radiologyRequest' => $radiologyRequest,
+            'radiologyAcquisition' => $radiologyAcquisition,
+            'radiologyReport' => $radiologyReport,
+            'radiologyVerification' => $radiologyVerification,
+            'radiologyStageCodes' => $radiologyStageCodes,
+            'radiologyStageFlow' => $radiologyStageFlow,
+            'cardiologyHistory' => $cardiologyHistory,
+            'cardiologyExam' => $cardiologyExam,
+            'cardiologyInvestigation' => $cardiologyInvestigation,
+            'cardiologyPlan' => $cardiologyPlan,
+            'cardiologyProcedure' => $cardiologyProcedure,
+            'cardiologyStageCodes' => $cardiologyStageCodes,
+            'cardiologyStageFlow' => $cardiologyStageFlow,
+            'psychiatryHistory' => $psychiatryHistory,
+            'psychiatryRisk' => $psychiatryRisk,
+            'psychiatryPlan' => $psychiatryPlan,
+            'psychiatryFollowup' => $psychiatryFollowup,
+            'psychiatryStageCodes' => $psychiatryStageCodes,
+            'psychiatryStageFlow' => $psychiatryStageFlow,
             'queueStubs' => $modules->queueStubsFor($organization, $module),
             'branchId' => $branchId,
             'branchLabel' => $branchLabel,