Skip to content

Commit b2a5a68

Browse files
KazeemHamzatKazeemHamzat
committed
Merge branch 'patch-AWS-Package-fixes' of https://github.com/NHSDigital/NHSDigital-FHIR-Genomics-ImplementationGuide into Patch-JPA-Using-Validator
2 parents 09dc48f + ac390af commit b2a5a68

19 files changed

Lines changed: 2950 additions & 343 deletions

‎.simplifier/quality.control.result.json‎

Lines changed: 2895 additions & 0 deletions
Large diffs are not rendered by default.

‎CodeSystem/CodeSystem-Genomics-mds-questiontag.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{
4444
"code": "HCP-13",
4545
"display": "HCP - surname",
46-
"definition": "HCP'surname "
46+
"definition": "HCP's surname."
4747
},
4848
{
4949
"code": "HCP-3",

‎Observation/Observation-SLC52A2-VariantAbsent-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,13 @@
5353
],
5454
"text": "Variant not detected"
5555
},
56-
"method": [
57-
{
58-
"coding": [
59-
{
60-
"system": "http://snomed.info/sct",
61-
"code": "117040002",
62-
"display": "Nucleic acid sequencing"
63-
}
64-
]
65-
}
66-
]
56+
"method": {
57+
"coding": [
58+
{
59+
"system": "http://snomed.info/sct",
60+
"code": "117040002",
61+
"display": "Nucleic acid sequencing"
62+
}
63+
]
64+
}
6765
}

‎SearchParameter/SearchParameter-Genomics-plandefinition-actor-role.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"id": "SearchParameter-plandefinition-actor-role",
44
"url": "https://fhir.nhs.uk/SearchParameter/plandefinition-actor-role",
55
"version": "0.1.0",
6-
"name": "PlanDefinition Actor Role",
6+
"name": "PlanDefinition_Actor_Role",
77
"status": "draft",
88
"experimental": false,
99
"date": "2026-05-19",

