Skip to content

Commit 6df4da9

Browse files
omarisgreatomarisgreat
authored
Merge pull request #218 from NHSDigital/Feature-IOPS-3679-Constraint-Profiles
[IOPS-3679] Updated constraint profiles
2 parents fe7029b + 35725e1 commit 6df4da9

46 files changed

Lines changed: 3980 additions & 2585 deletions

File tree

Some content is hidden

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

‎.github/workflows/firely-validation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@ jobs:
5656
# - name: Add & Commit
5757
# uses: EndBug/add-and-commit@v9
5858
# with:
59-
# add: 'fsh-generated/resources/'
59+
# add: 'fsh-generated/resources/'

‎AuditEvent/AuditEvent-ServiceRequestUpdate-Example.json‎

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
]
2222
},
2323
"who": {
24+
"type": "PractitionerRole",
2425
"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example",
2526
"identifier": {
2627
"system": "https://fhir.nhs.uk/Id/sds-user-id",
@@ -29,17 +30,41 @@
2930
},
3031
"name": "Test Clinical Scientist",
3132
"requestor": true
33+
},
34+
{
35+
"who": {
36+
"type": "Organization",
37+
"identifier": {
38+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
39+
"value": "ABC"
40+
}
41+
},
42+
"requestor": true
3243
}
3344
],
3445
"source": {
3546
"observer": {
36-
"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example"
37-
}
47+
"identifier": {
48+
"system": "https://fhir.nhs.uk/Id/product-id",
49+
"value": "GOMS"
50+
},
51+
"display": "Genomic Order Management Service"
52+
},
53+
"type": [
54+
{
55+
"system": "http://terminology.hl7.org/CodeSystem/security-source-type",
56+
"code": "2"
57+
}
58+
]
3859
},
3960
"entity": [
4061
{
4162
"what": {
42-
"reference": "ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example"
63+
"reference": "ServiceRequest/ServiceRequest-SavedTestOrderUpdated-Example",
64+
"identifier": {
65+
"system": "https://fhir.nhs.uk/Id/GMSOrder",
66+
"value": "ROA43728"
67+
}
4368
},
4469
"type": {
4570
"system": "http://hl7.org/fhir/resource-types",
@@ -51,6 +76,36 @@
5176
"code": "20",
5277
"display": "Job"
5378
}
79+
},
80+
{
81+
"what": {
82+
"identifier": {
83+
"system": "https://fhir.nhs.uk/Id/nhs-number",
84+
"value": "9449307873"
85+
}
86+
},
87+
"type": {
88+
"system": "http://terminology.hl7.org/CodeSystem/audit-entity-type",
89+
"code": "1",
90+
"display": "Person"
91+
},
92+
"role": {
93+
"system": "http://terminology.hl7.org/CodeSystem/object-role",
94+
"code": "1",
95+
"display": "Patient"
96+
}
97+
},
98+
{
99+
"what": {
100+
"identifier": {
101+
"system": "https://fhir.nhs.uk/Id/transaction",
102+
"value": "76d148b6-586d-11ec-bf63-0242ac130082"
103+
}
104+
},
105+
"type": {
106+
"system": "https://profiles.ihe.net/ITI/BALP/CodeSystem/BasicAuditEntityType",
107+
"code": "XrequestId"
108+
}
54109
}
55110
]
56111
}

‎AuditEvent/AuditEvent-TaskUpdate-Example.json‎

