Re-order pre-screening questions

This is to match the latest designs in the prototype.

Author: thomasleese

app/components/app_vaccinate_form_component.html.erb

@@ -12,20 +12,14 @@
       <%= patient.given_name %> has confirmed that they:
     </h2>
 
-    <%= f.govuk_check_boxes_fieldset :knows_vaccination, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :knows_vaccination, true, multiple: false, link_errors: true %>
-    <% end %>
-
-    <%= f.govuk_check_boxes_fieldset :not_already_had, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :not_already_had, true, multiple: false, link_errors: true %>
-    <% end %>
-
     <%= f.govuk_check_boxes_fieldset :feeling_well, multiple: false, legend: nil do %>
       <%= f.govuk_check_box :feeling_well, true, multiple: false, link_errors: true %>
     <% end %>
 
-    <%= f.govuk_check_boxes_fieldset :no_allergies, multiple: false, legend: nil do %>
-      <%= f.govuk_check_box :no_allergies, true, multiple: false, link_errors: true %>
+    <% if vaccinate_form.ask_not_pregnant? %>
+      <%= f.govuk_check_boxes_fieldset :not_pregnant, multiple: false, legend: nil do %>
+        <%= f.govuk_check_box :not_pregnant, true, multiple: false, link_errors: true %>
+      <% end %>
     <% end %>
 
     <% if vaccinate_form.ask_not_taking_medication? %>
@@ -34,10 +28,16 @@
       <% end %>
     <% end %>
 
-    <% if vaccinate_form.ask_not_pregnant? %>
-      <%= f.govuk_check_boxes_fieldset :not_pregnant, multiple: false, legend: nil do %>
-        <%= f.govuk_check_box :not_pregnant, true, multiple: false, link_errors: true %>
-      <% end %>
+    <%= f.govuk_check_boxes_fieldset :no_allergies, multiple: false, legend: nil do %>
+      <%= f.govuk_check_box :no_allergies, true, multiple: false, link_errors: true %>
+    <% end %>
+
+    <%= f.govuk_check_boxes_fieldset :not_already_had, multiple: false, legend: nil do %>
+      <%= f.govuk_check_box :not_already_had, true, multiple: false, link_errors: true %>
+    <% end %>
+
+    <%= f.govuk_check_boxes_fieldset :knows_vaccination, multiple: false, legend: nil do %>
+      <%= f.govuk_check_box :knows_vaccination, true, multiple: false, link_errors: true %>
     <% end %>
 
     <%= f.govuk_text_area :pre_screening_notes, label: { text: "Pre-screening notes (optional)" } %>