NIAD 3217 - Fix duplicated Test Results (#1001)

Alex-Nita · stevenmccullaghmadetech · web-flow · commit 79078831989a · 2024-11-26T14:49:02.000Z
* Reformat xml file

* Fixed duplication of test reports during mapping

* Adding medications scenarios from PR 958

* Adding WireMock request for Investigations

* Remove space at end of file name

* Removing wiremock files.

---------

Co-authored-by: Steven McCullagh &lt;steven.mccullagh@madetech.com&gt;
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapper.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -87,7 +87,9 @@ public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnostic
                 specimens);
 
         String mappedSpecimens = specimens.stream()
-            .map(specimen -> specimenMapper.mapSpecimenToCompoundStatement(specimen, observationsExcludingFilingComments, diagnosticReport))
+            .map(specimen -> specimenMapper.mapSpecimenToCompoundStatement(specimen,
+                    observationsForSpecimen(specimen, observationsExcludingFilingComments),
+                    diagnosticReport))
             .collect(Collectors.joining());
 
         String reportLevelNarrativeStatements = prepareReportLevelNarrativeStatements(diagnosticReport, observations);
@@ -113,6 +115,13 @@ public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnostic
         );
     }
 
+    private List<Observation> observationsForSpecimen(Specimen specimen, List<Observation> observations) {
+        return observations.stream()
+                .filter(Observation::hasSpecimen)
+                .filter(observation -> observation.getSpecimen().getReference().equals(specimen.getId()))
+                .collect(Collectors.toList());
+    }
+
     private String fetchExtensionId(List<Identifier> identifiers) {
         return identifiers.stream()
             .filter(DiagnosticReportMapper::isPMIPCodeSystem)
diff --git a/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/SpecimenMapperTest.java b/service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -139,7 +139,7 @@ void When_MappingDefaultSpecimenWithObservation_Expect_DefaultSpecimenAndObserva
         final String actualXml = specimenMapper.mapSpecimenToCompoundStatement(
             specimen, observations, DIAGNOSTIC_REPORT);
 
-        assertThat(actualXml).isEqualTo(expectedXml);
+        assertThat(actualXml).isEqualToIgnoringWhitespace(expectedXml);
     }
 
     @Test
diff --git a/service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-no-specimen.json b/service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-no-specimen.json
@@ -54,7 +54,7 @@
       "reference": "Observation/FILING-COMMENT-WITH-NO-COMMENT"
     },
     {
-      "reference": "Observation/6E30A9E3-FF9A-4868-8FCD-7DAC26A16E78"
+      "reference": "Observation/TestResult-WithoutSpecimenReference"
     }
   ]
 }
diff --git a/service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-no-specimen.xml b/service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-no-specimen.xml
@@ -68,8 +68,8 @@
                     </specimenRole>
                 </specimen>
                 <component typeCode="COMP" contextConductionInd="true">
-                    <CompoundStatement classCode="CLUSTER" moodCode="EVN">
-                        <id root="II-for-Observation-Observation/6E30A9E3-FF9A-4868-8FCD-7DAC26A16E78"/>
+                    <ObservationStatement classCode="OBS" moodCode="EVN">
+                        <id root="II-for-Observation-Observation/TestResult-WithoutSpecimenReference"/>
                         <code nullFlavor="UNK">
                             <originalText>Mocked code</originalText>
                         </code>
@@ -78,46 +78,19 @@
                             <center value="20100223"/>
                         </effectiveTime>
                         <availabilityTime value="20100223"/>
-                        <component typeCode="COMP" contextConductionInd="true">
-                            <ObservationStatement classCode="OBS" moodCode="EVN">
-                                <id root="5E496953-065B-41F2-9577-BE8F2FBD0757"/>
-                                <code nullFlavor="UNK">
-                                    <originalText>Mocked code</originalText>
-                                </code>
-                                <statusCode code="COMPLETE"/>
-                                <effectiveTime>
-                                    <center value="20100223"/>
-                                </effectiveTime>
-                                <availabilityTime value="20100223"/>
-                                <value xsi:type="PQ" value="8.800" unit="1">
-                                    <translation value="8.800">
-                                        <originalText>mmol/L</originalText>
-                                    </translation>
-                                </value>
-                                <referenceRange typeCode="REFV">
-                                    <referenceInterpretationRange classCode="OBS" moodCode="EVN.CRT">
-                                        <value>
-                                            <low value="10.000"/>
-                                            <high value="90.000"/>
-                                        </value>
-                                    </referenceInterpretationRange>
-                                </referenceRange>
-
-                            </ObservationStatement>
-                        </component>
-                        <component typeCode="COMP" contextConductionInd="true">
-                            <NarrativeStatement classCode="OBS" moodCode="EVN">
-                                <id root="II-for-Observation-Observation/6E30A9E3-FF9A-4868-8FCD-7DAC26A16E78-COMM"/>
-                                <text mediaType="text/x-h7uk-pmip">CommentType:USER COMMENT
-                                    CommentDate:20201215151713
+                    </ObservationStatement>
+                </component>
+                <component typeCode="COMP" contextConductionInd="true">
+                    <NarrativeStatement classCode="OBS" moodCode="EVN">
+                        <id root="5E496953-065B-41F2-9577-BE8F2FBD0757"/>
+                        <text mediaType="text/x-h7uk-pmip">CommentType:AGGREGATE COMMENT SET
+                            CommentDate:20100223
 
-                                    (q) - Normal - No Action
-                                </text>
-                                <statusCode code="COMPLETE"/>
-                                <availabilityTime value="20201215151713"/>
-                            </NarrativeStatement>
-                        </component>
-                    </CompoundStatement>
+                            This is a test result without a specimen.
+                        </text>
+                        <statusCode code="COMPLETE"/>
+                        <availabilityTime value="20100223"/>
+                    </NarrativeStatement>
                 </component>
             </CompoundStatement>
         </component>
diff --git a/service/src/test/resources/ehr/request/fhir/output/expected-xml-with-standalone-observations.xml b/service/src/test/resources/ehr/request/fhir/output/expected-xml-with-standalone-observations.xml

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ void When_MappingDefaultSpecimenWithObservation_Expect_DefaultSpecimenAndObserva`
`139`	`139`	`final String actualXml = specimenMapper.mapSpecimenToCompoundStatement(`
`140`	`140`	`specimen, observations, DIAGNOSTIC_REPORT);`
`141`	`141`
`142`		`- assertThat(actualXml).isEqualTo(expectedXml);`
	`142`	`+ assertThat(actualXml).isEqualToIgnoringWhitespace(expectedXml);`
`143`	`143`	`}`
`144`	`144`
`145`	`145`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@`
`54`	`54`	`"reference": "Observation/FILING-COMMENT-WITH-NO-COMMENT"`
`55`	`55`	`},`
`56`	`56`	`{`
`57`		`- "reference": "Observation/6E30A9E3-FF9A-4868-8FCD-7DAC26A16E78"`
	`57`	`+ "reference": "Observation/TestResult-WithoutSpecimenReference"`
`58`	`58`	`}`
`59`	`59`	`]`
`60`	`60`	`}`