diff --git a/resources/views/care/assessments/create.blade.php b/resources/views/care/assessments/create.blade.php index b7eb6a3..fb58420 100644 --- a/resources/views/care/assessments/create.blade.php +++ b/resources/views/care/assessments/create.blade.php @@ -9,7 +9,7 @@
@if ($templates->isEmpty()) -

No capturable assessment templates are available for your role. Ensure content packs are seeded and the assessments engine is enabled.

+

No forms are available for your role right now. Ask an administrator to confirm clinical forms are enabled in Settings.

@else
@csrf diff --git a/resources/views/care/consultations/show.blade.php b/resources/views/care/consultations/show.blade.php index ed4488f..51c2500 100644 --- a/resources/views/care/consultations/show.blade.php +++ b/resources/views/care/consultations/show.blade.php @@ -89,26 +89,25 @@ @endif @if ($canViewAssessments ?? false) - {{-- Layer 1: universal intake (structured overlay; does not replace free-text symptoms) --}} @if ($universalTemplate)
-

Universal intake

+

Patient history form

- Structured Layer 1 assessment (presenting complaint, social history, function). - Free-text Symptoms and Clinical notes below remain the narrative source of truth — they are not auto-copied either way. + Optional checklist for chief complaint, social history, and day-to-day function. + You can still write freely in Symptoms and Clinical notes below — the two are separate and do not overwrite each other.

@if ($universalAssessment) - {{ $universalAssessment->isDraft() ? 'Continue intake' : 'View intake' }} + {{ $universalAssessment->isDraft() ? 'Continue form' : 'View form' }} @elseif (($canCaptureUniversal ?? false) && ! $isCompleted) @csrf - + @endif
@@ -118,7 +117,7 @@ Status: {{ $assessmentStatuses[$universalAssessment->status] ?? $universalAssessment->status }} @if ($universalAssessment->consultation_id !== $consultation->id) - (from another visit — open to review) + (from an earlier visit — open to review) @endif

@php @@ -142,16 +141,15 @@ @endif @elseif (! ($canCaptureUniversal ?? false)) -

No universal intake for this patient yet.

+

No patient history form recorded yet.

@endif
@endif - {{-- Layer 2: pathways (suggest from persisted diagnoses; clinician confirms) --}}
-

Clinical pathways

- Manage pathways +

Condition pathways

+ View all
@if (($activePathways ?? collect())->isNotEmpty()) @@ -167,7 +165,7 @@ @if (($pathwayInstruments ?? collect())->isNotEmpty())
- Pathway instruments + Recommended forms
    @foreach ($pathwayInstruments as $instrument) @@ -176,8 +174,7 @@ {{ $instrument['template_name'] }} · {{ $instrument['pathway_name'] }} - · {{ $instrument['template_code'] }} - @if ($instrument['required']) · required @endif + @if ($instrument['required']) · recommended for this condition @endif @if ($instrument['assessment']?->score) @@ -187,7 +184,7 @@
@if ($instrument['pack_missing']) - Content pack not seeded + Form not available yet @elseif ($instrument['assessment']) {{ $assessmentStatuses[$instrument['assessment']->status] ?? $instrument['assessment']->status }} @@ -234,9 +231,9 @@ @else

@if ($consultation->diagnoses->isEmpty()) - Save diagnoses to see pathway suggestions. + Save diagnoses to see suggested condition pathways. @else - No pathway matches for saved diagnoses. + No matching condition pathways for the saved diagnoses. @endif

@endif @@ -244,8 +241,8 @@
@if (($consultationAssessments ?? collect())->isNotEmpty()) @@ -260,18 +257,18 @@ @endforeach @else -

No assessments linked to this consultation yet.

+

No extra forms started for this visit yet.

@endif @if (($canCaptureAssessment ?? false) && ! $isCompleted && ($startableTemplates ?? collect())->isNotEmpty())
@csrf
- +
@@ -328,10 +325,10 @@ @if ($canManage)
-

Clinical notes (narrative)

+

Clinical notes

@if ($canViewAssessments ?? false)

- Narrative source of truth for this encounter. Structured universal intake is a separate overlay above and is not auto-synced with these fields. + Free-text notes for this visit. The patient history form above is optional and will not replace what you write here.

@endif
@@ -390,7 +387,7 @@ @if ($canManage && ($canViewAssessments ?? false)) @endif Back to queue @@ -414,7 +411,7 @@ @if ($consultation->symptoms || $consultation->clinical_notes)
-

Clinical notes (narrative)

+

Clinical notes

@if ($consultation->symptoms)

Symptoms: {{ $consultation->symptoms }}

@endif @@ -427,7 +424,7 @@ @if (($canViewAssessments ?? false) && ($universalAssessment ?? null)?->isCompleted())
-

Universal intake (structured)

+

Patient history form

Open
diff --git a/resources/views/care/outcomes/index.blade.php b/resources/views/care/outcomes/index.blade.php index 5cdb57a..148a717 100644 --- a/resources/views/care/outcomes/index.blade.php +++ b/resources/views/care/outcomes/index.blade.php @@ -1,7 +1,7 @@
-

Longitudinal outcomes

+

Follow-up scores

{{ $patient->fullName() }}

{{ $patient->patient_number }} diff --git a/resources/views/care/pathways/index.blade.php b/resources/views/care/pathways/index.blade.php index b1030dc..cbc69ea 100644 --- a/resources/views/care/pathways/index.blade.php +++ b/resources/views/care/pathways/index.blade.php @@ -1,7 +1,7 @@

