NIAD-3304: Fix issue with ordering of originalText when mapping to CD XML

MartinWheelerMT · MartinWheelerMT · commit 7c44bc2f2a87 · 2025-03-21T10:24:37.000Z
* Update `CodeableConceptCdMapper` to create a new coding element for legacy codes, to avoid modifying an element whilst iterating a list.
diff --git a/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java b/service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java
@@ -322,8 +322,7 @@ private List<Coding> getNonSnomedCodeCodings(CodeableConcept codeableConcept) {
         for (Coding coding : nonSnomedCodeCodings) {
             var hl7CodeSystem = CodeSystemsUtil.getHl7code(coding.getSystem());
             if (!hl7CodeSystem.isEmpty()) {
-                coding.setSystem(hl7CodeSystem);
-                nonSnomedCodings.add(coding);
+                nonSnomedCodings.add(new Coding(hl7CodeSystem, coding.getCode(), coding.getDisplay()));
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,7 @@ private List<Coding> getNonSnomedCodeCodings(CodeableConcept codeableConcept) {`
`322`	`322`	`for (Coding coding : nonSnomedCodeCodings) {`
`323`	`323`	`var hl7CodeSystem = CodeSystemsUtil.getHl7code(coding.getSystem());`
`324`	`324`	`if (!hl7CodeSystem.isEmpty()) {`
`325`		`- coding.setSystem(hl7CodeSystem);`
`326`		`- nonSnomedCodings.add(coding);`
	`325`	`+ nonSnomedCodings.add(new Coding(hl7CodeSystem, coding.getCode(), coding.getDisplay()));`
`327`	`326`	`}`
`328`	`327`	`}`
`329`	`328`