Real observations with a dummy specimen won't get assigned another dummy observation to the specimen.

Author: Alex-Nita

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapper.java

@@ -77,7 +77,6 @@ public class DiagnosticReportMapper {
     public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnosticReport) {
         List<Observation> observations = fetchObservations(diagnosticReport);
         List<Specimen> specimens = fetchSpecimens(diagnosticReport, observations);
-        observations = addDummyObservationsToObservationList(observations, specimens, diagnosticReport);
         final IdMapper idMapper = messageContext.getIdMapper();
         markObservationsAsProcessed(idMapper, observations);
 
@@ -87,9 +86,13 @@ public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnostic
                     .toList(),
                 specimens);
 
+        observations = addDummyObservationsToObservationList(observationsExcludingFilingComments, specimens, diagnosticReport);
+
+        List<Observation> finalObservations = observations;
+
         String mappedSpecimens = specimens.stream()
             .map(specimen -> specimenMapper.mapSpecimenToCompoundStatement(specimen,
-                    observationsForSpecimen(specimen, observationsExcludingFilingComments),
+                    observationsForSpecimen(specimen, finalObservations),
                     diagnosticReport))
             .collect(Collectors.joining());
 

service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-no-specimen.xml

@@ -92,6 +92,18 @@
                         <availabilityTime value="20100223"/>
                     </NarrativeStatement>
                 </component>
+                <component typeCode="COMP" contextConductionInd="true">
+                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                        <id
+                                root="II-for-Observation-DUMMY-OBSERVATION-5E496953-065B-41F2-9577-BE8F2FBD0757" />
+                        <text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
+                            CommentDate:UNK
+
+                            EMPTY REPORT</text>
+                        <statusCode code="COMPLETE" />
+                        <availabilityTime nullFlavor="UNK" />
+                    </NarrativeStatement>
+                </component>
             </CompoundStatement>
         </component>
         <Participant typeCode="AUT" contextControlCode="OP">