Merge pull request #4302 from nhsuk/perform-pds-search-for-all-patients

Perform pds search for all patients

Author: murugapl

app/components/app_patient_pds_discrepancy_table_component.html.erb

@@ -0,0 +1,53 @@
+<% return if discrepancies.blank? %>
+
+<div class="nhsuk-table__panel-with-heading-tab">
+  <h3 class="nhsuk-table__heading-tab">
+    <%= pluralize(discrepancies.count, "NHS number") %>
+    <%= discrepancies.count == 1 ? "was" : "were" %> updated
+  </h3>
+
+  <p>
+    <%= pluralize(discrepancies.count, "incorrect NHS number") %>
+    updated with <%= discrepancies.count == 1 ? "that" : "those" %> found on Spine.
+    Update your original data source if necessary.
+  </p>
+
+  <%= govuk_table(html_attributes: { class: "nhsuk-table-responsive" }) do |table| %>
+    <% table.with_head do |head| %>
+      <% head.with_row do |row| %>
+        <% row.with_cell(text: "Child record") %>
+        <% row.with_cell(text: "NHS number (upload)") %>
+        <% row.with_cell(text: "NHS number (Spine)") %>
+      <% end %>
+    <% end %>
+
+    <% table.with_body do |body| %>
+      <% discrepancies.each do |changeset| %>
+        <% patient = changeset.patient %>
+
+        <% body.with_row do |row| %>
+          <% row.with_cell do %>
+            <span class="nhsuk-table-responsive__heading">Child record</span>
+            <span>
+              <% if can_link_to?(patient) %>
+                <%= link_to patient.full_name, patient_path(patient) %>
+              <% else %>
+                <%= patient.full_name %>
+              <% end %>
+            </span>
+          <% end %>
+
+          <% row.with_cell do %>
+            <span class="nhsuk-table-responsive__heading">Uploaded NHS number</span>
+            <%= helpers.format_nhs_number(changeset.uploaded_nhs_number) %>
+          <% end %>
+
+          <% row.with_cell do %>
+            <span class="nhsuk-table-responsive__heading">PDS NHS number</span>
+            <%= helpers.format_nhs_number(changeset.pds_nhs_number) %>
+          <% end %>
+        <% end %>
+      <% end %>
+    <% end %>
+  <% end %>
+</div>

app/components/app_patient_pds_discrepancy_table_component.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+class AppPatientPDSDiscrepancyTableComponent < ViewComponent::Base
+  def initialize(discrepancies:, current_user:)
+    super
+
+    @discrepancies = discrepancies
+    @current_user = current_user
+  end
+
+  private
+
+  attr_reader :discrepancies, :current_user
+
+  def can_link_to?(record)
+    allowed_ids.include?(record.id)
+  end
+
+  def allowed_ids
+    @allowed_ids ||= PatientPolicy::Scope.new(current_user, Patient).resolve.ids
+  end
+end

app/controllers/class_imports_controller.rb

@@ -46,6 +46,23 @@ def show
 
     @duplicates = @class_import.patients.with_pending_changes.distinct
 
