Merge pull request #6339 from NHSDigital/follow-up-nurse-facing

murugapl · web-flow · commit 3e1bceb5efa1 · 2026-03-30T10:52:04.000+01:00
Handle `follow_up_requested` as a distinct consent status
diff --git a/app/components/app_activity_log_component.rb b/app/components/app_activity_log_component.rb
@@ -216,19 +216,34 @@ def consent_events
     consents.flat_map do |consent|
       events = []
 
-      original_response = consent.withdrawn? ? "given" : consent.response
+      original_response =
+        if consent.withdrawn?
+          "given"
+        elsif consent.follow_up_requested?
+          "follow_up_requested"
+        else
+          consent.response
+        end
+      human_response = Consent.human_enum_name(:response, original_response)
+
+      title =
+        if original_response == "not_provided"
+          "Consent not provided"
+        else
+          human_response
+        end
 
       events << if (consent_form = consent.consent_form)
         {
-          title: "Consent #{original_response}",
+          title:,
           at: consent_form.recorded_at,
           by: consent_form.parent_relationship.label_with_parent,
           programmes: [consent.programme]
         }
       else
         {
           title:
-            "Consent #{original_response} by #{consent.name} (#{consent.who_responded.downcase_first})",
+            "#{title} by #{consent.name} (#{consent.who_responded.downcase_first})",
           at: consent.submitted_at,
           by: consent.recorded_by,
           programmes: [consent.programme]
diff --git a/app/components/app_patient_session_consent_component.html.erb b/app/components/app_patient_session_consent_component.html.erb
@@ -13,6 +13,8 @@
       <% end %>
     <% elsif consent_status_value == :conflicts %>
       <p>You can only vaccinate if all respondents give consent.</p>
+    <% elsif consent_status_value == :follow_up_requested %>
+      <p><%= who_refused %> would like to speak to a member of the team about other options for their child's vaccination.</p>
     <% elsif consent_status_value == :refused %>
       <p><%= who_refused %> refused to give consent.</p>
     <% elsif consent_status_generator.status == :given %>
diff --git a/app/helpers/consents_helper.rb b/app/helpers/consents_helper.rb
@@ -54,6 +54,8 @@ def consent_response_tag(consent)
     text =
       if consent.withdrawn?
         Consent.human_enum_name(:response, :given)
+      elsif consent.try(:refusal_with_follow_up?)
+        Consent.human_enum_name(:response, :follow_up_requested)
       else
         consent.human_enum_name(:response)
       end
@@ -63,6 +65,8 @@ def consent_response_tag(consent)
         "grey"
       elsif consent.response_given?
         "green"
+      elsif consent.try(:refusal_with_follow_up?)
+        "orange"
       elsif consent.response_refused?
         "red"
       else
diff --git a/app/lib/status_generator/consent.rb b/app/lib/status_generator/consent.rb
@@ -24,6 +24,8 @@ def status
       :given
     elsif status_should_be_refused?
       :refused
+    elsif status_should_be_follow_up_requested?
+      :follow_up_requested
     elsif status_should_be_conflicts?
       :conflicts
     elsif status_should_be_no_response?
@@ -84,7 +86,18 @@ def conflicting_disease_types?
   def status_should_be_refused?
     return false if vaccinated?
 
-    latest_consents.any? && latest_consents.all?(&:response_refused?)
+    latest_consents.any? && latest_consents.all?(&:hard_refusal?)
+  end
+
+  def status_should_be_follow_up_requested?
+    return false if vaccinated?
+
+    # Follow-up is the outcome when there are no outright refusals and at least
+    # one consent has follow_up_requested — including the case where one parent
+    # has given consent and another has asked for a follow-up discussion,
+    # because that discussion could change the outcome to :given.
+    consents_for_status.any? && consents_for_status.none?(&:hard_refusal?) &&
+      consents_for_status.any?(&:refusal_with_follow_up?)
   end
 
   def status_should_be_conflicts?
@@ -93,10 +106,15 @@ def status_should_be_conflicts?
     consents_for_status =
       (self_consents.any? ? self_consents : parental_consents)
 
-    if consents_for_status.any?(&:response_refused?) &&
-         consents_for_status.any?(&:response_given?)
-      return true
-    end
+    has_given = consents_for_status.any?(&:response_given?)
+    has_hard_refusal = consents_for_status.any?(&:hard_refusal?)
+    has_follow_up = consents_for_status.any?(&:refusal_with_follow_up?)
+
+    return true if has_given && has_hard_refusal
+
+    # hard refusal + follow_up is a conflict: even if the follow-up
+    # resolves to given, the outstanding refusal remains unresolved
+    return true if has_hard_refusal && has_follow_up
 
     consents_for_status.any? && consents_for_status.all?(&:response_given?) &&
       (agreed_vaccine_methods.blank? || conflicting_disease_types?)
diff --git a/app/lib/status_generator/programme.rb b/app/lib/status_generator/programme.rb
@@ -102,7 +102,10 @@ def without_gelatine
     if not_eligible? ||
          triage_generator.status.in?(
            %i[required invite_to_clinic do_not_vaccinate]
-         ) || consent_status.in?(%i[no_response conflicts refused])
+         ) ||
+         consent_status.in?(
+           %i[no_response conflicts refused follow_up_requested]
+         )
       return nil
     end
 
