3333
3434import uk .nhs .adaptors .gp2gp .common .service .ConfidentialityService ;
3535import uk .nhs .adaptors .gp2gp .common .service .RandomIdGeneratorService ;
36- import uk .nhs .adaptors .gp2gp .ehr .mapper .*;
36+ import uk .nhs .adaptors .gp2gp .ehr .mapper .CommentType ;
37+ import uk .nhs .adaptors .gp2gp .ehr .mapper .IdMapper ;
38+ import uk .nhs .adaptors .gp2gp .ehr .mapper .MessageContext ;
39+ import uk .nhs .adaptors .gp2gp .ehr .mapper .ParticipantMapper ;
40+ import uk .nhs .adaptors .gp2gp .ehr .mapper .ParticipantType ;
41+ import uk .nhs .adaptors .gp2gp .ehr .mapper .InputBundle ;
3742import uk .nhs .adaptors .gp2gp .ehr .mapper .parameters .diagnosticreport .DiagnosticReportCompoundStatementTemplateParameters ;
3843import uk .nhs .adaptors .gp2gp .ehr .mapper .parameters .diagnosticreport .NarrativeStatementTemplateParameters ;
3944import uk .nhs .adaptors .gp2gp .ehr .utils .CodeableConceptMappingUtils ;
@@ -74,7 +79,8 @@ public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnostic
7479 final IdMapper idMapper = messageContext .getIdMapper ();
7580 markObservationsAsProcessed (idMapper , initialObservations );
7681
77- final List <Observation > processedObservations = assignDummySpecimensToOrphanedTestResults (initialObservations , specimens , diagnosticReport );
82+ final List <Observation > processedObservations =
83+ assignDummySpecimensToOrphanedTestResults (initialObservations , specimens );
7884
7985 String mappedSpecimens = specimens .stream ()
8086 .map (specimen -> specimenMapper .mapSpecimenToCompoundStatement (specimen , processedObservations , diagnosticReport ))
@@ -140,7 +146,8 @@ private boolean hasOrphanedTestResults(List<Observation> observations) {
140146 .anyMatch (observation -> !observation .hasSpecimen ());
141147 }
142148
143- private List <Observation > assignDummySpecimensToOrphanedTestResults (List <Observation > observations , List <Specimen > specimens , DiagnosticReport diagnosticReport ) {
149+ private List <Observation > assignDummySpecimensToOrphanedTestResults (
150+ List <Observation > observations , List <Specimen > specimens ) {
144151
145152 if (!hasOrphanedTestResults (observations )) {
146153 return observations ;
@@ -154,7 +161,7 @@ private List<Observation> assignDummySpecimensToOrphanedTestResults(List<Observa
154161 Reference dummySpecimenReference = new Reference (dummySpecimen .getId ());
155162
156163 for (Observation observation : observations ) {
157- if (!observation .hasSpecimen ()){
164+ if (!observation .hasSpecimen ()) {
158165 observation .setSpecimen (dummySpecimenReference );
159166 }
160167 }
0 commit comments