Skip to content

Commit 8f7795c

Browse files
Update CodeableConceptCdMapper to not include non snomed codes with an unknown code system
1 parent 6a99d4e commit 8f7795c

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package uk.nhs.adaptors.gp2gp.ehr.mapper;
22

3+
import java.util.ArrayList;
34
import java.util.Collections;
45
import java.util.List;
56
import java.util.Optional;
@@ -314,15 +315,18 @@ private List<Coding> getNonSnomedCodeCodings(CodeableConcept codeableConcept) {
314315
var nonSnomedCodeCodings = codeableConcept.getCoding()
315316
.stream()
316317
.filter(coding -> !isSnomed(coding))
317-
.filter(coding -> !CodeSystemsUtil.getHl7code(coding.getSystem()).isEmpty())
318318
.toList();
319319

320+
List<Coding> nonSnomedCodes = new ArrayList<>();
321+
320322
for (Coding coding : nonSnomedCodeCodings) {
321323
var hl7CodeSystem = CodeSystemsUtil.getHl7code(coding.getSystem());
322-
coding.setSystem(hl7CodeSystem);
324+
if (!hl7CodeSystem.isEmpty()) {
325+
nonSnomedCodes.add(new Coding(hl7CodeSystem, coding.getCode(), coding.getDisplay()));
326+
}
323327
}
324328

325-
return nonSnomedCodeCodings;
329+
return nonSnomedCodes;
326330
}
327331

328332
private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optional<Coding> coding) {

0 commit comments

Comments
 (0)