@@ -113,7 +116,10 @@ def vaccine_methods
     if not_eligible? ||
          triage_generator.status.in?(
            %i[required invite_to_clinic do_not_vaccinate]
-         ) || consent_status.in?(%i[no_response conflicts refused])
+         ) ||
+         consent_status.in?(
+           %i[no_response conflicts refused follow_up_requested]
+         )
       return nil
     end
 
@@ -217,7 +223,7 @@ def should_be_has_refusal_consent_refused?
   end
 
   def should_be_needs_consent_follow_up_requested?
-    false # TODO: Implement this status.
+    consent_status == :follow_up_requested
   end
 
   def should_be_needs_consent_request_failed?
diff --git a/app/models/concerns/refusable.rb b/app/models/concerns/refusable.rb
@@ -32,6 +32,10 @@ module Refusable
               unless: :can_have_reason_for_refusal?
   end
 
+  def hard_refusal? = response_refused? && !follow_up_requested?
+
+  def refusal_with_follow_up? = response_refused? && follow_up_requested?
+
   def requires_reason_for_refusal?
     response_refused?
   end
diff --git a/app/models/patient/programme_status.rb b/app/models/patient/programme_status.rb
@@ -120,7 +120,14 @@ class Patient::ProgrammeStatus < ApplicationRecord
        validate: true
 
   enum :consent_status,
-       { no_response: 0, given: 1, refused: 2, conflicts: 3, not_required: 4 },
+       {
+         no_response: 0,
+         given: 1,
+         refused: 2,
+         conflicts: 3,
+         not_required: 4,
+         follow_up_requested: 5
+       },
        default: :no_response,
        prefix: :consent,
        validate: true
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -292,6 +292,7 @@ en:
           personal_choice: Personal choice
           will_be_vaccinated_elsewhere: Vaccine will be given elsewhere
         responses:
+          follow_up_requested: Follow-up requested
           given: Consent given
           given_injection: Consent given
           given_nasal: Consent given
diff --git a/config/locales/status.en.yml b/config/locales/status.en.yml
@@ -14,11 +14,13 @@ en:
         given_injection_without_gelatine: Consent given for gelatine-free injection
         given_injection_without_gelatine_flu: Consent given for injection
         given_nasal: Consent given for nasal spray
+        follow_up_requested: Follow-up requested
         no_response: No response
         not_required: No consent needed
         refused: Consent refused
       colour:
         conflicts: orange
+        follow_up_requested: orange
         given: green
         given_injection: green
         given_injection_without_gelatine: green
diff --git a/spec/components/app_activity_log_component_spec.rb b/spec/components/app_activity_log_component_spec.rb
@@ -526,6 +526,24 @@
                      programme: "HPV"
   end
 
+  describe "follow-up requested consent" do
+    before do
+      create(
+        :consent,
+        :follow_up_requested,
+        programme: programmes.first,
+        patient:,
+        parent: mum,
+        submitted_at: Time.zone.local(2025, 5, 30, 12)
+      )
+    end
+
+    include_examples "card",
+                     title: "Follow-up requested by Jane Doe (mum)",
+                     date: "30 May 2025 at 12:00pm",
+                     programme: "HPV"
+  end
+
   describe "gillick assessments" do
     let(:programmes) { [Programme.td_ipv] }
 
diff --git a/spec/factories/consents.rb b/spec/factories/consents.rb
@@ -139,11 +139,21 @@
     trait :refused do
       response { "refused" }
       reason_for_refusal { "personal_choice" }
