schema adjustments (#1178)

Author: ORybak5

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

@@ -110,9 +110,9 @@ private String map() {
                 .requestStatementId(idMapper.getOrNew(ResourceType.ReferralRequest, referralRequest.getIdElement()))
                 .isNested(isNested)
                 .availabilityTime(StatementTimeMappingUtils.prepareAvailabilityTime(referralRequest.getAuthoredOnElement()))
-                .confidentialityCode(confidentialityCode.orElse(null))
                 .text(buildTextDescription())
                 .priorityCode(buildPriorityCode())
+                .confidentialityCode(confidentialityCode.orElse(null))
                 .code(buildCode());
 
             if (referralRequest.hasRecipient()) {

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

@@ -10,12 +10,12 @@
             <center nullFlavor="NI"/>
         </effectiveTime>
         {{{availabilityTime}}}
-        {{#confidentialityCode}}
-            {{{confidentialityCode}}}
-        {{/confidentialityCode}}
         {{#priorityCode}}
         {{{priorityCode}}}
         {{/priorityCode}}
+        {{#confidentialityCode}}
+            {{{confidentialityCode}}}
+        {{/confidentialityCode}}
         {{#responsibleParty}}
         <responsibleParty typeCode="RESP">
             <agentRef classCode="AGNT">