From e539438071a14b1fc50adbdeca57b4ef8d818acb Mon Sep 17 00:00:00 2001
From: isaacclad <sense.corporate@gmail.com>
Date: Mon, 20 Jul 2026 18:26:58 +0000
Subject: [PATCH] Wire Notes links to pre-select the visit on the form.

Station and patient chart pass visit id; the notes page selects that patient in the visit dropdown.

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .../Care/NursingDocumentationController.php           | 11 +++++++++--
 resources/views/care/nursing/notes.blade.php          |  2 +-
 resources/views/care/nursing/station.blade.php        |  2 +-
 resources/views/care/patients/show.blade.php          |  2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Care/NursingDocumentationController.php b/app/Http/Controllers/Care/NursingDocumentationController.php
index 067046e..884dcbb 100644
--- a/app/Http/Controllers/Care/NursingDocumentationController.php
+++ b/app/Http/Controllers/Care/NursingDocumentationController.php
@@ -25,10 +25,17 @@ class NursingDocumentationController extends Controller
         $this->authorizeOwner($request, $careUnit);
         abort_unless((int) $careUnit->organization_id === (int) $this->organization($request)->id, 404);
 
+        $placedVisits = $census->visitsForUnit($careUnit, $this->ownerRef($request));
+        $selectedVisitId = (int) $request->query('visit', 0);
+        if ($selectedVisitId && ! $placedVisits->contains('id', $selectedVisitId)) {
+            $selectedVisitId = 0;
+        }
+
         return view('care.nursing.notes', [
             'unit' => $careUnit->load('department.branch'),
             'notes' => $docs->notesForUnit($careUnit, $this->ownerRef($request)),
-            'placedVisits' => $census->visitsForUnit($careUnit, $this->ownerRef($request)),
+            'placedVisits' => $placedVisits,
+            'selectedVisitId' => $selectedVisitId ?: (int) old('visit_id', 0),
             'canWrite' => app(CarePermissions::class)->can($this->member($request), 'nursing.notes.manage'),
             'noteTypes' => config('care.nursing_note_types'),
             'shiftCodes' => config('care.staff_shift_codes'),
@@ -65,7 +72,7 @@ class NursingDocumentationController extends Controller
         );
 
         return redirect()
-            ->route('care.care-units.notes', $careUnit)
+            ->route('care.care-units.notes', [$careUnit, 'visit' => $visit->id])
             ->with('success', 'Nursing note saved.');
     }
 
diff --git a/resources/views/care/nursing/notes.blade.php b/resources/views/care/nursing/notes.blade.php
index d26e3fd..5ed59cc 100644
--- a/resources/views/care/nursing/notes.blade.php
+++ b/resources/views/care/nursing/notes.blade.php
@@ -19,7 +19,7 @@
                         <select name="visit_id" required class="mt-1 w-full rounded-lg border-slate-300 text-sm">
                             <option value="">Select…</option>
                             @foreach ($placedVisits as $visit)
-                                <option value="{{ $visit->id }}">
+                                <option value="{{ $visit->id }}" @selected((int) ($selectedVisitId ?? 0) === (int) $visit->id)>
                                     {{ $visit->patient?->fullName() }}
                                     @if ($visit->bed) · {{ $visit->bed->label }} @endif
                                 </option>
diff --git a/resources/views/care/nursing/station.blade.php b/resources/views/care/nursing/station.blade.php
index c4c1dfd..60a64b1 100644
--- a/resources/views/care/nursing/station.blade.php
+++ b/resources/views/care/nursing/station.blade.php
@@ -128,7 +128,7 @@
                                             <a href="{{ route('care.care-units.assessments', $unit) }}#visit-{{ $visit->id }}" class="mr-3 text-slate-600 hover:text-slate-900">Vitals</a>
                                         @endif
                                         @if ($canNotes)
-                                            <a href="{{ route('care.care-units.notes', $unit) }}" class="text-slate-600 hover:text-slate-900">Notes</a>
+                                            <a href="{{ route('care.care-units.notes', [$unit, 'visit' => $visit->id]) }}" class="text-slate-600 hover:text-slate-900">Notes</a>
                                         @endif
                                     </td>
                                 </tr>
diff --git a/resources/views/care/patients/show.blade.php b/resources/views/care/patients/show.blade.php
index 5465176..482d9c9 100644
--- a/resources/views/care/patients/show.blade.php
+++ b/resources/views/care/patients/show.blade.php
@@ -135,7 +135,7 @@
                                     @endif
                                     @if ($activePlacedVisit->careUnit)
                                         <a href="{{ route('care.care-units.assessments', $activePlacedVisit->careUnit) }}" class="text-sm font-medium text-teal-700 hover:text-teal-900">Vitals &amp; assess</a>
-                                        <a href="{{ route('care.care-units.notes', $activePlacedVisit->careUnit) }}" class="text-sm font-medium text-teal-700 hover:text-teal-900">Nursing notes</a>
+                                        <a href="{{ route('care.care-units.notes', [$activePlacedVisit->careUnit, 'visit' => $activePlacedVisit->id]) }}" class="text-sm font-medium text-teal-700 hover:text-teal-900">Nursing notes</a>
                                     @endif
                                 </p>
                             </div>