Lines changed: 58 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
]
2222
},
2323
"who": {
24+
"type": "PractitionerRole",
2425
"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example",
2526
"identifier": {
2627
"system": "https://fhir.nhs.uk/Id/sds-user-id",
@@ -29,17 +30,41 @@
2930
},
3031
"name": "Test Clinical Scientist",
3132
"requestor": true
33+
},
34+
{
35+
"who": {
36+
"type": "Organization",
37+
"identifier": {
38+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
39+
"value": "ABC"
40+
}
41+
},
42+
"requestor": true
3243
}
3344
],
3445
"source": {
3546
"observer": {
36-
"reference": "PractitionerRole/PractitionerRole-TestClinicalScientist-Example"
37-
}
47+
"identifier": {
48+
"system": "https://fhir.nhs.uk/Id/product-id",
49+
"value": "GOMS"
50+
},
51+
"display": "Genomic Order Management Service"
52+
},
53+
"type": [
54+
{
55+
"system": "http://terminology.hl7.org/CodeSystem/security-source-type",
56+
"code": "2"
57+
}
58+
]
3859
},
3960
"entity": [
4061
{
4162
"what": {
42-
"reference": "Task/Task-NonWGSRareDiseaseTestOrderRejected-Example"
63+
"reference": "Task/Task-NonWGSRareDiseaseTestOrderRejected-Example",
64+
"identifier": {
65+
"system": "urn:ietf:rfc:3986",
66+
"value": "urn:uuid:3148c7da-59f3-439f-b729-847a607831fc"
67+
}
4368
},
4469
"type": {
4570
"system": "http://hl7.org/fhir/resource-types",
@@ -51,6 +76,36 @@
5176
"code": "20",
5277
"display": "Job"
5378
}
79+
},
80+
{
81+
"what": {
82+
"identifier": {
83+
"system": "https://fhir.nhs.uk/Id/nhs-number",
84+
"value": "9449307873"
85+
}
86+
},
87+
"type": {
88+
"system": "http://terminology.hl7.org/CodeSystem/audit-entity-type",
89+
"code": "1",
90+
"display": "Person"
91+
},
92+
"role": {
93+
"system": "http://terminology.hl7.org/CodeSystem/object-role",
94+
"code": "1",
95+
"display": "Patient"
96+
}
97+
},
98+
{
99+
"what": {
100+
"identifier": {
101+
"system": "https://fhir.nhs.uk/Id/transaction",
102+
"value": "76d148b6-586d-11ec-bf63-0242ac130082"
103+
}
104+
},
105+
"type": {
106+
"system": "https://profiles.ihe.net/ITI/BALP/CodeSystem/BasicAuditEntityType",
107+
"code": "XrequestId"
108+
}
54109
}
55110
]
56111
}

