diff --git a/doc/json/primary-emergency-fhir-result.json b/doc/json/primary-emergency-fhir-result.json
index 967fa5ee..a968aa0a 100644
--- a/doc/json/primary-emergency-fhir-result.json
+++ b/doc/json/primary-emergency-fhir-result.json
@@ -828,8 +828,8 @@
       "verificationStatus": "unknown",
       "code": {
         "coding": [ {
-          "system": "22298006",
-          "code": "2.16.840.1.113883.2.1.3.2.4.15",
+          "system": "2.16.840.1.113883.2.1.3.2.4.15",
+          "code": "22298006",
           "display": "Myocardial infarction"
         } ]
       },
diff --git a/service/src/integration-test/resources/json/primary-emergency-fhir-result.json b/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
index 967fa5ee..a968aa0a 100644
--- a/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
+++ b/service/src/integration-test/resources/json/primary-emergency-fhir-result.json
@@ -828,8 +828,8 @@
       "verificationStatus": "unknown",
       "code": {
         "coding": [ {
-          "system": "22298006",
-          "code": "2.16.840.1.113883.2.1.3.2.4.15",
+          "system": "2.16.840.1.113883.2.1.3.2.4.15",
+          "code": "22298006",
           "display": "Myocardial infarction"
         } ]
       },
diff --git a/service/src/main/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtil.java b/service/src/main/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtil.java
index a8a0f2de..c2a95304 100644
--- a/service/src/main/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtil.java
+++ b/service/src/main/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtil.java
@@ -12,9 +12,9 @@ public class CodeUtil {
     public static CodeableConcept createCodeableConceptList(CE ce) {
         CodeableConcept codeableConcept = new CodeableConcept();
         Coding coding = new Coding();
-        coding.setCode(ce.getCodeSystem());
+        coding.setCode(ce.getCode());
         coding.setDisplay(ce.getDisplayName());
-        coding.setSystem(ce.getCode());
+        coding.setSystem(ce.getCodeSystem());
         codeableConcept.addCoding(coding);
 
         return codeableConcept;
diff --git a/service/src/test/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtilTest.java b/service/src/test/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtilTest.java
index b281444a..81f755d4 100644
--- a/service/src/test/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtilTest.java
+++ b/service/src/test/java/uk/nhs/adaptors/oneoneone/cda/report/util/CodeUtilTest.java
@@ -24,9 +24,14 @@ public void shouldCreateCodeableConcept() {
         when(ce.getCodeSystem()).thenReturn(codeSystem);
         when(ce.getCode()).thenReturn(code);
         when(ce.getDisplayName()).thenReturn(displayName);
+
         CodeableConcept codeableConcept = CodeUtil.createCodeableConceptList(ce);
-        assertThat(codeableConcept.getCoding().get(0).getCode()).isEqualTo(codeSystem);
-        assertThat(codeableConcept.getCoding().get(0).getDisplay()).isEqualTo(displayName);
-        assertThat(codeableConcept.getCoding().get(0).getSystem()).isEqualTo(code);
+
+        assertThat(codeableConcept.getCoding().getFirst().getCode())
+            .isEqualTo(code);
+        assertThat(codeableConcept.getCoding().getFirst().getDisplay())
+            .isEqualTo(displayName);
+        assertThat(codeableConcept.getCoding().getFirst().getSystem())
+            .isEqualTo(codeSystem);
     }
 }