Merge pull request #6487 from NHSDigital/mike/fallback-mmr-systmone-product-codes

Fallback to product-specific MMR codes when record has nil dose sequence

Author: mikejamesthompson

app/lib/reports/systm_one_exporter.rb

@@ -31,10 +31,16 @@ class Reports::SystmOneExporter
       1 => "Y0da5",
       nil => "Y0da5"
     },
+    "MMR VaxPro" => {
+      nil => "Yb9ZN"
+    },
     "Nimenrix" => {
       1 => "YOfcf",
       nil => "YOfcf"
     },
+    "Priorix" => {
+      nil => "Yav8l"
+    },
     "Revaxis" => {
       1 => "Y3417",
       2 => "Y3418",
@@ -231,14 +237,14 @@ def vaccination(vaccination_record)
     vaccine_brand = vaccination_record.vaccine.brand
     dose_sequence = vaccination_record.dose_sequence
 
-    mapping =
-      if programme.mmr?
+    if programme.mmr?
+      procedure_mapping =
         PROCEDURE_DOSE_MAPPINGS.dig(programme.variant_type, dose_sequence)
-      else
-        PRODUCT_DOSE_MAPPINGS.dig(vaccine_brand, dose_sequence)
-      end
+      return procedure_mapping if procedure_mapping.present?
+    end
 
-    return mapping if mapping.present?
+    product_mapping = PRODUCT_DOSE_MAPPINGS.dig(vaccine_brand, dose_sequence)
+    return product_mapping if product_mapping.present?
 
     dose_sequence ? "#{vaccine_brand} Part #{dose_sequence}" : vaccine_brand
   end

spec/lib/reports/systm_one_exporter_spec.rb

@@ -298,13 +298,13 @@
       context "Priorix with unknown dose sequence" do
         let(:vaccine) { Vaccine.find_by!(brand: "Priorix") }
 
-        it { should eq("Priorix") }
+        it { should eq("Yav8l") }
       end
 
       context "MMR VaxPro with unknown dose sequence" do
         let(:vaccine) { Vaccine.find_by!(brand: "MMR VaxPro") }
 
-        it { should eq("MMR VaxPro") }
+        it { should eq("Yb9ZN") }
       end
 
       context "Priorix with dose sequence 1" do