Skip to content

Commit 0518758

Browse files
omarisgreatomarisgreat
authored
Merge pull request #26 from NHSDigital/IOPS-1250
Dependency and CapabilityStatement target updates
2 parents fd23545 + 69c2c18 commit 0518758

8 files changed

Lines changed: 183 additions & 177 deletions

‎Bundle/Bundle-WGSTestOrderForm-Example.json‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,7 +426,7 @@
426426
"coding": [
427427
{
428428
"system": "http://snomed.info/sct",
429-
"code": "77465005",
429+
"code": "23719005",
430430
"display": "Transplantation of bone marrow"
431431
}
432432
]
@@ -645,9 +645,11 @@
645645
"value": "9449307946"
646646
}
647647
},
648-
"request": {
649-
"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"
650-
}
648+
"request": [
649+
{
650+
"reference": "ServiceRequest/ServiceRequest-NonWGSTestOrderForm-Example"
651+
}
652+
]
651653
},
652654
"request": {
653655
"method": "POST",

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@
169169
{
170170
"coding": [
171171
{
172-
"system": "https://fhir.nhs.uk/CodeSystem/organisation-role",
173-
"code": "172",
174-
"display": "INDEPENDENT SECTOR HEALTHCARE PROVIDER"
172+
"system": "http://terminology.hl7.org/CodeSystem/organization-type",
173+
"code": "prov",
174+
"display": "Healthcare Provider"
175175
}
176176
]
177177
}
@@ -236,9 +236,9 @@
236236
{
237237
"coding": [
238238
{
239-
"system": "https://fhir.nhs.uk/CodeSystem/organisation-role",
240-
"code": "173",
241-
"display": "PATHOLOGY LAB"
239+
"system": "http://terminology.hl7.org/CodeSystem/organization-type",
240+
"code": "dept",
241+
"display": "Hospital Department"
242242
}
243243
]
244244
}
@@ -309,9 +309,9 @@
309309
{
310310
"coding": [
311311
{
312-
"system": "https://fhir.nhs.uk/CodeSystem/organisation-role",
313-
"code": "197",
314-
"display": "NHS TRUST"
312+
"system": "http://terminology.hl7.org/CodeSystem/organization-type",
313+
"code": "prov",
314+
"display": "Healthcare Provider"
315315
}
316316
]
317317
}

‎CapabilityStatement/CapabilityStatement-genomics-application.json‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@
526526
},
527527
{
528528
"type": "Task",
529-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Task-Genomics",
529+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Task",
530530
"documentation": "Endpoints for interacting with Task resources",
531531
"interaction": [
532532
{
@@ -613,7 +613,7 @@
613613
},
614614
{
615615
"type": "ServiceRequest",
616-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics",
616+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-ServiceRequest",
617617
"documentation": "Endpoints for interacting with ServiceRequest resources",
618618
"interaction": [
619619
{
@@ -704,7 +704,7 @@
704704
},
705705
{
706706
"type": "PractitionerRole",
707-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics",
707+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole",
708708
"documentation": "Endpoints for interacting with PractitionerRole resources",
709709
"interaction": [
710710
{
@@ -767,7 +767,7 @@
767767
},
768768
{
769769
"type": "Practitioner",
770-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics",
770+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Practitioner",
771771
"documentation": "Endpoints for interacting with Practitioner resources",
772772
"interaction": [
773773
{
@@ -814,7 +814,7 @@
814814
},
815815
{
816816
"type": "Organization",
817-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics",
817+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization",
818818
"documentation": "Endpoints for interacting with PractitionerRole resources",
819819
"interaction": [
820820
{
@@ -877,7 +877,7 @@
877877
},
878878
{
879879
"type": "DiagnosticReport",
880-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics",
880+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport",
881881
"documentation": "Endpoints for interacting with DiagnosticReport resources",
882882
"interaction": [
883883
{
@@ -968,7 +968,7 @@
968968
},
969969
{
970970
"type": "FamilyMemberHistory",
971-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics",
971+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory",
972972
"documentation": "Endpoints for interacting with FamilyMemberHistory resources",
973973
"interaction": [
974974
{
@@ -1035,7 +1035,7 @@
10351035
},
10361036
{
10371037
"type": "Observation",
1038-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics",
1038+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation",
10391039
"documentation": "Endpoints for interacting with Observation resources",
10401040
"interaction": [
10411041
{
@@ -1126,7 +1126,7 @@
11261126
},
11271127
{
11281128
"type": "Patient",
1129-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Patient-Genomics",
1129+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient",
11301130
"documentation": "Endpoints for interacting with Patient resources",
11311131
"interaction": [
11321132
{
@@ -1205,7 +1205,7 @@
12051205
},
12061206
{
12071207
"type": "Consent",
1208-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics",
1208+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Consent",
12091209
"documentation": "Endpoints for interacting with Consent resources",
12101210
"interaction": [
12111211
{
@@ -1276,7 +1276,7 @@
12761276
},
12771277
{
12781278
"type": "Condition",
1279-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics",
1279+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Condition",
12801280
"documentation": "Endpoints for interacting with Condition resources",
12811281
"interaction": [
12821282
{
@@ -1410,7 +1410,7 @@
14101410
},
14111411
{
14121412
"type": "Specimen",
1413-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics",
1413+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen",
14141414
"documentation": "Endpoints for interacting with Specimen resources",
14151415
"interaction": [
14161416
{
@@ -1675,7 +1675,7 @@
16751675
},
16761676
{
16771677
"type": "Provenance",
1678-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics",
1678+
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Provenance-Genomics",
16791679
"documentation": "For searching stored Provenance resources",
16801680
"interaction": [
16811681
{

‎CapabilityStatement/CapabilityStatement-genomics-requirements.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -85,55 +85,55 @@
8585
},
8686
{
8787
"type": "ServiceRequest",
88-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-ServiceRequest-Genomics"
88+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-ServiceRequest"
8989
},
9090
{
9191
"type": "PractitionerRole",
92-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-PractitionerRole-Genomics"
92+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-PractitionerRole"
9393
},
9494
{
9595
"type": "Practitioner",
96-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Practitioner-Genomics"
96+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Practitioner"
9797
},
9898
{
9999
"type": "Organization",
100-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Organization-Genomics"
100+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Organization"
101101
},
102102
{
103103
"type": "DiagnosticReport",
104-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-DiagnosticReport-Genomics"
104+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport"
105105
},
106106
{
107107
"type": "FamilyMemberHistory",
108-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-FamilyMemberHistory-Genomics"
108+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-FamilyMemberHistory"
109109
},
110110
{
111111
"type": "Observation",
112-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Observation-Genomics"
112+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation"
113113
},
114114
{
115115
"type": "Patient",
116116
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient"
117117
},
118118
{
119119
"type": "Consent",
120-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Consent-Genomics"
120+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Consent"
121121
},
122122
{
123123
"type": "Condition",
124-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Condition-Genomics"
124+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Condition"
125125
},
126126
{
127127
"type": "ResearchSubject",
128128
"profile": "http://hl7.org/fhir/StructureDefinition/ResearchSubject"
129129
},
130130
{
131131
"type": "RelatedPerson",
132-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-RelatedPerson-Genomics"
132+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-RelatedPerson"
133133
},
134134
{
135135
"type": "Specimen",
136-
"profile": "https://fhir.nhs.uk/StructureDefinition/NHSDigital-Specimen-Genomics"
136+
"profile": "https://fhir.hl7.org.uk/StructureDefinition/UKCore-Specimen"
137137
},
138138
{
139139
"type": "Questionnaire",

0 commit comments

Comments
 (0)