Skip to content

Commit 0421417

Browse files
omarisgreatomarisgreat
committed
Fixes to StructureDefinitions
Largely adding discriminators
1 parent 1ec428c commit 0421417

5 files changed

Lines changed: 52 additions & 25 deletions

‎StructureDefinition/NHSEngland-Condition-GenomicsmCODE.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-Condition-GenomicsmCODE",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Condition-GenomicsmCODE",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_Condition_GenomicsmCODE",
77
"title": "NHSEngland Condition GenomicsmCODE",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -79,7 +79,7 @@
7979
"path": "Condition.category",
8080
"sliceName": "ukcoreCategory",
8181
"binding": {
82-
"strength": "extensible",
82+
"strength": "required",
8383
"valueSet": "https://fhir.hl7.org.uk/ValueSet/UKCore-ConditionCategory"
8484
}
8585
},
@@ -94,8 +94,8 @@
9494
"slicing": {
9595
"discriminator": [
9696
{
97-
"type": "pattern",
98-
"path": "$this"
97+
"type": "value",
98+
"path": "system"
9999
}
100100
],
101101
"rules": "open"

‎StructureDefinition/NHSEngland-DiagnosticReport-GenomicReport.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-DiagnosticReport-GenomicReport",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-DiagnosticReport-GenomicReport",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_DiagnosticReport_GenomicReport",
77
"title": "NHSEngland DiagnosticReport GenomicReport",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -294,7 +294,7 @@
294294
{
295295
"id": "DiagnosticReport.performer.identifier.system",
296296
"path": "DiagnosticReport.performer.identifier.system",
297-
"fixedUri": "https://fhir.nhs.uk/Id/ods-organisation-code"
297+
"fixedUri": "https://fhir.nhs.uk/Id/ods-organization-code"
298298
},
299299
{
300300
"id": "DiagnosticReport.resultsInterpreter",

‎StructureDefinition/NHSEngland-Patient-Genomics.json‎

Lines changed: 30 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-Patient-Genomics",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_Patient_Genomics",
77
"title": "NHSEngland Patient Genomics",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -77,7 +77,15 @@
7777
"id": "Patient.extension:fetalStatus",
7878
"path": "Patient.extension",
7979
"sliceName": "fetalStatus",
80-
"definition": "Extension used for determining the life status of the fetus. SHOULD always be present for a fetal patient record to help with identification."
80+
"definition": "Extension used for determining the life status of the fetus. SHOULD always be present for a fetal patient record to help with identification.",
81+
"constraint": [
82+
{
83+
"key": "gen-3",
84+
"severity": "warning",
85+
"human": "fetalStatus SHOULD be provided if a birthDate is not present, indicating the patient resource is likely for a fetus.",
86+
"expression": "(Patient.extension(fetalStatus).exists() and Patient.birthDate.notExists()) or Patient.birthDate.exists()"
87+
}
88+
]
8189
},
8290
{
8391
"id": "Patient.extension:residentialStatus",
@@ -107,6 +115,15 @@
107115
{
108116
"id": "Patient.identifier",
109117
"path": "Patient.identifier",
118+
"slicing": {
119+
"discriminator": [
120+
{
121+
"type": "pattern",
122+
"path": "$this"
123+
}
124+
],
125+
"rules": "open"
126+
},
110127
"definition": "SHALL be present for Patients within the Genomic Order Management ecosystem. It is preferred that all patients with an NHS number have this included within the Patient resource upon submission of a test order. Patient who do not have an NHS number SHOULD have a temporary one registered/assigned with PDS.\r\nFor patient records where the NHS number has been traced from PDS, the trace status SHOULD be provided within the NHS Number identifier slice.\r\n\r\nAdditional identifiers SHOULD include an appropriate naming system scheme which clearly identifies the assigner (to disambiguate the identifier from other resources where these are not nationally unique). Alternatively, the OID for local identifier MAY be used, with the 'assigner' organization explicitly referenced.",
111128
"min": 1
112129
},
@@ -118,19 +135,20 @@
118135
{
119136
"id": "Patient.identifier:nhsNumber.assigner",
120137
"path": "Patient.identifier.assigner",
121-
"type": [
122-
{
123-
"code": "Reference",
124-
"targetProfile": [
125-
"https://fhir.nhs.uk/StructureDefinition/NHSEngland-Organization-Genomics"
126-
]
127-
}
128-
]
138+
"max": "0"
129139
},
130140
{
131141
"id": "Patient.identifier:localIdentifier",
132142
"path": "Patient.identifier",
133-
"sliceName": "localIdentifier"
143+
"sliceName": "localIdentifier",
144+
"constraint": [
145+
{
146+
"key": "gen-4",
147+
"severity": "error",
148+
"human": "localIdentifier MUST be provided when no NHS number is present",
149+
"expression": "(Patient.identifier(localIdentifier).exists() and Patient.identifier(nhsNumber).notExists()) or Patient.identifier(nhsNumber).exists() or Patient.identifier(localIdentifier).exists()"
150+
}
151+
]
134152
},
135153
{
136154
"id": "Patient.identifier:localIdentifier.assigner",

‎StructureDefinition/NHSEngland-ServiceRequest-Genomics.json‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-ServiceRequest-Genomics",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-ServiceRequest-Genomics",
5-
"version": "0.3.1",
5+
"version": "0.3.2",
66
"name": "NHSEngland_ServiceRequest_Genomics",
77
"title": "NHSEngland ServiceRequest Genomics",
88
"status": "active",
9-
"date": "2026-08-11",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -222,6 +222,15 @@
222222
{
223223
"id": "ServiceRequest.category",
224224
"path": "ServiceRequest.category",
225+
"slicing": {
226+
"discriminator": [
227+
{
228+
"type": "pattern",
229+
"path": "$this"
230+
}
231+
],
232+
"rules": "open"
233+
},
225234
"definition": "Category SHALL be populated with the reason for the request being ordered e.g. Diagnostic, Carrier, Predictive, Stored DNA etc. The final list of applicable codes which can be selected is still under review, the Genomic-ReasonforTesting ValueSet SHOULD be used for this categorisation.",
226235
"min": 1
227236
},

‎StructureDefinition/NHSEngland-Task-Genomics.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
"resourceType": "StructureDefinition",
33
"id": "NHSEngland-Task-Genomics",
44
"url": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Task-Genomics",
5-
"version": "0.3.0",
5+
"version": "0.3.1",
66
"name": "NHSEngland_Task_Genomics",
77
"title": "NHSEngland Task Genomics",
88
"status": "active",
9-
"date": "2026-04-16",
9+
"date": "2026-08-25",
1010
"publisher": "NHS England",
1111
"contact": [
1212
{
@@ -231,7 +231,7 @@
231231
{
232232
"id": "Task.owner.identifier.system",
233233
"path": "Task.owner.identifier.system",
234-
"fixedUri": "https://fhir.nhs.uk/Id/ods-organisation-code"
234+
"fixedUri": "https://fhir.nhs.uk/Id/ods-organization-code"
235235
},
236236
{
237237
"id": "Task.location",

0 commit comments

Comments
 (0)