Add full Oncology, Renal Care, and Surgery specialty clinical suites.

Match Pediatrics/ENT depth with stages, workspace tabs, clinical records, reports/print, demo seed, and suite tests.

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

app/Http/Controllers/Care/OncologyWorkspaceController.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\Oncology\OncologyAnalyticsService;
+use App\Services\Care\Oncology\OncologyWorkflowService;
+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 OncologyWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertOncologyAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'oncology'), 403);
+    }
+
+    protected function assertOncologyManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'oncology'), 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->assertOncologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'oncology',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'oncology',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('oncology', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function saveTreatment(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        OncologyWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertOncologyManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('oncology', 'onc_treatment') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'treatment']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('oncology', 'onc_treatment')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'oncology',
+            'onc_treatment',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            OncologyWorkflowService::STAGE_TREATMENT,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'oncology',
+                OncologyWorkflowService::STAGE_TREATMENT,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'oncology',
+                    OncologyWorkflowService::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' => 'oncology', 'visit' => $visit, 'tab' => 'treatment'])
+            ->with('success', 'Oncology treatment saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        OncologyAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertOncologyAccess($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.oncology.reports', [
+            'moduleKey' => 'oncology',
+            'definition' => $modules->definition('oncology'),
+            'shellNav' => $shell->navItems('oncology'),
+            '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->assertOncologyAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.oncology.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'history' => $clinical->findForVisit($visit, 'oncology', 'onc_history'),
+            'staging' => $clinical->findForVisit($visit, 'oncology', 'onc_staging'),
+            'investigation' => $clinical->findForVisit($visit, 'oncology', 'onc_investigation'),
+            'plan' => $clinical->findForVisit($visit, 'oncology', 'onc_plan'),
+            'treatment' => $clinical->findForVisit($visit, 'oncology', 'onc_treatment'),
+        ]);
+    }
+}

app/Http/Controllers/Care/RenalWorkspaceController.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\Renal\RenalAnalyticsService;
+use App\Services\Care\Renal\RenalWorkflowService;
+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 RenalWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertRenalAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'renal'), 403);
+    }
+
+    protected function assertRenalManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'renal'), 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->assertRenalManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'renal',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'renal',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('renal', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function savePlan(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        RenalWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertRenalManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('renal', 'renal_plan') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'plan']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('renal', 'renal_plan')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'renal',
+            'renal_plan',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            RenalWorkflowService::STAGE_PLAN,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'renal',
+                RenalWorkflowService::STAGE_PLAN,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'renal',
+                    RenalWorkflowService::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' => 'renal', 'visit' => $visit, 'tab' => 'plan'])
+            ->with('success', 'Renal care plan saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        RenalAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertRenalAccess($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.renal.reports', [
+            'moduleKey' => 'renal',
+            'definition' => $modules->definition('renal'),
+            'shellNav' => $shell->navItems('renal'),
+            '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->assertRenalAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.renal.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'history' => $clinical->findForVisit($visit, 'renal', 'renal_history'),
+            'exam' => $clinical->findForVisit($visit, 'renal', 'renal_exam'),
+            'dialysis' => $clinical->findForVisit($visit, 'renal', 'renal_session'),
+            'plan' => $clinical->findForVisit($visit, 'renal', 'renal_plan'),
+        ]);
+    }
+}

app/Http/Controllers/Care/SpecialtyModuleController.php

@@ -162,6 +162,9 @@ class SpecialtyModuleController extends Controller
                 'pediatrics' => 'history',
                 'orthopedics' => 'history',
                 'ent' => 'history',
+                'oncology' => 'history',
+                'renal' => 'history',
+                'surgery' => 'history',
                 default => (collect(array_keys($shellTabs))
                     ->first(fn (string $tab) => $clinical->recordTypeForTab($module, $tab) !== null)
                     ?? 'clinical_notes'),
@@ -242,6 +245,9 @@ class SpecialtyModuleController extends Controller
             'pediatrics' => 'history',
             'orthopedics' => 'history',
             'ent' => 'history',
+            'oncology' => 'history',
+            'renal' => 'history',
+            'surgery' => 'history',
             default => (collect(array_keys($shellTabs))
                 ->first(fn (string $tab) => $clinical->recordTypeForTab($module, $tab) !== null)
                 ?? 'clinical_notes'),
@@ -806,6 +812,109 @@ class SpecialtyModuleController extends Controller
             }
         }
 
