Include checked-in clinic visits on outpatient nursing boards.

OPD/service units list open department appointments without manual place; nursing actions soft-place the visit onto the unit. Inpatient wards stay placement-only.

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

app/Http/Controllers/Care/CareUnitController.php

@@ -9,6 +9,7 @@ use App\Models\Department;
 use App\Models\Visit;
 use App\Services\Care\AuditLogger;
 use App\Services\Care\CarePermissions;
+use App\Services\Care\CareUnitCensusService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Validation\Rule;
@@ -110,13 +111,8 @@ class CareUnitController extends Controller
 
         $careUnit->load(['department.branch', 'beds']);
 
-        $placedVisits = Visit::owned($this->ownerRef($request))
-            ->where('organization_id', $organization->id)
-            ->where('care_unit_id', $careUnit->id)
-            ->whereIn('status', [Visit::STATUS_OPEN, Visit::STATUS_IN_PROGRESS])
-            ->with(['patient', 'bed'])
-            ->orderBy('placed_at')
-            ->get();
+        $census = app(CareUnitCensusService::class);
+        $placedVisits = $census->visitsForUnit($careUnit, $this->ownerRef($request));
 
         $placeableVisits = Visit::owned($this->ownerRef($request))
             ->where('organization_id', $organization->id)
@@ -126,6 +122,7 @@ class CareUnitController extends Controller
                 $q->whereNull('care_unit_id')
                     ->orWhere('care_unit_id', '!=', $careUnit->id);
             })
+            ->whereNotIn('id', $placedVisits->pluck('id')->all() ?: [0])
             ->with(['patient', 'careUnit'])
             ->orderByDesc('checked_in_at')
             ->limit(50)
@@ -146,6 +143,7 @@ class CareUnitController extends Controller
             'placeableVisits' => $placeableVisits,
             'availableBeds' => $availableBeds,
             'canPlace' => $canPlace,
+            'isClinicUnit' => $census->isClinicUnit($careUnit),
         ]);
     }
 

app/Http/Controllers/Care/NursingAssessmentController.php

@@ -9,6 +9,7 @@ use App\Models\Visit;
 use App\Services\Care\AssessmentService;
 use App\Services\Care\CareFeatures;
 use App\Services\Care\CarePermissions;
+use App\Services\Care\CareUnitCensusService;
 use App\Services\Care\NursingAssessmentService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -50,13 +51,16 @@ class NursingAssessmentController extends Controller
         Visit $visit,
         AssessmentService $assessments,
         CareFeatures $features,
+        CareUnitCensusService $census,
     ): RedirectResponse {
         $this->authorizeAbility($request, 'nursing.assessments.manage');
         $this->authorizeOwner($request, $careUnit);
         $this->authorizeOwner($request, $visit);
-        abort_unless((int) $visit->care_unit_id === (int) $careUnit->id, 404);
+        abort_unless((int) $careUnit->organization_id === (int) $this->organization($request)->id, 404);
         abort_unless($features->enabled($this->organization($request), CareFeatures::ASSESSMENTS_ENGINE), 404);
 
+        $visit = $census->ensurePlaced($visit, $careUnit, $this->ownerRef($request), $this->actorRef($request));
+
         $features->ensureAssessmentCatalog();
 
         $validated = $request->validate([
@@ -84,11 +88,14 @@ class NursingAssessmentController extends Controller
         CareUnit $careUnit,
         Visit $visit,
         NursingAssessmentService $nursing,
+        CareUnitCensusService $census,
     ): RedirectResponse {
         $this->authorizeAbility($request, 'vitals.manage');
         $this->authorizeOwner($request, $careUnit);
         $this->authorizeOwner($request, $visit);
-        abort_unless((int) $visit->care_unit_id === (int) $careUnit->id, 404);
+        abort_unless((int) $careUnit->organization_id === (int) $this->organization($request)->id, 404);
+
+        $visit = $census->ensurePlaced($visit, $careUnit, $this->ownerRef($request), $this->actorRef($request));
 
         $validated = $request->validate([
             'bp_systolic' => ['nullable', 'integer', 'min:40', 'max:300'],

app/Http/Controllers/Care/NursingDocumentationController.php

@@ -8,6 +8,7 @@ use App\Models\CareUnit;
 use App\Models\Visit;
 use App\Models\WardHandover;
 use App\Services\Care\CarePermissions;
+use App\Services\Care\CareUnitCensusService;
 use App\Services\Care\NursingDocumentationService;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -18,30 +19,23 @@ class NursingDocumentationController extends Controller
 {
     use ScopesToAccount;
 
-    public function unitNotes(Request $request, CareUnit $careUnit, NursingDocumentationService $docs): View
+    public function unitNotes(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census): View
     {
         $this->authorizeAbility($request, 'nursing.notes.view');
         $this->authorizeOwner($request, $careUnit);
         abort_unless((int) $careUnit->organization_id === (int) $this->organization($request)->id, 404);
 
-        $placedVisits = Visit::owned($this->ownerRef($request))
-            ->where('care_unit_id', $careUnit->id)
-            ->whereIn('status', [Visit::STATUS_OPEN, Visit::STATUS_IN_PROGRESS])
-            ->with(['patient', 'bed'])
-            ->orderBy('placed_at')
-            ->get();
-
         return view('care.nursing.notes', [
             'unit' => $careUnit->load('department.branch'),
             'notes' => $docs->notesForUnit($careUnit, $this->ownerRef($request)),
-            'placedVisits' => $placedVisits,
+            'placedVisits' => $census->visitsForUnit($careUnit, $this->ownerRef($request)),
             'canWrite' => app(CarePermissions::class)->can($this->member($request), 'nursing.notes.manage'),
             'noteTypes' => config('care.nursing_note_types'),
             'shiftCodes' => config('care.staff_shift_codes'),
         ]);
     }
 
-    public function storeNote(Request $request, CareUnit $careUnit, NursingDocumentationService $docs): RedirectResponse
+    public function storeNote(Request $request, CareUnit $careUnit, NursingDocumentationService $docs, CareUnitCensusService $census): RedirectResponse
     {
         $this->authorizeAbility($request, 'nursing.notes.manage');
         $this->authorizeOwner($request, $careUnit);
@@ -58,6 +52,8 @@ class NursingDocumentationController extends Controller
             ->findOrFail($validated['visit_id']);
         $this->authorizeBranch($request, (int) $visit->branch_id);
 
+        $visit = $census->ensurePlaced($visit, $careUnit, $this->ownerRef($request), $this->actorRef($request));
+
         $docs->addNote(
             $visit,
             $this->ownerRef($request),