Skip to content

Commit 4f29a4f

Browse files
MartinWheelerMTMartinWheelerMT
authored
Merge branch 'main' into release-2.2.2
2 parents ba177e4 + e1bb8f0 commit 4f29a4f

File tree

46 files changed

+272
-167
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+272
-167
lines changed

‎CHANGELOG.md‎

Lines changed: 2 additions & 2 deletions

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</reversalOf>
6262
<pertinentInformation typeCode="PERT">
6363
<pertinentSupplyAnnotation classCode="OBS" moodCode="EVN"{{^ehrSupplyDiscontinueReasonText}} nullFlavor="UNK"{{/ehrSupplyDiscontinueReasonText}}>
64-
{{#ehrSupplyDiscontinueReasonText}}<text>{{{ehrSupplyDiscontinueReasonText}}}</text>{{/ehrSupplyDiscontinueReasonText}}{{^ehrSupplyDiscontinueReasonText}}<text>Stopped</text>{{/ehrSupplyDiscontinueReasonText}}
64+
{{#ehrSupplyDiscontinueReasonText}}<text>{{ehrSupplyDiscontinueReasonText}}</text>{{/ehrSupplyDiscontinueReasonText}}{{^ehrSupplyDiscontinueReasonText}}<text>Stopped</text>{{/ehrSupplyDiscontinueReasonText}}
6565
</pertinentSupplyAnnotation>
6666
</pertinentInformation>
6767
</ehrSupplyDiscontinue>

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

Lines changed: 61 additions & 164 deletions
Large diffs are not rendered by default.

‎service/src/test/resources/ehr/mapper/medication_request/medication-request-special-character-in-code.json‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
{
2+
"resourceType":"MedicationRequest",
3+
"id":"3377543D-5B1B-4C4F-BFF6-9F7BC3A1C3B8",
4+
"meta":{
5+
"profile":[
6+
"https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-MedicationRequest-1"
7+
]
8+
},
9+
"extension":[
10+
{
11+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-CareConnect-GPC-MedicationStatusReason-1",
12+
"extension": [
13+
{
14+
"url": "statusReason",
15+
"valueCodeableConcept": {
16+
"text": "<<Test Code Text>>"
17+
}
18+
},
19+
{
20+
"url": "statusChangeDate",
21+
"valueDateTime": "2010-01-18T14:33:16.397+00:00"
22+
}
23+
]
24+
},
25+
{
26+
"url": "https://fhir.nhs.uk/STU3/StructureDefinition/Extension-CareConnect-GPC-PrescriptionType-1",
27+
"valueCodeableConcept": {
28+
"coding": [
29+
{
30+
"system": "https://fhir.nhs.uk/STU3/CodeSystem/CareConnect-PrescriptionType-1",
31+
"code": "acute",
32+
"display": "Acute"
33+
}
34+
]
35+
}
36+
}
37+
],
38+
"authoredOn": "2021-01-01T00:00:00+00:00",
39+
"status": "stopped",
40+
"intent": "plan",
41+
"dispenseRequest":{
42+
"validityPeriod":{
43+
"start": "2021-01-01T00:00:00+00:00",
44+
"end": "2021-02-01T00:00:00+00:00"
45+
}
46+
},
47+
"medicationReference":{
48+
"reference": "Medication/20"
49+
},
50+
"dosageInstruction":[
51+
{
52+
"text": "<<Test Dosage Text>>",
53+
"patientInstruction": "<<Test Patient Instruction>>"
54+
}
55+
],
56+
"recorder":{
57+
"reference": "Organization/2"
58+
},
59+
"basedOn": [
60+
{
61+
"reference": "MedicationRequest/D66D84C9-C073-4EDF-8C2C-F309A83C3DC7"
62+
}
63+
]
64+
}

‎service/src/test/resources/ehr/mapper/medication_request/medication-statement-with-xml-escaped-text-values.xml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
<component typeCode="COMP">
2+
<MedicationStatement classCode="SBADM" moodCode="INT">
3+
<id root="394559384658936"/>
4+
<statusCode code="COMPLETE"/>
5+
<effectiveTime>
6+
<low value="20210101000000"/><high value="20210201000000"/>
7+
</effectiveTime>
8+
<availabilityTime value="20210101000000"/>
9+
<consumable typeCode="CSM">
10+
<manufacturedProduct classCode="MANU">
11+
<manufacturedMaterial determinerCode="KIND" classCode="MMAT">
12+
<code code="430127000" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" displayName="Oral Form Oxycodone (product)">
13+
</code>
14+
</manufacturedMaterial>
15+
</manufacturedProduct>
16+
</consumable>
17+
<component typeCode="COMP">
18+
<ehrSupplyAuthorise>
19+
<id root="394559384658936"/>
20+
<code code="394823007" displayName="NHS Prescription" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"/>
21+
<statusCode code="COMPLETE"/>
22+
<effectiveTime>
23+
<low value="20210101000000"/><high value="20210201000000"/>
24+
</effectiveTime>
25+
<availabilityTime value="20210101000000"/>
26+
<repeatNumber value="0"/>
27+
<quantity value="1" unit="1">
28+
<translation value="1">
29+
<originalText>Unk UoM</originalText>
30+
</translation>
31+
</quantity>
32+
<pertinentInformation typeCode="PERT">
33+
<pertinentSupplyAnnotation>
34+
<text>Patient Instruction: &lt;&lt;Test Patient Instruction&gt;&gt;</text>
35+
</pertinentSupplyAnnotation>
36+
</pertinentInformation>
37+
</ehrSupplyAuthorise>
38+
</component>
39+
<component typeCode="COMP">
40+
<ehrSupplyDiscontinue classCode="SPLY" moodCode="RQO">
41+
<id root="394559384658936"/>
42+
<code nullFlavor="UNK">
43+
<originalText>&lt;&lt;Test Code Text&gt;&gt;</originalText>
44+
</code>
45+
<statusCode code="COMPLETE"/>
46+
<availabilityTime value="20100118143316"/>
47+
<reversalOf typeCode="REV">
48+
<priorMedicationRef moodCode="ORD" classCode="SBADM">
49+
<id root="394559384658936"/>
50+
</priorMedicationRef>
51+
</reversalOf>
52+
<pertinentInformation typeCode="PERT">
53+
<pertinentSupplyAnnotation classCode="OBS" moodCode="EVN">
54+
<text>&lt;&lt;Test Code Text&gt;&gt;</text>
55+
</pertinentSupplyAnnotation>
56+
</pertinentInformation>
57+
</ehrSupplyDiscontinue>
58+
</component>
59+
<pertinentInformation typeCode="PERT">
60+
<pertinentMedicationDosage classCode="SBADM" moodCode="RMD">
61+
<text>&lt;&lt;Test Dosage Text&gt;&gt;</text>
62+
</pertinentMedicationDosage>
63+
</pertinentInformation>
64+
<Participant typeCode="AUT" contextControlCode="OP">
65+
<agentRef classCode="AGNT">
66+
<id root="394559384658936"/>
67+
</agentRef>
68+
</Participant>
69+
</MedicationStatement>
70+
</component>

service/src/test/resources/ehr/mapper/medication_request/medication-request-empty-prescribing-agency-coding-array.json renamed to service/src/test/resources/ehr/mapper/medication_request/mr-empty-prescribing-agency-coding-array.json

File renamed without changes.

service/src/test/resources/ehr/mapper/medication_request/medication-request-missing-prescribing-agency-codeable-concept.json renamed to service/src/test/resources/ehr/mapper/medication_request/mr-missing-prescribing-agency-codeable-concept.json

File renamed without changes.

service/src/test/resources/ehr/mapper/medication_request/medication-request-prescribed-by-another-organisation.json renamed to service/src/test/resources/ehr/mapper/medication_request/mr-prescribed-by-another-organisation.json

File renamed without changes.

service/src/test/resources/ehr/mapper/medication_request/medication-request-prescribed-by-gp-practice.json renamed to service/src/test/resources/ehr/mapper/medication_request/mr-prescribed-by-gp-practice.json

File renamed without changes.

service/src/test/resources/ehr/mapper/medication_request/medication-request-prescribed-by-previous-practice.json renamed to service/src/test/resources/ehr/mapper/medication_request/mr-prescribed-by-previous-practice.json

File renamed without changes.

0 commit comments

Comments
 (0)