NIAD-3218: Fix malformed ehrSupplyDiscontinue / pertinentInformation / pertinentSupplyAnnotation (#965)

* Fix malformed ehrSupplyDiscontinue / pertinentInformation / pertinentSupplyAnnotation

When a MedicationRequest didn't have reason text to provide, we were
providing an invalid code element within the pertinentSupplyInformation.

This is invalid according to the spec.

Instead, move the nullFlavor annotation to the pertinentSupplyAnnotation
where it is valid.

* Remove stopped reason from "Pro-Cal shot neutral" medication

Prescribed on 28th March 2019.
Stopped on 10th May 2019.

Author: Adrian Clay

CHANGELOG.md

@@ -25,6 +25,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * When mapping `Immunizations` which contain a `NOPAT` `meta.security` tag, the resultant XML for that resource
   will contain a `NOPAT` `confidentialityCode` element.
 
+### Fixed
+
+* Fix a malformed XML GP2GP message created when mapping a `MedicationRequest` with `intent` of `plan` and is stopped,
+  but no free text reason for the discontinuation was provided.  
+
 ## [2.1.2] - 2014-10-21
 
 ### Fixed

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

@@ -60,8 +60,8 @@
                     </priorMedicationRef>
                 </reversalOf>
                 <pertinentInformation typeCode="PERT">
-                    <pertinentSupplyAnnotation classCode="OBS" moodCode="EVN">
-                        {{#ehrSupplyDiscontinueReasonText}}<text>{{{ehrSupplyDiscontinueReasonText}}}</text>{{/ehrSupplyDiscontinueReasonText}}{{^ehrSupplyDiscontinueReasonText}}<code nullFlavor="UNK"><text>Stopped</text></code>{{/ehrSupplyDiscontinueReasonText}}
+                    <pertinentSupplyAnnotation classCode="OBS" moodCode="EVN"{{^ehrSupplyDiscontinueReasonText}} nullFlavor="UNK"{{/ehrSupplyDiscontinueReasonText}}>
+                        {{#ehrSupplyDiscontinueReasonText}}<text>{{{ehrSupplyDiscontinueReasonText}}}</text>{{/ehrSupplyDiscontinueReasonText}}{{^ehrSupplyDiscontinueReasonText}}<text>Stopped</text>{{/ehrSupplyDiscontinueReasonText}}
                     </pertinentSupplyAnnotation>
                 </pertinentInformation>
             </ehrSupplyDiscontinue>

service/src/test/resources/ehr/mapper/medication_request/medication-statement-with-authorise-default-status-reason-code.xml

@@ -48,8 +48,8 @@
                     </priorMedicationRef>
                 </reversalOf>
                 <pertinentInformation typeCode="PERT">
-                    <pertinentSupplyAnnotation classCode="OBS" moodCode="EVN">
-                        <code nullFlavor="UNK"><text>Stopped</text></code>
+                    <pertinentSupplyAnnotation classCode="OBS" moodCode="EVN" nullFlavor="UNK">
+                        <text>Stopped</text>
                     </pertinentSupplyAnnotation>
                 </pertinentInformation>
             </ehrSupplyDiscontinue>

wiremock/stubs/__files/EMISPatientStructurede2eResponsePWTP3.json

@@ -1150,12 +1150,6 @@
                     {
                         "url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-CareConnect-GPC-MedicationStatusReason-1",
                         "extension": [
-                            {
-                                "url": "statusReason",
-                                "valueCodeableConcept": {
-                                    "text": "Expired"
-                                }
-                            },
                             {
                                 "url": "statusChangeDate",
                                 "valueDateTime": "2019-05-10T02:00:09.943+01:00"