Skip to content

Commit a4899a2

Browse files
committed
Prevent duplicate dummy observations when DiagnosticReport has no restults.
1 parent 066f736 commit a4899a2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ private Specimen generateDummySpecimen(DiagnosticReport diagnosticReport) {
200200

201201
private List<Observation> fetchObservations(DiagnosticReport diagnosticReport) {
202202
if (!diagnosticReport.hasResult()) {
203-
return Collections.singletonList(generateDefaultObservation(diagnosticReport));
203+
return Collections.emptyList();
204204
}
205205

206206
var inputBundleHolder = messageContext.getInputBundleHolder();
@@ -219,7 +219,8 @@ private List<Observation> addDummyObservationsToObservationList(
219219
List<Observation> observations,
220220
List<Specimen> specimens,
221221
DiagnosticReport diagnosticReport) {
222-
List<Observation> dummyObservations = new ArrayList<>();
222+
List<Observation> completeObservations = new ArrayList<>();
223+
completeObservations.addAll(observations);
223224

224225
if (hasSpecimenWithoutObservation(specimens, observations)) {
225226
List<String> specimensWithoutObservations = getSpecimenIdsWithoutObservation(specimens, observations);
@@ -229,12 +230,11 @@ private List<Observation> addDummyObservationsToObservationList(
229230
Observation dummyObservation = generateDefaultObservation(diagnosticReport);
230231
Reference specimenReference = new Reference(specimenWithoutObservations);
231232
dummyObservation.setSpecimen(specimenReference);
232-
dummyObservations.add(dummyObservation);
233+
completeObservations.add(dummyObservation);
233234
}
234235
}
235236

236-
observations.addAll(dummyObservations);
237-
return observations;
237+
return completeObservations;
238238
}
239239

240240
private List<String> getSpecimenIdsWithoutObservation(List<Specimen> specimens, List<Observation> observations) {

0 commit comments

Comments
 (0)