‎CapabilityStatement/CapabilityStatement-genomics-application.json‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"resource": [
6565
{
6666
"type": "AuditEvent",
67-
"profile": "http://hl7.org/fhir/StructureDefinition/AuditEvent",
67+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-AuditEvent-GenomicsPARS",
6868
"documentation": "For searching recorded AuditEvents",
6969
"interaction": [
7070
{
@@ -103,7 +103,7 @@
103103
},
104104
{
105105
"type": "Bundle",
106-
"profile": "http://hl7.org/fhir/StructureDefinition/Bundle",
106+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Bundle-Genomics",
107107
"documentation": "For posting FHIR transaction bundles (http://hl7.org/fhir/R4B/http.html#transaction) to the server.",
108108
"interaction": [
109109
{
@@ -588,7 +588,7 @@
588588
},
589589
{
590590
"type": "Task",
591-
"profile": "http://hl7.org/fhir/StructureDefinition/Task",
591+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Task-Genomics",
592592
"documentation": "Endpoints for interacting with Task resources",
593593
"interaction": [
594594
{
@@ -678,7 +678,7 @@
678678
},
679679
{
680680
"type": "ServiceRequest",
681-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-ServiceRequest",
681+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-ServiceRequest-Genomics",
682682
"documentation": "Endpoints for interacting with ServiceRequest resources.",
683683
"interaction": [
684684
{
@@ -783,7 +783,7 @@
783783
},
784784
{
785785
"type": "PractitionerRole",
786-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole",
786+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-PractitionerRole-Genomics",
787787
"documentation": "Endpoints for interacting with PractitionerRole resources",
788788
"interaction": [
789789
{
@@ -956,7 +956,7 @@
956956
},
957957
{
958958
"type": "DiagnosticReport",
959-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport",
959+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-DiagnosticReport-GenomicReport",
960960
"documentation": "Endpoints for interacting with DiagnosticReport resources",
961961
"interaction": [
962962
{
@@ -1050,7 +1050,7 @@
10501050
},
10511051
{
10521052
"type": "FamilyMemberHistory",
1053-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory",
1053+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-FamilyMemberHistory-Genomics",
10541054
"documentation": "Endpoints for interacting with FamilyMemberHistory resources",
10551055
"interaction": [
10561056
{
@@ -1117,7 +1117,7 @@
11171117
},
11181118
{
11191119
"type": "Observation",
1120-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation",
1120+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Observation-GenomicsLab",
11211121
"documentation": "Endpoints for interacting with Observation resources",
11221122
"interaction": [
11231123
{
@@ -1208,7 +1208,7 @@
12081208
},
12091209
{
12101210
"type": "Patient",
1211-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient",
1211+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Patient-Genomics",
12121212
"documentation": "Endpoints for interacting with Patient resources",
12131213
"interaction": [
12141214
{
@@ -1287,7 +1287,7 @@
12871287
},
12881288
{
12891289
"type": "Consent",
1290-
"profile": "http://hl7.org/fhir/StructureDefinition/Consent",
1290+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Consent-GenomicsPCF",
12911291
"documentation": "Endpoints for interacting with Consent resources",
12921292
"interaction": [
12931293
{
@@ -1358,7 +1358,7 @@
13581358
},
13591359
{
13601360
"type": "Condition",
1361-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Condition",
1361+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Condition-GenomicsmCODE",
13621362
"documentation": "Endpoints for interacting with Condition resources",
13631363
"interaction": [
13641364
{
@@ -1445,7 +1445,7 @@
14451445
},
14461446
{
14471447
"type": "RelatedPerson",
1448-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson",
1448+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-RelatedPerson-Genomics",
14491449
"documentation": "Endpoints for interacting with RelatedPerson resources",
14501450
"interaction": [
14511451
{
@@ -1492,7 +1492,7 @@
14921492
},
14931493
{
14941494
"type": "Specimen",
1495-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen",
1495+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Specimen-Genomics",
14961496
"documentation": "Endpoints for interacting with Specimen resources",
14971497
"interaction": [
14981498
{
@@ -1709,7 +1709,7 @@
17091709
},
17101710
{
17111711
"type": "BodyStructure",
1712-
"profile": "http://hl7.org/fhir/StructureDefinition/BodyStructure",
1712+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-BodyStructure-GenomicsmCODE",
17131713
"documentation": "Endpoints for interacting with BodyStructure resources",
17141714
"interaction": [
17151715
{
@@ -1764,7 +1764,7 @@
17641764
},
17651765
{
17661766
"type": "Provenance",
1767-
"profile": "http://hl7.org/fhir/StructureDefinition/Provenance",
1767+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Provenance-Genomics",
17681768
"documentation": "For searching stored Provenance resources",
17691769
"interaction": [
17701770
{
@@ -1795,7 +1795,7 @@
17951795
},
17961796
{
17971797
"type": "DocumentReference",
1798-
"profile": "http://hl7.org/fhir/StructureDefinition/DocumentReference",
1798+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-DocumentReference-GenomicDataFile",
17991799
"documentation": "Endpoints for interacting with DocumentReference resources",
18001800
"interaction": [
18011801
{
@@ -1842,7 +1842,7 @@
18421842
},
18431843
{
18441844
"type": "Composition",
1845-
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Composition",
1845+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-Composition-GenomicsEULabReport",
18461846
"documentation": "For validation of Composition resources and allowing searches via chaining from the Bundle endpoint",
18471847
"interaction": [
18481848
{
@@ -1870,7 +1870,7 @@
18701870
},
18711871
{
18721872
"type": "RequestGroup",
1873-
"profile": "http://hl7.org/fhir/StructureDefinition/RequestGroup",
1873+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSEngland-RelatedPerson-Genomics",
18741874
"documentation": "For searching group/family test request.",
18751875
"interaction": [
18761876
{

0 commit comments

Comments
 (0)