Merge pull request #6154 from NHSDigital/filter-invited-to-clinic

Add ability to filter patients on whether they've been invited to a clinic

Author: thomasleese

app/components/app_patient_search_form_component.html.erb

@@ -21,6 +21,19 @@
       <% end %>
     <% end %>
 
+    <% if show_invited_to_clinic %>
+      <%= f.govuk_check_boxes_fieldset :clinic_invitations,
+                                       multiple: false,
+                                       legend: { text: "Clinic invitations", size: "s" },
+                                       small: true do %>
+        <%= f.govuk_check_box :invited_to_clinic,
+                              1, 0,
+                              multiple: false,
+                              checked: form.invited_to_clinic,
+                              label: { text: "Invited to clinic" } %>
+      <% end %>
+    <% end %>
+
     <% if show_vaccine_criteria && has_vaccine_criteria? %>
       <% programmes.each do |programme| %>
         <% if (programme_vaccine_criteria = vaccine_criteria_for(programme:)).present? %>

app/components/app_patient_search_form_component.rb

@@ -13,6 +13,7 @@ def initialize(
     heading_level: 3,
     show_aged_out_of_programmes: false,
     show_archived_records: true,
+    show_invited_to_clinic: false,
     show_vaccine_criteria: false
   )
     @form = form
@@ -28,6 +29,7 @@ def initialize(
     @show_aged_out_of_programmes = show_aged_out_of_programmes
     @show_archived_records = show_archived_records
     @show_vaccine_criteria = show_vaccine_criteria
+    @show_invited_to_clinic = show_invited_to_clinic
   end
 
   private
@@ -44,6 +46,7 @@ def initialize(
               :heading_level,
               :show_archived_records,
               :show_aged_out_of_programmes,
+              :show_invited_to_clinic,
               :show_vaccine_criteria
 
   delegate :format_year_group,

app/controllers/concerns/patient_search_form_concern.rb

@@ -26,6 +26,7 @@ def patient_search_form_params
       :date_of_birth_day,
       :date_of_birth_month,
       :date_of_birth_year,
+      :invited_to_clinic,
       :missing_nhs_number,
       :patient_specific_direction_status,
       :programme_status_group,

app/forms/patient_search_form.rb

@@ -8,6 +8,7 @@ class PatientSearchForm < SearchForm
   attribute :date_of_birth_day, :integer
   attribute :date_of_birth_month, :integer
   attribute :date_of_birth_year, :integer
+  attribute :invited_to_clinic, :boolean
   attribute :missing_nhs_number, :boolean
   attribute :patient_specific_direction_status, :string
   attribute :programme_status_group, :string
@@ -50,17 +51,18 @@ def programmes
   end
 
   def apply(scope)
-    scope = filter_name(scope)
-    scope = filter_year_groups(scope)
     scope = filter_aged_out_of_programmes(scope)
     scope = filter_archived(scope)
     scope = filter_date_of_birth_year(scope)
+    scope = filter_invited_to_clinic(scope)
+    scope = filter_name(scope)
     scope = filter_nhs_number(scope)
+    scope = filter_patient_specific_direction_status(scope)
+    scope = filter_programme_statuses(scope)
     scope = filter_programmes(scope)
     scope = filter_registration_status(scope)
-    scope = filter_programme_statuses(scope)
     scope = filter_vaccine_criteria(scope)
-    scope = filter_patient_specific_direction_status(scope)
+    scope = filter_year_groups(scope)
 
     scope.order_by_name
   end
@@ -79,18 +81,6 @@ def academic_year
 
   def team = session&.team || current_user.selected_team
 
-  def filter_name(scope)
-    q.present? ? scope.search_by_name_or_nhs_number(q) : scope
-  end
-
-  def filter_year_groups(scope)
-    if year_groups.present?
-      scope.search_by_year_groups(year_groups, academic_year:)
-    else
-      scope
-    end
-  end
-
   def filter_aged_out_of_programmes(scope)
     return scope if team.has_national_reporting_access?
 
@@ -133,22 +123,22 @@ def filter_date_of_birth_year(scope)
     scope
   end
 
-  def filter_nhs_number(scope)
-    missing_nhs_number.present? ? scope.search_by_nhs_number(nil) : scope
-  end
-
-  def filter_programmes(scope)
-    if programme_types.present?
-      if session
-        scope.appear_in_programmes(programmes, session:)
-      else
-        scope.appear_in_programmes(programmes, academic_year:)
-      end
+  def filter_invited_to_clinic(scope)
+    if invited_to_clinic
+      scope.has_clinic_notification(team:, academic_year:, programmes:)
     else
       scope
     end
   end
 
+  def filter_name(scope)
+    q.present? ? scope.search_by_name_or_nhs_number(q) : scope
+  end
+
+  def filter_nhs_number(scope)
+    missing_nhs_number.present? ? scope.search_by_nhs_number(nil) : scope
+  end
+
   def filter_patient_specific_direction_status(scope)
     return scope if (status = patient_specific_direction_status&.to_sym).blank?
 
@@ -208,6 +198,18 @@ def filter_programme_statuses(scope)
     or_scope
   end
 
+  def filter_programmes(scope)
+    if programme_types.present?
+      if session
+        scope.appear_in_programmes(programmes, session:)
+      else
+        scope.appear_in_programmes(programmes, academic_year:)
+      end
+    else
+      scope
+    end
+  end
+
   def filter_registration_status(scope)
     if (status = registration_status&.to_sym).present?
       scope.has_registration_status(status, session:)
@@ -246,4 +248,12 @@ def filter_vaccine_criteria(scope)
 
     or_scope
   end
+
+  def filter_year_groups(scope)
+    if year_groups.present?
+      scope.search_by_year_groups(year_groups, academic_year:)
+    else
+      scope
+    end
+  end
 end

app/models/patient.rb

@@ -352,6 +352,22 @@ class Patient < ApplicationRecord
           )
         end
 
+  scope :has_clinic_notification,
+        ->(team:, academic_year:, programmes: []) do
+          clinic_notification_scope =
+            ClinicNotification
+              .select("1")
+              .where("patient_id = patients.id")
+              .where(team:, academic_year:)
+
+          if programmes.present?
+            clinic_notification_scope =
+              clinic_notification_scope.has_any_programmes_of(programmes)
+          end
+
+          where(clinic_notification_scope.arel.exists)
+        end
+
   scope :with_patient_specific_direction,
         ->(programme:, academic_year:, team:) do
           where(

app/views/schools/patients.html.erb

@@ -20,6 +20,7 @@
           programmes: current_team.programmes,
           programme_statuses: @programme_statuses,
           year_groups: @location.year_groups,
+          show_invited_to_clinic: true,
         ) %>
   </div>