+    @issues_text =
+      @duplicates.each_with_object({}) do |patient, hash|
+        changeset = @class_import.changesets.find_by(patient_id: patient.id)
+
+        issue_groups =
+          helpers.issue_categories_for(patient.pending_changes.keys)
+
+        hash[patient.full_name] = if changeset&.matched_on_nhs_number
+          "Matched on NHS number. #{issue_groups.to_sentence.capitalize}" +
+            (issue_groups.size == 1 ? " does not match." : " do not match.")
+        else
+          "Possible match found. Review and confirm."
+        end
+      end
+
+    @nhs_discrepancies = @class_import.changesets.nhs_number_discrepancies
+
     render template: "imports/show",
            layout: "full",
            locals: {

app/controllers/cohort_imports_controller.rb

@@ -44,6 +44,23 @@ def show
 
     @duplicates = @cohort_import.patients.with_pending_changes.distinct
 
+    @issues_text =
+      @duplicates.each_with_object({}) do |patient, hash|
+        changeset = @cohort_import.changesets.find_by(patient_id: patient.id)
+
+        issue_groups =
+          helpers.issue_categories_for(patient.pending_changes.keys)
+
+        hash[patient.full_name] = if changeset&.matched_on_nhs_number
+          "Matched on NHS number. #{issue_groups.to_sentence.capitalize}" +
+            (issue_groups.size == 1 ? " does not match." : " do not match.")
+        else
+          "Possible match found. Review and confirm."
+        end
+      end
+
+    @nhs_discrepancies = @cohort_import.changesets.nhs_number_discrepancies
+
     render template: "imports/show",
            layout: "full",
            locals: {

app/helpers/imports_helper.rb

@@ -1,6 +1,17 @@
 # frozen_string_literal: true
 
 module ImportsHelper
+  FIELD_GROUPS = {
+    %w[address_line_1 address_line_2 address_town address_postcode] => :address,
+    %w[date_of_birth] => :date_of_birth,
+    %w[nhs_number] => :nhs_number,
+    %w[gender_code] => :gender,
+    %w[given_name family_name preferred_given_name preferred_family_name] =>
+      :name,
+    %w[birth_academic_year] => :year_group,
+    %w[registration] => :registration
+  }.freeze
+
   def import_issues_count
     vaccination_records_with_issues =
       policy_scope(VaccinationRecord).with_pending_changes.distinct.pluck(
@@ -11,4 +22,10 @@ def import_issues_count
 
     (vaccination_records_with_issues + patients_with_issues).uniq.length
   end
+
+  def issue_categories_for(pending_changes)
+    FIELD_GROUPS.filter_map do |(keys, group)|
+      group.to_s.humanize if (pending_changes & keys).any?
+    end
+  end
 end

app/helpers/patients_helper.rb

@@ -4,20 +4,20 @@ module PatientsHelper
   # Replace each space in NHS number with a non-breaking space and
   # zero-width word joiner to prevent telephone format detection
   def patient_nhs_number(patient)
+    format_nhs_number(patient.nhs_number, invalid: patient.try(:invalidated?))
+  end
+
+  def format_nhs_number(nhs_number, invalid: false)
     span =
-      if patient.nhs_number.blank?
+      if nhs_number.blank?
         "Not provided"
       else
         tag.span(class: %w[app-u-monospace nhsuk-u-nowrap]) do
-          patient
-            .nhs_number
-            .to_s
-            .gsub(/(\d{3})(\d{3})(\d{4})/, "\\1 \\2 \\3")
-            .html_safe
+          nhs_number.to_s.gsub(/(\d{3})(\d{3})(\d{4})/, "\\1 \\2 \\3").html_safe
         end
       end
 
-    patient.try(:invalidated?) ? tag.s(span) : span
+    invalid ? tag.s(span) : span
   end
 
   def patient_date_of_birth(patient)

app/jobs/commit_patient_changesets_job.rb

@@ -44,6 +44,9 @@ def import_patients_and_parents(changesets, import)
     Patient.import(patients.to_a, on_duplicate_key_update: :all)
     link_records_to_import(import, Patient, patients)
 
+    changesets.each(&:assign_patient_id)
+    PatientChangeset.import(changesets, on_duplicate_key_update: :all)
+
     Parent.import(parents.to_a, on_duplicate_key_update: :all)
     link_records_to_import(import, Parent, parents)
 

app/jobs/process_patient_changesets_job.rb

@@ -8,9 +8,10 @@ class ProcessPatientChangesetsJob < ApplicationJob
   def perform(patient_changeset)
     attrs = patient_changeset.child_attributes
 
-    if attrs["nhs_number"].blank? &&
-         (pds_patient = search_for_patient(attrs)).present?
+    pds_patient = search_for_patient(attrs)
+    if pds_patient.present?
       attrs["nhs_number"] = pds_patient.nhs_number
+      patient_changeset.pds_nhs_number = pds_patient.nhs_number
     end
 
     patient_changeset.processed!

app/models/class_imports_patient.rb

@@ -4,8 +4,8 @@
 #
 # Table name: class_imports_patients
 #
-#  class_import_id :bigint           not null
-#  patient_id      :bigint           not null
+#  class_import_id       :bigint           not null
+#  patient_id            :bigint           not null
 #
 # Indexes
 #

app/models/cohort_imports_patient.rb

@@ -4,8 +4,8 @@
 #
 # Table name: cohort_imports_patients
 #
-#  cohort_import_id :bigint           not null
-#  patient_id       :bigint           not null
+#  cohort_import_id      :bigint           not null
+#  patient_id            :bigint           not null
 #
 # Indexes
 #