Review medical information tweaks

- Reorder Medical history & Symptoms panels
- Add description text to Lump form
- Remove Other (symptom) form hint text
- Remove horizontal rules from panels when multiple symptoms are present
- Update back link text on lump form

Author: cameronhargreaves1-nhs

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/section_cards.jinja

@@ -52,10 +52,10 @@
       "html": insetHtml,
       "classes": "nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4"
     }) }}
+    <hr>
   {% endif %}
 
   {% if not read_only %}
-    <hr>
     <h3>Add symptoms</h3>
 
     <div class="nhsuk-button-group app-button-group--small">

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/inline_area_radios.jinja

@@ -69,9 +69,6 @@
         {
           "value": "OTHER",
           "text": "Other",
-          "hint": {
-            "text": "For example, the armpit"
-          },
           "conditional": {
             "html":  form.area_description_other.as_field_group()
           }

manage_breast_screening/mammograms/jinja2/mammograms/medical_information/symptoms/forms/simple_symptom.jinja

@@ -3,6 +3,12 @@
 {% from "nhsuk/components/fieldset/macro.jinja" import fieldset %}
 
 {% block form %}
+  {% if heading_description %}
+    <div class="nhsuk-inset-text nhsuk-u-margin-top-0 nhsuk-u-margin-bottom-4">
+      <p>{{ heading_description }}</p>
+    </div>
+  {% endif %}
+
   {% include "mammograms/medical_information/symptoms/forms/inline_area_radios.jinja" %}
 
   {% do form.when_started.add_divider_after("OVER_THREE_YEARS", "or") %}

manage_breast_screening/mammograms/jinja2/mammograms/record_medical_information.jinja

@@ -29,17 +29,17 @@
 {% endcall %}
 
 {% call card_with_status(
-  presented_section=presenter.get_section(sections.SYMPTOMS),
+  presented_section=presenter.get_section(sections.MEDICAL_HISTORY),
   csrf_input=csrf_input,
   ) %}
-  {{ symptoms_content(presenter) }}
+  {{ medical_history_content(presenter) }}
 {% endcall %}
 
 {% call card_with_status(
-  presented_section=presenter.get_section(sections.MEDICAL_HISTORY),
+  presented_section=presenter.get_section(sections.SYMPTOMS),
   csrf_input=csrf_input,
   ) %}
-  {{ medical_history_content(presenter) }}
+  {{ symptoms_content(presenter) }}
 {% endcall %}
 
 {% call card_with_status(

manage_breast_screening/mammograms/views/symptom_views.py

@@ -37,7 +37,7 @@ def get_back_link_params(self):
                 "mammograms:record_medical_information",
                 kwargs={"pk": self.appointment_pk},
             ),
-            "text": "Back to appointment",
+            "text": "Back",
         }
 
     def get_context_data(self, **kwargs):
@@ -130,6 +130,13 @@ class AddLumpView(AddSymptomView):
     form_class = LumpForm
     template_name = "mammograms/medical_information/symptoms/forms/simple_symptom.jinja"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["heading_description"] = (
+            "Lumps are a recognised symptom of breast cancer. Information recorded here will be highlighted during image reading."
+        )
+        return context
+
 
 class AddSwellingOrShapeChangeView(AddSymptomView):
     """
@@ -188,6 +195,13 @@ class ChangeLumpView(ChangeSymptomView):
     def extra_filters(self):
         return {"symptom_type_id": SymptomType.LUMP}
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["heading_description"] = (
+            "Record whether the lump is in the left breast, right breast or both."
+        )
+        return context
+
 
 class ChangeSwellingOrShapeChangeView(ChangeSymptomView):
     """