Skip to content

Commit 8eb3a83

Browse files
ryma2fhirryma2fhir
authored
Merge pull request #536 from NHSDigital/allLanguages
set to allLanguages and made required
2 parents b75b5a3 + 73b9b39 commit 8eb3a83

4 files changed

Lines changed: 151 additions & 154 deletions

File tree

‎examples/UKCore-Patient-RichardSmith-Example.xml‎

Lines changed: 144 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -1,141 +1,146 @@
11
<Patient xmlns="http://hl7.org/fhir">
2-
<id value="UKCore-Patient-RichardSmith-Example"/>
3-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory">
4-
<valueCodeableConcept>
5-
<coding>
6-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-EthnicCategoryEngland"/>
7-
<code value="G"/>
8-
<display value="Mixed - Any other mixed background"/>
9-
</coding>
10-
</valueCodeableConcept>
11-
</extension>
12-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference">
13-
<extension url="PreferredContactMethod">
14-
<valueCodeableConcept>
15-
<coding>
16-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod"/>
17-
<code value="3"/>
18-
<display value="Telephone"/>
19-
</coding>
20-
</valueCodeableConcept>
21-
</extension>
22-
<extension url="PreferredContactTimes">
23-
<valueTiming>
24-
<repeat>
25-
<frequency value="1"/>
26-
<period value="1"/>
27-
<periodUnit value="d"/>
28-
<dayOfWeek value="mon"/>
29-
<dayOfWeek value="wed"/>
30-
<dayOfWeek value="fri"/>
31-
<when value="MORN"/>
32-
</repeat>
33-
</valueTiming>
34-
</extension>
35-
<extension url="PreferredWrittenCommunicationFormat">
36-
<valueCodeableConcept>
37-
<coding>
38-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredWrittenCommunicationFormat"/>
39-
<code value="11"/>
40-
<display value="Large print"/>
41-
</coding>
42-
</valueCodeableConcept>
43-
</extension>
44-
</extension>
45-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus">
46-
<extension url="deathNotificationStatus">
47-
<valueCodeableConcept>
48-
<coding>
49-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DeathNotificationStatus"/>
50-
<code value="U"/>
51-
<display value="Removed"/>
52-
</coding>
53-
</valueCodeableConcept>
54-
</extension>
55-
<extension url="systemEffectiveDate">
56-
<valueDateTime value="2019-08-01T00:00:00.000Z"/>
57-
</extension>
58-
</extension>
59-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ResidentialStatus">
60-
<valueCodeableConcept>
61-
<coding>
62-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-ResidentialStatus"/>
63-
<code value="H"/>
64-
<display value="UK Resident"/>
65-
</coding>
66-
</valueCodeableConcept>
67-
</extension>
68-
<identifier>
69-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus">
70-
<valueCodeableConcept>
71-
<coding>
72-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-NHSNumberVerificationStatusEngland"/>
73-
<code value="01"/>
74-
<display value="Number present and verified"/>
75-
</coding>
76-
</valueCodeableConcept>
77-
</extension>
78-
<system value="https://fhir.nhs.uk/Id/nhs-number"/>
79-
<value value="9912003888"/>
80-
</identifier>
81-
<name>
82-
<use value="official"/>
83-
<family value="SMITH"/>
84-
<given value="Richard"/>
85-
</name>
86-
<telecom>
87-
<system value="phone"/>
88-
<value value="01131231234"/>
89-
</telecom>
90-
<gender value="male"/>
91-
<birthDate value="1970-09-11"/>
92-
<address>
93-
<line value="4 Sandmoor Drive"/>
94-
<city value="LEEDS"/>
95-
<postalCode value="LS17 7DF"/>
96-
</address>
97-
<contact>
98-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank">
99-
<valuePositiveInt value="1"/>
100-
</extension>
101-
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator">
102-
<valueBoolean value="true"/>
103-
</extension>
104-
<relationship>
105-
<coding>
106-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole"/>
107-
<code value="Personal"/>
108-
<display value="Personal relationship with the patient"/>
109-
</coding>
110-
</relationship>
111-
<name>
112-
<use value="official"/>
113-
<text value="JACKSON Jane (Miss)"/>
114-
<family value="Jackson"/>
115-
<given value="Jane"/>
116-
<prefix value="Miss"/>
117-
</name>
118-
<telecom>
119-
<system value="phone"/>
120-
<value value="07777123123"/>
121-
<use value="mobile"/>
122-
</telecom>
123-
<address>
124-
<use value="home"/>
125-
<type value="physical"/>
126-
<line value="5 Alwoodley Road"/>
127-
<city value="LEEDS"/>
128-
<postalCode value="LS17 6EH"/>
129-
</address>
130-
<gender value="female"/>
131-
</contact>
132-
<communication>
133-
<language>
134-
<coding>
135-
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-HumanLanguage"/>
136-
<code value="en"/>
137-
<display value="English"/>
138-
</coding>
139-
</language>
140-
</communication>
2+
<id value="UKCore-Patient-RichardSmith-Example" />
3+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-EthnicCategory">
4+
<valueCodeableConcept>
5+
<coding>
6+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-EthnicCategoryEngland" />
7+
<code value="G" />
8+
<display value="Mixed - Any other mixed background" />
9+
</coding>
10+
</valueCodeableConcept>
11+
</extension>
12+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactPreference">
13+
<extension url="PreferredContactMethod">
14+
<valueCodeableConcept>
15+
<coding>
16+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod" />
17+
<code value="3" />
18+
<display value="Telephone" />
19+
</coding>
20+
</valueCodeableConcept>
21+
</extension>
22+
<extension url="PreferredContactTimes">
23+
<valueTiming>
24+
<repeat>
25+
<frequency value="1" />
26+
<period value="1" />
27+
<periodUnit value="d" />
28+
<dayOfWeek value="mon" />
29+
<dayOfWeek value="wed" />
30+
<dayOfWeek value="fri" />
31+
<when value="MORN" />
32+
</repeat>
33+
</valueTiming>
34+
</extension>
35+
<extension url="PreferredWrittenCommunicationFormat">
36+
<valueCodeableConcept>
37+
<coding>
38+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredWrittenCommunicationFormat" />
39+
<code value="11" />
40+
<display value="Large print" />
41+
</coding>
42+
</valueCodeableConcept>
43+
</extension>
44+
</extension>
45+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus">
46+
<extension url="deathNotificationStatus">
47+
<valueCodeableConcept>
48+
<coding>
49+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DeathNotificationStatus" />
50+
<code value="U" />
51+
<display value="Removed" />
52+
</coding>
53+
</valueCodeableConcept>
54+
</extension>
55+
<extension url="systemEffectiveDate">
56+
<valueDateTime value="2019-08-01T00:00:00.000Z" />
57+
</extension>
58+
</extension>
59+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ResidentialStatus">
60+
<valueCodeableConcept>
61+
<coding>
62+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-ResidentialStatus" />
63+
<code value="H" />
64+
<display value="UK Resident" />
65+
</coding>
66+
</valueCodeableConcept>
67+
</extension>
68+
<identifier>
69+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-NHSNumberVerificationStatus">
70+
<valueCodeableConcept>
71+
<coding>
72+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-NHSNumberVerificationStatusEngland" />
73+
<code value="01" />
74+
<display value="Number present and verified" />
75+
</coding>
76+
</valueCodeableConcept>
77+
</extension>
78+
<system value="https://fhir.nhs.uk/Id/nhs-number" />
79+
<value value="9912003888" />
80+
</identifier>
81+
<name>
82+
<use value="official" />
83+
<family value="SMITH" />
84+
<given value="Richard" />
85+
</name>
86+
<telecom>
87+
<system value="phone" />
88+
<value value="01131231234" />
89+
</telecom>
90+
<gender value="male" />
91+
<birthDate value="1970-09-11" />
92+
<address>
93+
<line value="4 Sandmoor Drive" />
94+
<city value="LEEDS" />
95+
<postalCode value="LS17 7DF" />
96+
</address>
97+
<contact>
98+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-ContactRank">
99+
<valuePositiveInt value="1" />
100+
</extension>
101+
<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-CopyCorrespondenceIndicator">
102+
<valueBoolean value="true" />
103+
</extension>
104+
<relationship>
105+
<coding>
106+
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-AdditionalPersonRelationshipRole" />
107+
<code value="Personal" />
108+
<display value="Personal relationship with the patient" />
109+
</coding>
110+
</relationship>
111+
<name>
112+
<use value="official" />
113+
<text value="JACKSON Jane (Miss)" />
114+
<family value="Jackson" />
115+
<given value="Jane" />
116+
<prefix value="Miss" />
117+
</name>
118+
<telecom>
119+
<system value="phone" />
120+
<value value="07777123123" />
121+
<use value="mobile" />
122+
</telecom>
123+
<address>
124+
<use value="home" />
125+
<type value="physical" />
126+
<line value="5 Alwoodley Road" />
127+
<city value="LEEDS" />
128+
<postalCode value="LS17 6EH" />
129+
</address>
130+
<gender value="female" />
131+
</contact>
132+
<communication>
133+
<language>
134+
<coding>
135+
<system value="urn:ietf:bcp:47" />
136+
<code value="bfi" />
137+
<display value="British Sign Language" />
138+
</coding>
139+
<coding>
140+
<system value="http://snomed.info/sct" />
141+
<code value="703963007" />
142+
<display value="Makaton vocabulary" />
143+
</coding>
144+
</language>
145+
</communication>
141146
</Patient>

