Merge pull request #3541 from nhsuk/fix-triage-already-vaccinated

Stop requesting triage for already vaccinated patients

Author: alistair-white-horne-tng

app/controllers/draft_vaccination_records_controller.rb

@@ -121,8 +121,6 @@ def handle_confirm
 
     send_vaccination_confirmation(@vaccination_record) if should_notify_parents
 
-    @vaccination_record.triage_patient_as_do_not_vaccinate!
-
     # In case the user navigates back to try and edit the newly created
     # vaccination record.
     @draft_vaccination_record.update!(editing_id: @vaccination_record.id)

app/models/patient/triage_status.rb

@@ -68,24 +68,33 @@ def consent_requires_triage?
   def vaccination_history_requires_triage?
     vaccination_records.any? do
       it.programme_id == programme_id && it.administered?
-    end && !VaccinatedCriteria.call(programme:, patient:, vaccination_records:)
+    end && !vaccinated?
   end
 
   private
 
+  def vaccinated?
+    @vaccinated ||=
+      VaccinatedCriteria.call(programme:, patient:, vaccination_records:)
+  end
+
   def status_should_be_safe_to_vaccinate?
+    return false if vaccinated?
     latest_triage&.ready_to_vaccinate?
   end
 
   def status_should_be_do_not_vaccinate?
+    return false if vaccinated?
     latest_triage&.do_not_vaccinate?
   end
 
   def status_should_be_delay_vaccination?
+    return false if vaccinated?
     latest_triage&.delay_vaccination?
   end
 
   def status_should_be_required?
+    return false if vaccinated?
     return true if latest_triage&.needs_follow_up?
 
     return false if latest_consents.empty?

app/models/vaccination_record.rb

@@ -174,33 +174,6 @@ def academic_year
     performed_at.to_date.academic_year
   end
 
-  def triage_patient_as_do_not_vaccinate!
-    return unless already_had?
-
-    # If an "already had" vaccination record is created, and the patient needs
-    # triage, we should record a "do not vaccinate" triage to make sure the
-    # patient isn't double vaccinated.
-
-    patient = Patient.includes(:triage_statuses).find(patient_id)
-    triage_status = patient.triage_status(programme:)
-
-    return unless triage_status.required? || triage_status.delay_vaccination?
-
-    triage_notes =
-      "Recorded as already vaccinated on #{Date.current.to_fs(:long)}"
-    triage_notes += ": #{notes}" if notes.present?
-
-    patient.triages.create!(
-      programme:,
-      organisation:,
-      status: :do_not_vaccinate,
-      performed_by: performed_by_user,
-      notes: triage_notes
-    )
-
-    StatusUpdater.call(patient:)
-  end
-
   private
 
   def requires_location_name?

spec/features/td_ipv_already_had_spec.rb

@@ -46,7 +46,7 @@
     when_i_record_the_patient_as_already_vaccinated
     then_i_see_the_patient_is_already_vaccinated
     and_i_click_on_triage
-    then_i_see_the_patient_should_not_be_vaccinated
+    then_i_see_the_patient_doesnt_need_triage
   end
 
   scenario "can't record as already vaccinated as an admin" do
@@ -201,10 +201,10 @@ def and_i_click_on_triage
     click_on "Triage"
   end
 
-  def then_i_see_the_patient_should_not_be_vaccinated
-    choose "Do not vaccinate"
+  def then_i_see_the_patient_doesnt_need_triage
+    choose "Any"
     click_on "Update results"
 
-    expect(page).to have_content(@patient.full_name)
+    expect(page).not_to have_content(@patient.full_name)
   end
 end

spec/models/patient/triage_status_spec.rb

@@ -24,7 +24,7 @@
     build(:patient_triage_status, patient:, programme:)
   end
 
-  let(:patient) { create(:patient) }
+  let(:patient) { create(:patient, year_group: 9) }
   let(:programme) { create(:programme) }
 
   it { should belong_to(:patient) }
@@ -110,5 +110,44 @@
 
       it { should be(:not_required) }
     end
+
+    context "when the patient is already vaccinated" do
+      shared_examples "a vaccinated patient with any triage status" do
+        before do
+          create(:triage, triage_trait, patient:, programme:) if triage_trait
+        end
+
+        it { should be(:not_required) }
+      end
+
+      before do
+        create(:vaccination_record, patient:, programme:)
+        create(:patient_vaccination_status, :vaccinated, patient:, programme:)
+      end
+
+      context "with a safe to vaccinate triage" do
+        it_behaves_like "a vaccinated patient with any triage status" do
+          let(:triage_trait) { :ready_to_vaccinate }
+        end
+      end
+
+      context "with a do not vaccinate triage" do
+        it_behaves_like "a vaccinated patient with any triage status" do
+          let(:triage_trait) { :do_not_vaccinate }
+        end
+      end
+
+      context "with a needs follow up triage" do
+        it_behaves_like "a vaccinated patient with any triage status" do
+          let(:triage_trait) { :needs_follow_up }
+        end
+      end
+
+      context "with a delay vaccination triage" do
+        it_behaves_like "a vaccinated patient with any triage status" do
+          let(:triage_trait) { :delay_vaccination }
+        end
+      end
+    end
   end
 end