Merge pull request #3958 from nhsuk/record-vaccination-multiple-methods

thomasleese · web-flow · commit c992b530d3a7 · 2025-07-15T18:04:21.000+01:00
diff --git a/app/components/app_vaccinate_form_component.html.erb b/app/components/app_vaccinate_form_component.html.erb
@@ -65,26 +65,43 @@
 
       <% hint = "Pre-screening checks must be completed for vaccination to go ahead" %>
 
-      <%= f.govuk_radio_buttons_fieldset :administered, legend: nil do %>
-        <% if common_delivery_sites_options.length > 1 %>
-          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true do %>
-            <%= f.govuk_collection_radio_buttons :delivery_site,
-                                                 common_delivery_sites_options,
-                                                 :value,
-                                                 :label,
-                                                 legend: {
-                                                   text: "Where will the injection be given?",
-                                                   size: "s",
-                                                 } %>
+      <%= f.govuk_radio_buttons_fieldset :vaccine_method, legend: nil do %>
+        <% vaccine_methods.each_with_index do |vaccine_method, index| %>
+          <% if index == 1 %>
+            <%= f.govuk_radio_divider %>
+          <% end %>
+
+          <% label = if index.zero?
+                 "Yes"
+               else
+                 "No — but they can have the #{Vaccine.human_enum_name(:method_prefix, vaccine_method)} #{programme.name_in_sentence} instead"
+               end %>
+
+          <% options = common_delivery_site_options(vaccine_method) %>
+
+          <% if options.length > 1 %>
+            <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: label }, hint: { text: hint }, link_errors: index.zero? do %>
+              <%= f.govuk_collection_radio_buttons :delivery_site,
+                                                   options,
+                                                   :value,
+                                                   :label,
+                                                   legend: {
+                                                     text: "Where will the #{Vaccine.human_enum_name(:method, vaccine_method).downcase} be given?",
+                                                     size: "s",
+                                                   } %>
+            <% end %>
+          <% else %>
+            <%= f.govuk_radio_button :vaccine_method, vaccine_method, label: { text: label }, hint: { text: hint }, link_errors: index.zero? do %>
+              <%= f.hidden_field :delivery_site, value: options.first.value %>
+            <% end %>
+          <% end %>
+
+          <% if index.zero? %>
+            <%= f.govuk_radio_button :vaccine_method, "none", label: { text: "No" } %>
           <% end %>
-        <% else %>
-          <%= f.govuk_radio_button :administered, true, label: { text: "Yes" }, hint: { text: hint }, link_errors: true %>
-          <%= f.hidden_field :delivery_site, value: common_delivery_sites_options.first.value %>
         <% end %>
-        <%= f.govuk_radio_button :administered, false, label: { text: "No" } %>
       <% end %>
 
-      <%= f.hidden_field :delivery_method, value: delivery_method %>
       <%= f.hidden_field :dose_sequence, value: dose_sequence %>
       <%= f.hidden_field :programme_id, value: programme.id %>
 
diff --git a/app/components/app_vaccinate_form_component.rb b/app/components/app_vaccinate_form_component.rb
@@ -18,50 +18,41 @@ def url
     session_patient_programme_vaccinations_path(session, patient, programme)
   end
 
-  def delivery_method
-    if patient.approved_vaccine_methods(programme:).include?("nasal")
-      "nasal_spray"
-    else
-      "intramuscular"
-    end
+  def vaccine_methods
+    patient.approved_vaccine_methods(programme:)
   end
 
   def dose_sequence
     programme.default_dose_sequence
   end
 
   COMMON_DELIVERY_SITES = {
-    "intramuscular" => %w[left_arm_upper_position right_arm_upper_position],
-    "nasal_spray" => %w[nose]
+    "injection" => %w[left_arm_upper_position right_arm_upper_position],
+    "nasal" => %w[nose]
   }.freeze
 
   CommonDeliverySite = Struct.new(:value, :label)
 