‎StructureDefinition/NHSEngland-Condition-GenomicsmCODE.json‎

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -146,46 +146,6 @@
146146
"path": "Condition.subject",
147147
"definition": "SHALL be present. Reference to the associated Patient. This MAY be through a resource reference if the ID on the central service is known (or provided within the transaction bundle) or through NHS number where this is known and has been traced through PDS"
148148
},
149-
{
150-
"id": "Condition.recorder",
151-
"path": "Condition.recorder",
152-
"type": [
153-
{
154-
"code": "Reference",
155-
"targetProfile": [
156-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics",
157-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
158-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole",
159-
"http://hl7.org/fhir/StructureDefinition/Patient",
160-
"http://hl7.org/fhir/StructureDefinition/RelatedPerson"
161-
],
162-
"aggregation": [
163-
"referenced",
164-
"bundled"
165-
]
166-
}
167-
]
168-
},
169-
{
170-
"id": "Condition.asserter",
171-
"path": "Condition.asserter",
172-
"type": [
173-
{
174-
"code": "Reference",
175-
"targetProfile": [
176-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics",
177-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
178-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole",
179-
"http://hl7.org/fhir/StructureDefinition/Patient",
180-
"http://hl7.org/fhir/StructureDefinition/RelatedPerson"
181-
],
182-
"aggregation": [
183-
"referenced",
184-
"bundled"
185-
]
186-
}
187-
]
188-
},
189149
{
190150
"id": "Condition.note",
191151
"path": "Condition.note",

‎StructureDefinition/NHSEngland-Consent-GenomicsPCF.json‎

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-Consent-GenomicsPCF",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Consent-GenomicsPCF",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_Consent_GenomicsPCF",
77
"title": "NHSEngland Consent GenomicsPCF",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -139,10 +139,6 @@
139139
"type": [
140140
{
141141
"code": "Reference",
142-
"targetProfile": [
143-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
144-
"http://hl7.org/fhir/StructureDefinition/Patient"
145-
],
146142
"aggregation": [
147143
"referenced",
148144
"bundled"
@@ -162,14 +158,6 @@
162158
"type": [
163159
{
164160
"code": "Reference",
165-
"targetProfile": [
166-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics",
167-
"http://hl7.org/fhir/StructureDefinition/Organization",
168-
"http://hl7.org/fhir/StructureDefinition/Patient",
169-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
170-
"http://hl7.org/fhir/StructureDefinition/RelatedPerson",
171-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole"
172-
],
173161
"aggregation": [
174162
"referenced",
175163
"bundled"
@@ -263,10 +251,6 @@
263251
"type": [
264252
{
265253
"code": "Reference",
266-
"targetProfile": [
267-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-ServiceRequest-Genomics",
268-
"http://hl7.org/fhir/StructureDefinition/Resource"
269-
],
270254
"aggregation": [
271255
"referenced",
272256
"bundled"

‎StructureDefinition/NHSEngland-DiagnosticReport-GenomicReport.json‎

Lines changed: 5 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@
191191
{
192192
"id": "DiagnosticReport.category",
193193
"path": "DiagnosticReport.category",
194+
"slicing": {
195+
"rules": "open"
196+
},
194197
"definition": "Potentially multiple categories to specify the specialty the report is relevant for. Different codings are expected by the Genomic Report and EU Lab profiles."
195198
},
196199
{
@@ -242,13 +245,6 @@
242245
"type": [
243246
{
244247
"code": "Reference",
245-
"targetProfile": [
246-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
247-
"http://hl7.org/fhir/StructureDefinition/Patient",
248-
"http://hl7.org/fhir/StructureDefinition/Group",
249-
"http://hl7.org/fhir/StructureDefinition/Device",
250-
"http://hl7.org/fhir/StructureDefinition/Location"
251-
],
252248
"aggregation": [
253249
"referenced"
254250
]
@@ -263,23 +259,7 @@
263259
{
264260
"id": "DiagnosticReport.performer",
265261
"path": "DiagnosticReport.performer",
266-
"definition": "SHOULD reference the organization responsible for the testing, preferably by ODS code.",
267-
"type": [
268-
{
269-
"code": "Reference",
270-
"targetProfile": [
271-
"https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization",
272-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
273-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole",
274-
"http://hl7.org/fhir/StructureDefinition/Organization",
275-
"http://hl7.org/fhir/StructureDefinition/CareTeam"
276-
],
277-
"aggregation": [
278-
"referenced",
279-
"bundled"
280-
]
281-
}
282-
]
262+
"definition": "SHOULD reference the organization responsible for the testing, preferably by ODS code."
283263
},
284264
{
285265
"id": "DiagnosticReport.performer.reference",
@@ -299,23 +279,7 @@
299279
{
300280
"id": "DiagnosticReport.resultsInterpreter",
301281
"path": "DiagnosticReport.resultsInterpreter",
302-
"definition": "SHOULD reference the person responsible for interpreting the raw results, preferably by a recognised NHS identifier, such as SDS code.",
303-
"type": [
304-
{
305-
"code": "Reference",
306-
"targetProfile": [
307-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics",
308-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
309-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole",
310-
"http://hl7.org/fhir/StructureDefinition/Organization",
311-
"http://hl7.org/fhir/StructureDefinition/CareTeam"
312-
],
313-
"aggregation": [
314-
"referenced",
315-
"bundled"
316-
]
317-
}
318-
]
282+
"definition": "SHOULD reference the person responsible for interpreting the raw results, preferably by a recognised NHS identifier, such as SDS code."
319283
},
320284
{
321285
"id": "DiagnosticReport.specimen",
@@ -325,10 +289,6 @@
325289
"type": [
326290
{
327291
"code": "Reference",
328-
"targetProfile": [
329-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Specimen-Genomics",
330-
"http://hl7.org/fhir/StructureDefinition/Specimen"
331-
],
332292
"aggregation": [
333293
"referenced"
334294
]

‎StructureDefinition/NHSEngland-DocumentReference-GenomicDataFile.json‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-DocumentReference-GenomicDataFile",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-DocumentReference-GenomicDataFile",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_DocumentReference_GenomicDataFile",
77
"title": "NHSEngland DocumentReference GenomicDataFile",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -40,13 +40,6 @@
4040
"type": [
4141
{
4242
"code": "Reference",
43-
"targetProfile": [
44-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
45-
"http://hl7.org/fhir/StructureDefinition/Patient",
46-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
47-
"http://hl7.org/fhir/StructureDefinition/Group",
48-
"http://hl7.org/fhir/StructureDefinition/Device"
49-
],
5043
"aggregation": [
5144
"referenced"
5245
]

‎StructureDefinition/NHSEngland-FamilyMemberHistory-Genomics.json‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-FamilyMemberHistory-Genomics",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-FamilyMemberHistory-Genomics",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_FamilyMemberHistory_Genomics",
77
"title": "NHSEngland FamilyMemberHistory Genomics",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -64,10 +64,6 @@
6464
"type": [
6565
{
6666
"code": "Reference",
67-
"targetProfile": [
68-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
69-
"http://hl7.org/fhir/StructureDefinition/Patient"
70-
],
7167
"aggregation": [
7268
"referenced",
7369
"bundled"

‎StructureDefinition/NHSEngland-Group-Genomics.json‎

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-Group-Genomics",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Group-Genomics",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_Group_Genomics",
77
"title": "NHSEngland Group Genomics",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -75,29 +75,6 @@
7575
"path": "Group.member",
7676
"definition": "SHALL be present. `entity` SHOULD be a reference to a Patient resource within the GOMS infrastructure or a unique identifier where this is not possible. `period` SHOULD record the date the member was added to the Group. `inactive` MAY be used to record entities which are no longer members of the group, though if an individual was added to a Group in error and should never have been part of the group, the entity SHALL be removed entirely.",
7777
"min": 1
78-
},
79-
{
80-
"id": "Group.member.entity",
81-
"path": "Group.member.entity",
82-
"type": [
83-
{
84-
"code": "Reference",
85-
"targetProfile": [
86-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
87-
"http://hl7.org/fhir/StructureDefinition/Patient",
88-
"http://hl7.org/fhir/StructureDefinition/Practitioner",
89-
"http://hl7.org/fhir/StructureDefinition/PractitionerRole",
90-
"http://hl7.org/fhir/StructureDefinition/Device",
91-
"http://hl7.org/fhir/StructureDefinition/Medication",
92-
"http://hl7.org/fhir/StructureDefinition/Substance",
93-
"http://hl7.org/fhir/StructureDefinition/Group"
94-
],
95-
"aggregation": [
96-
"referenced",
97-
"bundled"
98-
]
99-
}
100-
]
10178
}
10279
]
10380
}

0 commit comments

Comments
 (0)