+      follow_up_requested { false }
       health_answers { [] }
       notes { "Refused." }
       vaccine_methods { [] }
     end
 
+    trait :follow_up_requested do
+      response { "refused" }
+      reason_for_refusal { "personal_choice" }
+      follow_up_requested { true }
+      health_answers { [] }
+      notes { "" }
+      vaccine_methods { [] }
+    end
+
     trait :not_provided do
       response { "not_provided" }
       vaccine_methods { [] }
diff --git a/spec/helpers/consents_helper_spec.rb b/spec/helpers/consents_helper_spec.rb
@@ -10,6 +10,29 @@
     end
   end
 
+  describe "#consent_response_tag" do
+    subject(:tag_html) { helper.consent_response_tag(consent) }
+
+    context "with a follow_up_requested consent" do
+      let(:consent) { build(:consent, :follow_up_requested) }
+
+      it { should include("Follow-up requested") }
+      it { should include("nhsuk-tag--orange") }
+    end
+
+    context "with a given consent" do
+      let(:consent) { build(:consent) }
+
+      it { should include("nhsuk-tag--green") }
+    end
+
+    context "with a refused consent" do
+      let(:consent) { build(:consent, :refused) }
+
+      it { should include("nhsuk-tag--red") }
+    end
+  end
+
   describe "#refusal_reason_label" do
     context "consent record" do
       let(:consent) { build(:consent, programme:) }
diff --git a/spec/lib/status_generator/consent_spec.rb b/spec/lib/status_generator/consent_spec.rb
@@ -48,6 +48,12 @@
       it { should be(:refused) }
     end
 
+    context "with a follow_up_requested consent" do
+      before { create(:consent, :follow_up_requested, patient:, programme:) }
+
+      it { should be(:follow_up_requested) }
+    end
+
     context "with a given consent" do
       before { create(:consent, :given, patient:, programme:) }
 
@@ -69,6 +75,36 @@
       it { should be(:conflicts) }
     end
 
+    context "with a given and follow_up_requested consent from different parents" do
+      before do
+        create(:consent, :given, patient:, programme:)
+        create(
+          :consent,
+          :follow_up_requested,
+          patient:,
+          programme:,
+          parent: create(:parent)
+        )
+      end
+
+      it { should be(:follow_up_requested) }
+    end
+
+    context "with a refused and follow_up_requested consent from different parents" do
+      before do
+        create(:consent, :refused, patient:, programme:)
+        create(
+          :consent,
+          :follow_up_requested,
+          patient:,
+          programme:,
+          parent: create(:parent)
+        )
+      end
+
+      it { should be(:conflicts) }
+    end
+
     context "with two given consents with different methods" do
       before do
         create(
@@ -293,6 +329,12 @@
       it { should be_empty }
     end
 
+    context "with a follow_up_requested consent" do
+      before { create(:consent, :follow_up_requested, patient:, programme:) }
+
+      it { should be_empty }
+    end
+
     context "with an injection given consent" do
       before do
         create(
@@ -445,6 +487,12 @@
       it { should be_nil }
     end
 
+    context "with a follow_up_requested consent" do
+      before { create(:consent, :follow_up_requested, patient:, programme:) }
+
+      it { should be_nil }
+    end
+
     context "with a given consent" do
       before { create(:consent, :given, patient:, programme:) }
 
diff --git a/spec/lib/status_generator/programme_spec.rb b/spec/lib/status_generator/programme_spec.rb
@@ -336,6 +336,22 @@
     its(:without_gelatine) { should be_nil }
   end
 
+  context "when consent is follow_up_requested" do
+    let(:programme) { Programme.mmr }
+
+    before { create(:consent, :follow_up_requested, patient:, programme:) }
+
+    its(:consent_status) { should be(:follow_up_requested) }
+    its(:consent_vaccine_methods) { should be_empty }
+    its(:date) { should be_nil }
+    its(:disease_types) { should be_nil }
+    its(:dose_sequence) { should eq(1) }
+    its(:location_id) { should be_nil }
+    its(:status) { should be(:needs_consent_follow_up_requested) }
+    its(:vaccine_methods) { should be_nil }
+    its(:without_gelatine) { should be_nil }
+  end
+
   context "when consent is conflicting" do
     let(:programme) { Programme.mmr }
 