-

Clinical pathways

+

Condition pathways

{{ $patient->fullName() }}

{{ $patient->patient_number }} @@ -42,7 +42,7 @@ @if ($canManage && $catalog->isNotEmpty())

-

Activate pathway

+

Add a condition pathway

@csrf
diff --git a/resources/views/care/patients/index.blade.php b/resources/views/care/patients/index.blade.php index 6669bba..dcbc940 100644 --- a/resources/views/care/patients/index.blade.php +++ b/resources/views/care/patients/index.blade.php @@ -25,11 +25,11 @@ @if (request('focus') === 'assessments')
-

Clinical assessments

+

Clinical forms

- Open a patient chart for assessments, pathways, and outcomes — or start a visit from + Open a patient to review history forms and condition-specific scores, or start a visit from Queue - and use Universal intake / Clinical pathways on the consultation. + and use the patient history form and condition pathways on the consultation.

@endif diff --git a/resources/views/care/patients/show.blade.php b/resources/views/care/patients/show.blade.php index b982e10..a10cf42 100644 --- a/resources/views/care/patients/show.blade.php +++ b/resources/views/care/patients/show.blade.php @@ -148,7 +148,7 @@ $ccAnswer = $latestUniversalIntake->answers->first(fn ($a) => $a->question?->code === 'chief_complaint'); @endphp diff --git a/resources/views/care/reports/show.blade.php b/resources/views/care/reports/show.blade.php index d9674b1..9c8e47b 100644 --- a/resources/views/care/reports/show.blade.php +++ b/resources/views/care/reports/show.blade.php @@ -53,7 +53,7 @@
-

By template

+

By clinical form

diff --git a/resources/views/care/settings/edit.blade.php b/resources/views/care/settings/edit.blade.php index f88c9e5..0773077 100644 --- a/resources/views/care/settings/edit.blade.php +++ b/resources/views/care/settings/edit.blade.php @@ -89,16 +89,16 @@ @endif @if ($canManage) - + diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php index cb66099..bf38592 100644 --- a/resources/views/partials/sidebar.blade.php +++ b/resources/views/partials/sidebar.blade.php @@ -38,7 +38,7 @@ ); if ($assessmentsEngineOn && $permissions->can($member, 'assessments.view') && $permissions->can($member, 'patients.view')) { $nav[] = [ - 'name' => 'Assessments', + 'name' => 'Clinical forms', 'route' => route('care.patients.index', ['focus' => 'assessments']), 'active' => request()->routeIs('care.assessments.*') || request()->routeIs('care.pathways.*') diff --git a/tests/Feature/CareAssessmentExtrasTest.php b/tests/Feature/CareAssessmentExtrasTest.php index 162736b..c7bfd2c 100644 --- a/tests/Feature/CareAssessmentExtrasTest.php +++ b/tests/Feature/CareAssessmentExtrasTest.php @@ -93,7 +93,7 @@ class CareAssessmentExtrasTest extends TestCase ->get(route('care.reports.show', ['type' => 'assessments'])) ->assertOk() ->assertSee('Assessment analytics') - ->assertSee('By template') + ->assertSee('By clinical form') ->assertSee('mrs'); } diff --git a/tests/Feature/CarePathwayTest.php b/tests/Feature/CarePathwayTest.php index 3bef060..7ec4af5 100644 --- a/tests/Feature/CarePathwayTest.php +++ b/tests/Feature/CarePathwayTest.php @@ -248,7 +248,7 @@ class CarePathwayTest extends TestCase $this->actingAs($this->user) ->get(route('care.consultations.show', $consultation)) ->assertOk() - ->assertSee('Clinical pathways') + ->assertSee('Condition pathways') ->assertSee('Stroke') ->assertSee('keyword:'); } diff --git a/tests/Feature/CareStrokeMvpTest.php b/tests/Feature/CareStrokeMvpTest.php index 97b000d..7a4fc14 100644 --- a/tests/Feature/CareStrokeMvpTest.php +++ b/tests/Feature/CareStrokeMvpTest.php @@ -231,7 +231,7 @@ class CareStrokeMvpTest extends TestCase $this->actingAs($this->user) ->get(route('care.consultations.show', $consultation)) ->assertOk() - ->assertSee('Pathway instruments') + ->assertSee('Recommended forms') ->assertSee('NIH Stroke Scale') ->assertSee('Modified Rankin Scale') ->assertSee('Continue'); diff --git a/tests/Feature/CareUniversalIntakeTest.php b/tests/Feature/CareUniversalIntakeTest.php index 34af6aa..bffb9e6 100644 --- a/tests/Feature/CareUniversalIntakeTest.php +++ b/tests/Feature/CareUniversalIntakeTest.php @@ -143,9 +143,9 @@ class CareUniversalIntakeTest extends TestCase $this->actingAs($this->user) ->get(route('care.consultations.show', $consultation)) ->assertOk() - ->assertSee('Universal intake') - ->assertSee('narrative source of truth', false) - ->assertSee('Start universal intake'); + ->assertSee('Patient history form') + ->assertSee('do not overwrite each other', false) + ->assertSee('Start patient history form'); $this->actingAs($this->user) ->post(route('care.consultations.assessments.store', $consultation), [ @@ -182,7 +182,7 @@ class CareUniversalIntakeTest extends TestCase $this->actingAs($this->user) ->get(route('care.patients.show', $this->patient)) ->assertOk() - ->assertSee('Universal intake') + ->assertSee('Patient history form') ->assertSee('Severe headache for 2 days'); }