-  def common_delivery_sites_options
-    @common_delivery_sites_options ||=
-      begin
-        options =
-          COMMON_DELIVERY_SITES
-            .fetch(delivery_method)
-            .map do |value|
-              label = VaccinationRecord.human_enum_name(:delivery_site, value)
-              CommonDeliverySite.new(value:, label:)
-            end
-
-        if delivery_method.in?(Vaccine::INJECTION_DELIVERY_METHODS)
-          options << CommonDeliverySite.new(value: "other", label: "Other")
+  def common_delivery_site_options(vaccine_method)
+    options =
+      COMMON_DELIVERY_SITES
+        .fetch(vaccine_method)
+        .map do |value|
+          label = VaccinationRecord.human_enum_name(:delivery_site, value)
+          CommonDeliverySite.new(value:, label:)
         end
 
-        options
-      end
+    if vaccine_method == "injection"
+      options << CommonDeliverySite.new(value: "other", label: "Other")
+    end
+
+    options
   end
 
   def vaccination_name
     vaccination =
       if programme.has_multiple_vaccine_methods?
-        vaccine_method =
-          Vaccine.delivery_method_to_vaccine_method(delivery_method)
-        Vaccine.human_enum_name(:method, vaccine_method).downcase
+        Vaccine.human_enum_name(:method, vaccine_methods.first).downcase
       else
         "vaccination"
       end
@@ -73,6 +64,5 @@ def ask_not_taking_medication? = programme.doubles? || programme.flu?
 
   def ask_not_pregnant? = programme.td_ipv?
 
-  def ask_asthma_flare_up? =
-    delivery_method.in?(Vaccine::NASAL_DELIVERY_METHODS)
+  def ask_asthma_flare_up? = vaccine_methods.include?("nasal")
 end
diff --git a/app/controllers/patient_sessions/vaccinations_controller.rb b/app/controllers/patient_sessions/vaccinations_controller.rb
@@ -54,8 +54,6 @@ def create
   def vaccinate_form_params
     params.expect(
       vaccinate_form: %i[
-        administered
-        delivery_method
         delivery_site
         dose_sequence
         identity_check_confirmed_by_other_name
@@ -64,15 +62,13 @@ def vaccinate_form_params
         pre_screening_confirmed
         pre_screening_notes
         vaccine_id
+        vaccine_method
       ]
     )
   end
 
   def set_todays_batch
-    vaccine_method =
-      Vaccine.delivery_method_to_vaccine_method(
-        vaccinate_form_params[:delivery_method]
-      )
+    vaccine_method = vaccinate_form_params[:vaccine_method]
     return if vaccine_method.nil?
 
     id = todays_batch_id(programme: @programme, vaccine_method:)
diff --git a/app/forms/vaccinate_form.rb b/app/forms/vaccinate_form.rb
@@ -13,8 +13,7 @@ class VaccinateForm
   attribute :pre_screening_confirmed, :boolean
   attribute :pre_screening_notes, :string
 
-  attribute :administered, :boolean
-  attribute :delivery_method, :string
+  attribute :vaccine_method, :string
   attribute :delivery_site, :string
   attribute :dose_sequence, :integer
   attribute :programme_id, :integer
@@ -32,12 +31,11 @@ class VaccinateForm
               maximum: 300
             }
 
-  validates :administered, inclusion: [true, false]
+  validates :vaccine_method, inclusion: { in: :vaccine_method_options }
   validates :pre_screening_notes, length: { maximum: 1000 }
 
-  with_options if: :administered do
+  with_options if: :administered? do
     validates :pre_screening_confirmed, presence: true
-    validates :delivery_method, presence: true
     validates :delivery_site, presence: true
   end
 
@@ -48,7 +46,7 @@ def save(draft_vaccination_record:)
 
     draft_vaccination_record.reset!
 
-    if administered
+    if administered?
       draft_vaccination_record.outcome = "administered"
 
       if delivery_site != "other"
@@ -80,6 +78,18 @@ def save(draft_vaccination_record:)
 
   delegate :organisation, to: :patient_session
 
