Merge pull request #6462 from NHSDigital/record-performer-display-in-notes

Consume organisation performer display name from Imms record

Author: jf-x-dev

app/lib/fhir_mapper/vaccination_record.rb

@@ -110,11 +110,16 @@ def self.from_fhir_record(fhir_record, patient:)
         )
       end
 
-      performer_ods_code = org_performer_ods_code_from_fhir(fhir_record)
+      org_actor = org_performer_actor_from_fhir(fhir_record)
+      performer_ods_code = org_actor&.identifier&.value
       unless performer_ods_code == FHIRMapper::Location::UNKNOWN_IDENTIFIER
         attrs[:performed_ods_code] = performer_ods_code
       end
 
+      if org_actor&.display.present?
+        notes << "Performing organisation display name: #{org_actor.display}"
+      end
+
       user_performer_name = user_performer_name_from_fhir(fhir_record)
       attrs[:performed_by_given_name] = user_performer_name&.given&.first
       attrs[:performed_by_family_name] = user_performer_name&.family
@@ -332,10 +337,8 @@ def fhir_org_performer
       )
     end
 
-    private_class_method def self.org_performer_ods_code_from_fhir(fhir_record)
-      org_actor =
-        fhir_record.performer.find { it.actor&.type == "Organization" }&.actor
-      org_actor&.identifier&.value
+    private_class_method def self.org_performer_actor_from_fhir(fhir_record)
+      fhir_record.performer.find { it.actor&.type == "Organization" }&.actor
     end
 
     def fhir_reason_code

spec/lib/fhir_mapper/vaccination_record_spec.rb

@@ -701,7 +701,9 @@
         its(:performed_ods_code) { should eq "B0C4P" }
         its(:nhs_immunisations_api_primary_source) { should be true }
 
-        its(:notes) { should be_nil }
+        its(:notes) do
+          should eq "Performing organisation display name: Acme Healthcare"
+        end
       end
 
       context "with a record with not full dose" do
@@ -742,7 +744,9 @@
         its(:performed_ods_code) { should eq "B0C4P" }
         its(:nhs_immunisations_api_primary_source) { should be true }
 
-        its(:notes) { should be_nil }
+        its(:notes) do
+          should eq "Performing organisation display name: Acme Healthcare"
+        end
       end
 
       context "with a record with an unexpected dose unit, and is nasal flu" do
@@ -784,7 +788,9 @@
         its(:location_name) { should be_nil }
         its(:performed_ods_code) { should eq "B0C4P" }
 
-        its(:notes) { should be_nil }
+        its(:notes) do
+          should eq "Performing organisation display name: Acme Healthcare"
+        end
       end
 
       context "with a record with extended milliliter description" do