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

* Update CD template to ensure that `originalText` is always populated first.
* Update tests to reflect the ordering change

Author: MartinWheelerMT

service/src/main/resources/templates/codeable_concept_cd_template.mustache

@@ -1,8 +1,8 @@
 <code{{#nullFlavor}} nullFlavor="UNK"{{/nullFlavor}}{{^nullFlavor}} code="{{mainCode}}" codeSystem="{{mainCodeSystem}}" displayName="{{mainDisplayName}}"{{/nullFlavor}}>
+    {{#mainOriginalText}}
+        <originalText>{{mainOriginalText}}</originalText>
+    {{/mainOriginalText}}
     {{#translations}}
     <translation code="{{code}}" codeSystem="{{system}}" displayName="{{display}}" />
     {{/translations}}
-    {{#mainOriginalText}}
-    <originalText>{{mainOriginalText}}</originalText>
-    {{/mainOriginalText}}
 </code>

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapperTest.java

@@ -351,9 +351,9 @@ void When_WithSnomedCodingAndLegacyCodings_Expect_SnomedCdXmlWithTranslations()
                 }""";
             var expectedOutput = """
                 <code code="852471000000107" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Prothrombin time">
+                    <originalText>Prothrombin time</originalText>
                     <translation code="42Q5.00" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="Observed Prothrombin time" />
                     <translation code="123456" codeSystem="2.16.840.1.113883.2.1.3.2.4.14" displayName="Prothrombin time (observed)" />
-                    <originalText>Prothrombin time</originalText>
                 </code>""";
             var codeableConcept = fhirParseService.parseResource(inputJson, Observation.class).getCode();
 

service/src/test/resources/ehr/mapper/blood_pressure/blood-pressure-with-codeable-concepts.xml

@@ -2,8 +2,8 @@
     <CompoundStatement classCode="BATTERY" moodCode="EVN">
         <id root="5E496953-065B-41F2-9577-BE8F2FBD0757"/>
         <code code="852471000000107" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Prothrombin time">
-            <translation code="42Q5.00" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="Prothrombin time" />
             <originalText>Prothrombin time</originalText>
+            <translation code="42Q5.00" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="Prothrombin time" />
         </code>
         <statusCode code="COMPLETE"/>
         <effectiveTime>
@@ -14,8 +14,8 @@
             <ObservationStatement classCode="OBS" moodCode="EVN">
                 <id root="5E496953-065B-41F2-9577-BE8F2FBD0757"/>
                 <code code="72313002" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Systolic arterial pressure">
-                    <translation code="2469" codeSystem="2.16.840.1.113883.2.1.6.3" displayName="Systolic arterial pressure" />
                     <originalText>Systolic arterial pressure</originalText>
+                    <translation code="2469" codeSystem="2.16.840.1.113883.2.1.6.3" displayName="Systolic arterial pressure" />
                 </code>
                 <statusCode code="COMPLETE"/>
                 <effectiveTime>
@@ -36,8 +36,8 @@
             <ObservationStatement classCode="OBS" moodCode="EVN">
                 <id root="5E496953-065B-41F2-9577-BE8F2FBD0757"/>
                 <code code="1091811000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Diastolic arterial pressure">
-                    <translation code="246A" codeSystem="2.16.840.1.113883.2.1.6.3" displayName="Diastolic arterial pressure" />
                     <originalText>Diastolic arterial pressure</originalText>
+                    <translation code="246A" codeSystem="2.16.840.1.113883.2.1.6.3" displayName="Diastolic arterial pressure" />
                 </code>
                 <statusCode code="COMPLETE"/>
                 <effectiveTime>

service/src/test/resources/ehr/mapper/codeableconcept/allergyActive/allergy_with_snomed_and_non_snomed_codes_in_coding_with_text.xml

@@ -1,5 +1,5 @@
 <code code="292971006" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Pivampicillin adverse reaction pt">
+    <originalText>Pivampicillin adverse reaction (rt)</originalText>
     <translation code="TJ00800" codeSystem="2.16.840.1.113883.2.1.6.2" displayName="Adverse reaction to pivampicillin pt" />
     <translation code="TJ00800-1" codeSystem="2.16.840.1.113883.2.1.3.2.4.14" displayName="Adverse reaction to pivampicillin" />
-    <originalText>Pivampicillin adverse reaction (rt)</originalText>
 </code>