Skip to content

Commit b5e71cc

Browse files
omarisgreatomarisgreat
committed
Changes to StructureDefinition targets
And changes to examples for validation against genomic StructureDefinitions
1 parent c357e16 commit b5e71cc

19 files changed

Lines changed: 512 additions & 167 deletions

‎AdditionalFolders/ValueSet/.gitignore‎

Whitespace-only changes.

‎Bundle/UKCore-Bundle-MichaelJonesRequest-Example_v3_message.json‎

Lines changed: 11 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
"resourceType": "MessageHeader",
1515
"id": "a4409d7c-b613-477c-b623-87e60406c2f0",
1616
"eventCoding": {
17-
"system": "https://fhir.nhs.uk/CodeSystem/message-event",
18-
"code": "patient",
19-
"display": "Patient Demographics"
17+
"system": "https://fhir.nhs.uk/CodeSystem/message-events-genomics",
18+
"code": "genomictestrequest",
19+
"display": "Genomic Test Request"
2020
},
2121
"destination": [
2222
{
@@ -67,7 +67,6 @@
6767
"value": "999999"
6868
}
6969
],
70-
"active": true,
7170
"name": [
7271
{
7372
"use": "official",
@@ -77,38 +76,6 @@
7776
"Mary"
7877
]
7978
}
80-
],
81-
"telecom": [
82-
{
83-
"system": "email",
84-
"value": "mary.lane@nhs.net",
85-
"use": "work"
86-
}
87-
],
88-
"address": [
89-
{
90-
"type": "both",
91-
"line": [
92-
"ST MARYS HOSPITAL",
93-
"MANCHESTER ROYAL INFIRMARY",
94-
"OXFORD ROAD"
95-
],
96-
"city": "Manchester",
97-
"postalCode": "M13 9WL"
98-
}
99-
],
100-
"gender": "female",
101-
"birthDate": "1970-01-01",
102-
"communication": [
103-
{
104-
"coding": [
105-
{
106-
"system": "urn:ietf:bcp:47",
107-
"code": "en",
108-
"display": "English"
109-
}
110-
]
111-
}
11279
]
11380
}
11481
},
@@ -124,7 +91,6 @@
12491
"value": "C5173256"
12592
}
12693
],
127-
"active": true,
12894
"name": [
12995
{
13096
"use": "official",
@@ -136,25 +102,6 @@
136102
]
137103
}
138104
],
139-
"telecom": [
140-
{
141-
"system": "email",
142-
"value": "veeda.dmello@nhs.net",
143-
"use": "work"
144-
}
145-
],
146-
"address": [
147-
{
148-
"type": "both",
149-
"line": [
150-
"41 WESTMINSTER ROAD"
151-
],
152-
"city": "COVENTRY",
153-
"postalCode": "CV1 3GB"
154-
}
155-
],
156-
"gender": "female",
157-
"birthDate": "1970-01-01",
158105
"qualification": [
159106
{
160107
"code": {
@@ -167,17 +114,6 @@
167114
]
168115
}
169116
}
170-
],
171-
"communication": [
172-
{
173-
"coding": [
174-
{
175-
"system": "urn:ietf:bcp:47",
176-
"code": "en",
177-
"display": "English"
178-
}
179-
]
180-
}
181117
]
182118
}
183119
},
@@ -193,7 +129,6 @@
193129
"value": "C9999999"
194130
}
195131
],
196-
"active": true,
197132
"name": [
198133
{
199134
"use": "official",
@@ -204,26 +139,6 @@
204139
]
205140
}
206141
],
207-
"telecom": [
208-
{
209-
"system": "email",
210-
"value": "lucy.hale@nhs.net",
211-
"use": "work"
212-
}
213-
],
214-
"address": [
215-
{
216-
"type": "both",
217-
"line": [
218-
"550 WILMSLOW ROAD",
219-
"WITHINGTON"
220-
],
221-
"city": "Manchester",
222-
"postalCode": "M20 4BX"
223-
}
224-
],
225-
"gender": "female",
226-
"birthDate": "1970-01-01",
227142
"qualification": [
228143
{
229144
"code": {
@@ -236,17 +151,6 @@
236151
]
237152
}
238153
}
239-
],
240-
"communication": [
241-
{
242-
"coding": [
243-
{
244-
"system": "urn:ietf:bcp:47",
245-
"code": "en",
246-
"display": "English"
247-
}
248-
]
249-
}
250154
]
251155
}
252156
},
@@ -261,7 +165,6 @@
261165
"value": "DPX"
262166
}
263167
],
264-
"active": true,
265168
"type": [
266169
{
267170
"coding": [
@@ -329,7 +232,6 @@
329232
"value": "699X0"
330233
}
331234
],
332-
"active": true,
333235
"type": [
334236
{
335237
"coding": [
@@ -403,7 +305,6 @@
403305
"value": "RBV"
404306
}
405307
],
406-
"active": true,
407308
"type": [
408309
{
409310
"coding": [
@@ -643,20 +544,19 @@
643544
"coding": [
644545
{
645546
"system": "http://snomed.info/sct",
646-
"code": "3457005",
647-
"display": "Patient referral"
547+
"code": "405824009",
548+
"display": "Genetic test"
648549
}
649550
]
650551
}
651552
],
652553
"priority": "routine",
653-
"doNotPerform": false,
654554
"code": {
655555
"coding": [
656556
{
657557
"system": "http://snomed.info/sct",
658-
"code": "405824009",
659-
"display": "Genetic test (procedure)"
558+
"code": "63491000000109",
559+
"display": "Paediatric IDH-wildtype glioblastoma tumour and germline WGS (whole genome sequencing)"
660560
}
661561
]
662562
},
@@ -711,6 +611,10 @@
711611
"value": "Spec123456"
712612
}
713613
],
614+
"accessionIdentifier": {
615+
"system": "https://www.christie.nhs.uk/path",
616+
"value": "Spec123456"
617+
},
714618
"status": "available",
715619
"type": {
716620
"coding": [

‎Bundle/UKCore-Bundle-MichaelJonesSpecimen-Example.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
"value": "Spec123456"
1616
}
1717
],
18+
"accessionIdentifier": {
19+
"system": "https://www.christie.nhs.uk/path",
20+
"value": "Spec123456"
21+
},
1822
"status": "available",
1923
"type": {
2024
"coding": [

‎CapabilityStatement/CapabilityStatement-genomics-requirements.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
},
5050
{
5151
"type": "MessageDefinition",
52-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition"
52+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-MessageDefinition-Genomics"
5353
},
5454
{
5555
"type": "NamingSystem",
@@ -73,7 +73,7 @@
7373
},
7474
{
7575
"type": "Subscription",
76-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Subscription"
76+
"profile": "http://hl7.org/fhir/StructureDefinition/Subscription"
7777
},
7878
{
7979
"type": "CapabilityStatement",
@@ -105,7 +105,7 @@
105105
},
106106
{
107107
"type": "FamilyMemberHistory",
108-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory"
108+
"profile": "http://hl7.org/fhir/StructureDefinition/FamilyMemberHistory"
109109
},
110110
{
111111
"type": "Observation",

‎Organization/UKCore-Organization-699X0-Example.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"value": "699X0"
88
}
99
],
10-
"active": true,
1110
"type": [
1211
{
1312
"coding": [

‎ServiceRequest/UKCore-ServiceRequest-MichaelJonesDYPDRequest-Example.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,20 +28,19 @@
2828
"coding": [
2929
{
3030
"system": "http://snomed.info/sct",
31-
"code": "3457005",
32-
"display": "Patient referral"
31+
"code": "405824009",
32+
"display": "Genetic test"
3333
}
3434
]
3535
}
3636
],
3737
"priority": "routine",
38-
"doNotPerform": false,
3938
"code": {
4039
"coding": [
4140
{
4241
"system": "http://snomed.info/sct",
43-
"code": "405824009",
44-
"display": "Genetic test (procedure)"
42+
"code": "63491000000109",
43+
"display": "Paediatric IDH-wildtype glioblastoma tumour and germline WGS (whole genome sequencing)"
4544
}
4645
]
4746
},

‎Specimen/UKCore-Specimen-MichaelJonesBlood-Example.json‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"value": "Spec123456"
88
}
99
],
10+
"accessionIdentifier": {
11+
"system": "https://www.christie.nhs.uk/path",
12+
"value": "Spec123456"
13+
},
1014
"status": "available",
1115
"type": {
1216
"coding": [

‎StructureDefinition/NHSDigital-Condition-Genomics.StructureDefinition.json‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@
7878
"path": "Condition.bodySite",
7979
"max": "0"
8080
},
81+
{
82+
"id": "Condition.subject",
83+
"path": "Condition.subject",
84+
"type": [
85+
{
86+
"code": "Reference",
87+
"targetProfile": [
88+
"http://hl7.org/fhir/StructureDefinition/Group",
89+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
90+
]
91+
}
92+
]
93+
},
8194
{
8295
"id": "Condition.encounter",
8396
"path": "Condition.encounter",
@@ -106,6 +119,39 @@
106119
"path": "Condition.recordedDate",
107120
"min": 1
108121
},
122+
{
123+
"id": "Condition.recorder",
124+
"path": "Condition.recorder",
125+
"type": [
126+
{
127+
"code": "Reference",
128+
"targetProfile": [
129+
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson",
130+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
131+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
132+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
133+
]
134+
}
135+
]
136+
},
137+
{
138+
"id": "Condition.asserter",
139+
"path": "Condition.asserter",
140+
"type": [
141+
{
142+
"code": "Reference",
143+
"targetProfile": [
144+
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-Practitioner",
145+
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole",
146+
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient",
147+
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson",
148+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
149+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
150+
"https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics"
151+
]
152+
}
153+
]
154+
},
109155
{
110156
"id": "Condition.stage",
111157
"path": "Condition.stage",

0 commit comments

Comments
 (0)