fix: treat re-upload of deleted vaccination as conflicting &:discarded?

This fixes the bug where once a vaccination record is discarded, it can never
be imported again. 

Jira-Issue: MAV-1346

Author: MartinVanIJcken

app/models/immunisation_import_row.rb

@@ -124,7 +124,8 @@ def to_vaccination_record
       delivery_method: delivery_method_value,
       delivery_site: delivery_site_value,
       notes: notes&.to_s,
-      vaccine_id: vaccine&.id
+      vaccine_id: vaccine&.id,
+      discarded_at: nil
     }
 
     vaccination_record =

app/views/imports/issues/show.html.erb

@@ -29,7 +29,7 @@
     <%= render AppCardComponent.new(heading_level: 2, colour: "blue") do |c| %>
       <% c.with_heading { "#{@existing_or_deleted.capitalize} record" } %>
       <% if @type == "child" %>
-        <%= render AppChildSummaryComponent.new(@patient.with_pending_changes) %>
+        <%= render AppChildSummaryComponent.new(@patient) %>
       <% else %>
         <%= render AppVaccinationRecordSummaryComponent.new(
               @vaccination_record, current_user:,