+  def administered? = vaccine_method != "none"
+
+  def vaccine_method_options
+    programme.vaccine_methods + ["none"]
+  end
+
+  def delivery_method
+    if administered?
+      Vaccine::AVAILABLE_DELIVERY_METHODS.fetch(vaccine_method).first
+    end
+  end
+
   def pre_screening
     @pre_screening ||=
       patient_session.pre_screenings.build(
diff --git a/app/models/draft_vaccination_record.rb b/app/models/draft_vaccination_record.rb
@@ -296,10 +296,12 @@ def reset_unused_fields
     end
   end
 
-  def can_be_half_dose?
-    delivery_method.in?(Vaccine::NASAL_DELIVERY_METHODS)
+  def vaccine_method
+    Vaccine.delivery_method_to_vaccine_method(delivery_method)
   end
 
+  def can_be_half_dose? = vaccine_method == "nasal"
+
   def can_change_outcome?
     outcome != "already_had" || editing? || session.nil? || session.today?
   end
@@ -312,14 +314,14 @@ def delivery_site_matches_delivery_method
       return
     end
 
-    case delivery_method
-    when *Vaccine::NASAL_DELIVERY_METHODS
-      if delivery_site != "nose"
-        errors.add(:delivery_site, :nasal_spray_must_be_nose)
-      end
-    when *Vaccine::INJECTION_DELIVERY_METHODS
-      if delivery_site == "nose"
+    allowed_delivery_sites =
+      Vaccine::AVAILABLE_DELIVERY_SITES.fetch(vaccine_method)
+
+    unless delivery_site.in?(allowed_delivery_sites)
+      if vaccine_method == "injection"
         errors.add(:delivery_site, :injection_cannot_be_nose)
+      else
+        errors.add(:delivery_site, :nasal_spray_must_be_nose)
       end
     end
 
diff --git a/app/models/patient.rb b/app/models/patient.rb
@@ -333,7 +333,6 @@ def consent_given_and_safe_to_vaccinate?(programme:, vaccine_method: nil)
     return false unless consent_status(programme:).given?
 
     unless triage_status(programme:).safe_to_vaccinate? ||
-             triage_status(programme:).delay_vaccination? ||
              triage_status(programme:).not_required?
       return false
     end
diff --git a/app/models/vaccine.rb b/app/models/vaccine.rb
@@ -77,12 +77,9 @@ def available_delivery_sites
     AVAILABLE_DELIVERY_SITES.fetch(method)
   end
 
-  NASAL_DELIVERY_METHODS = %w[nasal_spray].freeze
-  INJECTION_DELIVERY_METHODS = %w[intramuscular subcutaneous].freeze
-
   AVAILABLE_DELIVERY_METHODS = {
-    "nasal" => NASAL_DELIVERY_METHODS,
-    "injection" => INJECTION_DELIVERY_METHODS
+    "nasal" => %w[nasal_spray].freeze,
+    "injection" => %w[intramuscular subcutaneous].freeze
   }.freeze
 
   def available_delivery_methods
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -121,8 +121,6 @@ en:
               inclusion: Choose a status
         vaccinate_form:
           attributes:
-            administered:
-              inclusion: Choose if they are ready to vaccinate
             delivery_site:
               blank: Choose where the injection will be given
             identity_check_confirmed_by_other_name:
@@ -137,6 +135,8 @@ en:
               blank: Confirm you’ve checked the pre-screening statements are true
             pre_screening_notes:
               too_long: Enter notes that are less than %{count} characters long
+            vaccine_method:
+              inclusion: Choose if they are ready to vaccinate
         vaccination_report:
           attributes:
             file_format:
diff --git a/spec/features/flu_vaccination_administered_spec.rb b/spec/features/flu_vaccination_administered_spec.rb
diff --git a/spec/features/triage_delay_vaccination_spec.rb b/spec/features/triage_delay_vaccination_spec.rb
diff --git a/spec/forms/vaccinate_form_spec.rb b/spec/forms/vaccinate_form_spec.rb