‎structuredefinitions/UKCore-HealthcareService.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
<element id="HealthcareService.communication">
4646
<path value="HealthcareService.communication" />
4747
<binding>
48-
<strength value="extensible" />
48+
<strength value="required" />
4949
<description value="A ValueSet that identifies the language used by a person." />
50-
<valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
50+
<valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
5151
</binding>
5252
</element>
5353
</differential>
54-
</StructureDefinition>
54+
</StructureDefinition>

‎structuredefinitions/UKCore-Patient.xml‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,6 @@
8181
<profile value="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-DeathNotificationStatus" />
8282
</type>
8383
</element>
84-
<element id="Patient.extension:deathNotificationStatus.extension">
85-
<path value="Patient.extension.extension" />
86-
<min value="1" />
87-
</element>
8884
<element id="Patient.extension:ethnicCategory">
8985
<path value="Patient.extension" />
9086
<sliceName value="ethnicCategory" />
@@ -242,10 +238,6 @@
242238
</type>
243239
<mustSupport value="false" />
244240
</element>
245-
<element id="Patient.address.extension:addressKey.extension">
246-
<path value="Patient.address.extension.extension" />
247-
<min value="2" />
248-
</element>
249241
<element id="Patient.address.line">
250242
<path value="Patient.address.line" />
251243
<mustSupport value="true" />
@@ -329,9 +321,9 @@
329321
<short value="A ValueSet that identifies the language used by a person." />
330322
<definition value="A ValueSet that identifies the language used by a person." />
331323
<binding>
332-
<strength value="extensible" />
324+
<strength value="required" />
333325
<description value="A ValueSet that identifies the language used by a person." />
334-
<valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
326+
<valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
335327
</binding>
336328
</element>
337329
</differential>

‎structuredefinitions/UKCore-Practitioner.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@
6666
<element id="Practitioner.communication">
6767
<path value="Practitioner.communication" />
6868
<binding>
69-
<strength value="extensible" />
69+
<strength value="required" />
7070
<description value="A ValueSet that identifies the language used by a person." />
71-
<valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-HumanLanguage" />
71+
<valueSet value="http://hl7.org/fhir/ValueSet/all-languages" />
7272
</binding>
7373
</element>
7474
</differential>

0 commit comments

Comments
 (0)