+
+        if ($module === 'oncology' && in_array($recordType, ['onc_history', 'onc_staging', 'onc_investigation', 'onc_plan'], true)) {
+            $workflow = app(\App\Services\Care\Oncology\OncologyWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'onc_history' => $workflow->stageFromHistory($record->payload ?? []),
+                'onc_staging' => $workflow->stageFromStaging($record->payload ?? []),
+                'onc_investigation' => $workflow->stageFromInvestigation($record->payload ?? []),
+                'onc_plan' => $workflow->stageFromPlan($record->payload ?? []),
+                default => null,
+            };
+            $current = $visit->specialty_stage;
+            $early = ['check_in', 'waiting', null, ''];
+            $order = [
+                'check_in' => 0,
+                'history' => 1,
+                'staging' => 2,
+                'investigation' => 3,
+                'plan' => 4,
+                'treatment' => 5,
+                'completed' => 6,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage($organization, $visit, 'oncology', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage($organization, $visit, 'oncology', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
+        if ($module === 'renal' && in_array($recordType, ['renal_history', 'renal_exam', 'renal_session'], true)) {
+            $workflow = app(\App\Services\Care\Renal\RenalWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'renal_history' => $workflow->stageFromHistory($record->payload ?? []),
+                'renal_exam' => $workflow->stageFromExam($record->payload ?? []),
+                'renal_session' => $workflow->stageFromDialysis($record->payload ?? []),
+                default => null,
+            };
+            $current = $visit->specialty_stage;
+            $early = ['check_in', 'waiting', null, ''];
+            $order = [
+                'check_in' => 0,
+                'history' => 1,
+                'exam' => 2,
+                'dialysis' => 3,
+                'plan' => 4,
+                'completed' => 5,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage($organization, $visit, 'renal', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage($organization, $visit, 'renal', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
+        if ($module === 'surgery' && in_array($recordType, ['surg_history', 'surg_exam', 'surg_investigation', 'surg_plan', 'surg_procedure'], true)) {
+            $workflow = app(\App\Services\Care\Surgery\SurgeryWorkflowService::class);
+            $stageService = app(\App\Services\Care\SpecialtyVisitStageService::class);
+            $suggested = match ($recordType) {
+                'surg_history' => $workflow->stageFromHistory($record->payload ?? []),
+                'surg_exam' => $workflow->stageFromExam($record->payload ?? []),
+                'surg_investigation' => $workflow->stageFromInvestigation($record->payload ?? []),
+                'surg_plan' => $workflow->stageFromPlan($record->payload ?? []),
+                'surg_procedure' => $workflow->stageFromProcedure($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,
+                'postop' => 6,
+                'completed' => 7,
+            ];
+            if ($suggested && (! $current || in_array($current, $early, true))) {
+                try {
+                    $stageService->setStage($organization, $visit, 'surgery', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            } elseif ($suggested && $suggested !== $current && ($order[$suggested] ?? 0) > ($order[$current] ?? 0)) {
+                try {
+                    $stageService->setStage($organization, $visit, 'surgery', $suggested, $this->ownerRef($request), $this->ownerRef($request));
+                } catch (\InvalidArgumentException) {
+                }
+            }
+        }
+
         return redirect()
             ->route('care.specialty.workspace', [
                 'module' => $module,
@@ -1262,6 +1371,27 @@ class SpecialtyModuleController extends Controller
         $entProcedure = null;
         $entStageCodes = [];
         $entStageFlow = [];
+        $oncologyHistory = null;
+        $oncologyStaging = null;
+        $oncologyInvestigation = null;
+        $oncologyPlan = null;
+        $oncologyTreatment = null;
+        $oncologyStageCodes = [];
+        $oncologyStageFlow = [];
+        $renalHistory = null;
+        $renalExam = null;
+        $renalDialysis = null;
+        $renalPlan = null;
+        $renalStageCodes = [];
+        $renalStageFlow = [];
+        $surgeryHistory = null;
+        $surgeryExam = null;
+        $surgeryInvestigation = null;
+        $surgeryPlan = null;
+        $surgeryProcedure = null;
+        $surgeryPostop = null;
+        $surgeryStageCodes = [];
+        $surgeryStageFlow = [];
         $activeTab = (string) $request->query('tab', array_key_first($shell->workspaceTabs($module)) ?: 'overview');
         $clinical = app(SpecialtyClinicalRecordService::class);
 
@@ -1456,6 +1586,36 @@ class SpecialtyModuleController extends Controller
                 $entStageFlow = app(\App\Services\Care\Ent\EntWorkflowService::class)->stageFlow();
             }
 
+            if ($module === 'oncology') {
+                $oncologyHistory = $clinical->findForVisit($workspaceVisit, 'oncology', 'onc_history');
+                $oncologyStaging = $clinical->findForVisit($workspaceVisit, 'oncology', 'onc_staging');
+                $oncologyInvestigation = $clinical->findForVisit($workspaceVisit, 'oncology', 'onc_investigation');
+                $oncologyPlan = $clinical->findForVisit($workspaceVisit, 'oncology', 'onc_plan');
+                $oncologyTreatment = $clinical->findForVisit($workspaceVisit, 'oncology', 'onc_treatment');
+                $oncologyStageCodes = collect($shell->stages('oncology'))->pluck('code')->all();
+                $oncologyStageFlow = app(\App\Services\Care\Oncology\OncologyWorkflowService::class)->stageFlow();
+            }
+
+            if ($module === 'renal') {
+                $renalHistory = $clinical->findForVisit($workspaceVisit, 'renal', 'renal_history');
+                $renalExam = $clinical->findForVisit($workspaceVisit, 'renal', 'renal_exam');
+                $renalDialysis = $clinical->findForVisit($workspaceVisit, 'renal', 'renal_session');
+                $renalPlan = $clinical->findForVisit($workspaceVisit, 'renal', 'renal_plan');
+                $renalStageCodes = collect($shell->stages('renal'))->pluck('code')->all();
+                $renalStageFlow = app(\App\Services\Care\Renal\RenalWorkflowService::class)->stageFlow();
+            }
+
+            if ($module === 'surgery') {
+                $surgeryHistory = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_history');
+                $surgeryExam = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_exam');
+                $surgeryInvestigation = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_investigation');
+                $surgeryPlan = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_plan');
+                $surgeryProcedure = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_procedure');
+                $surgeryPostop = $clinical->findForVisit($workspaceVisit, 'surgery', 'surg_postop');
+                $surgeryStageCodes = collect($shell->stages('surgery'))->pluck('code')->all();
+                $surgeryStageFlow = app(\App\Services\Care\Surgery\SurgeryWorkflowService::class)->stageFlow();
+            }
+
             if ($patientHeader !== null) {
                 $patientHeader['clinical_alerts'] = $clinicalAlerts;
             }
@@ -1604,6 +1764,27 @@ class SpecialtyModuleController extends Controller
             'entProcedure' => $entProcedure,
             'entStageCodes' => $entStageCodes,
             'entStageFlow' => $entStageFlow,
+            'oncologyHistory' => $oncologyHistory,
+            'oncologyStaging' => $oncologyStaging,
+            'oncologyInvestigation' => $oncologyInvestigation,
+            'oncologyPlan' => $oncologyPlan,
+            'oncologyTreatment' => $oncologyTreatment,
+            'oncologyStageCodes' => $oncologyStageCodes,
+            'oncologyStageFlow' => $oncologyStageFlow,
+            'renalHistory' => $renalHistory,
+            'renalExam' => $renalExam,
+            'renalDialysis' => $renalDialysis,
+            'renalPlan' => $renalPlan,
+            'renalStageCodes' => $renalStageCodes,
+            'renalStageFlow' => $renalStageFlow,
+            'surgeryHistory' => $surgeryHistory,
+            'surgeryExam' => $surgeryExam,
+            'surgeryInvestigation' => $surgeryInvestigation,
+            'surgeryPlan' => $surgeryPlan,
+            'surgeryProcedure' => $surgeryProcedure,
+            'surgeryPostop' => $surgeryPostop,
+            'surgeryStageCodes' => $surgeryStageCodes,
+            'surgeryStageFlow' => $surgeryStageFlow,
             'queueStubs' => $modules->queueStubsFor($organization, $module),
             'branchId' => $branchId,
             'branchLabel' => $branchLabel,

app/Http/Controllers/Care/SurgeryWorkspaceController.php

@@ -0,0 +1,216 @@
+<?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\SpecialtyClinicalRecordService;
+use App\Services\Care\SpecialtyModuleService;
+use App\Services\Care\SpecialtyShellService;
+use App\Services\Care\SpecialtyVisitStageService;
+use App\Services\Care\Surgery\SurgeryAnalyticsService;
+use App\Services\Care\Surgery\SurgeryWorkflowService;
+use Illuminate\Http\RedirectResponse;
+use Illuminate\Http\Request;
+use Illuminate\View\View;
+
+class SurgeryWorkspaceController extends Controller
+{
+    use ScopesToAccount;
+
+    protected function assertSurgeryAccess(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanAccess($organization, $this->member($request), 'surgery'), 403);
+    }
+
+    protected function assertSurgeryManage(Request $request, SpecialtyModuleService $modules): void
+    {
+        $organization = $this->organization($request);
+        abort_unless($modules->memberCanManage($organization, $this->member($request), 'surgery'), 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->assertSurgeryManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $validated = $request->validate([
+            'stage' => ['required', 'string', 'max:32'],
+        ]);
+
+        try {
+            $stages->setStage(
+                $this->organization($request),
+                $visit,
+                'surgery',
+                $validated['stage'],
+                $this->ownerRef($request),
+                $this->actorRef($request),
+            );
+        } catch (\InvalidArgumentException $e) {
+            return back()->with('error', $e->getMessage());
+        }
+
+        return redirect()
+            ->route('care.specialty.workspace', [
+                'module' => 'surgery',
+                'visit' => $visit,
+                'tab' => $shell->workspaceTabForStage('surgery', $validated['stage']),
+            ])
+            ->with('success', 'Visit stage updated.');
+    }
+
+    public function savePostop(
+        Request $request,
+        Visit $visit,
+        SpecialtyModuleService $modules,
+        SpecialtyClinicalRecordService $clinical,
+        SpecialtyVisitStageService $stages,
+        SurgeryWorkflowService $workflow,
+    ): RedirectResponse {
+        $this->authorizeAbility($request, 'consultations.manage');
+        $this->assertSurgeryManage($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $organization = $this->organization($request);
+        $owner = $this->ownerRef($request);
+
+        $payload = (array) $request->input('payload', []);
+        foreach ($clinical->fieldsFor('surgery', 'surg_postop') as $field) {
+            if (($field['type'] ?? '') === 'boolean') {
+                $payload[$field['name']] = $request->boolean('payload.'.$field['name']);
+            }
+        }
+        $request->merge(['payload' => $payload, 'tab' => 'postop']);
+
+        $validated = $request->validate(array_merge([
+            'tab' => ['required', 'string'],
+        ], $clinical->validationRules('surgery', 'surg_postop')));
+
+        $record = $clinical->upsert(
+            $organization,
+            $visit,
+            'surgery',
+            'surg_postop',
+            $clinical->payloadFromRequest($validated),
+            $owner,
+            $owner,
+            SurgeryWorkflowService::STAGE_POSTOP,
+            SpecialtyClinicalRecord::STATUS_COMPLETED,
+        );
+
+        try {
+            $stages->setStage(
+                $organization,
+                $visit,
+                'surgery',
+                SurgeryWorkflowService::STAGE_POSTOP,
+                $owner,
+                $owner,
+            );
+        } catch (\InvalidArgumentException) {
+        }
+
+        if ($workflow->shouldCompleteVisit($record->payload ?? [])) {
+            try {
+                $stages->setStage(
+                    $organization,
+                    $visit,
+                    'surgery',
+                    SurgeryWorkflowService::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' => 'surgery', 'visit' => $visit, 'tab' => 'postop'])
+            ->with('success', 'Post-op note saved.');
+    }
+
+    public function reports(
+        Request $request,
+        SpecialtyModuleService $modules,
+        SpecialtyShellService $shell,
+        SurgeryAnalyticsService $analytics,
+    ): View {
+        $this->authorizeAbility($request, 'consultations.view');
+        $this->assertSurgeryAccess($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.surgery.reports', [
+            'moduleKey' => 'surgery',
+            'definition' => $modules->definition('surgery'),
+            'shellNav' => $shell->navItems('surgery'),
+            '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->assertSurgeryAccess($request, $modules);
+        $this->assertVisit($request, $visit);
+
+        $visit->loadMissing(['patient', 'appointment.practitioner', 'branch']);
+
+        return view('care.specialty.surgery.print', [
+            'visit' => $visit,
+            'patient' => $visit->patient,
+            'history' => $clinical->findForVisit($visit, 'surgery', 'surg_history'),
+            'exam' => $clinical->findForVisit($visit, 'surgery', 'surg_exam'),
+            'investigation' => $clinical->findForVisit($visit, 'surgery', 'surg_investigation'),
+            'plan' => $clinical->findForVisit($visit, 'surgery', 'surg_plan'),
+            'procedure' => $clinical->findForVisit($visit, 'surgery', 'surg_procedure'),
+            'postop' => $clinical->findForVisit($visit, 'surgery', 'surg_postop'),
+        ]);
+    }
+}