Skip to content

Commit e279a7b

Browse files
omarisgreatomarisgreat
authored
Merge pull request #198 from NHSDigital/omarisgreat-patch-2
Correcting reference.identifier
2 parents 6abf11a + 8ed3fe3 commit e279a7b

6 files changed

Lines changed: 54 additions & 66 deletions

‎Bundle/Bundle-NonWGSTestOrderForm-FetalScenario-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -540,18 +540,16 @@
540540
},
541541
"subject": {
542542
"reference": "Patient/Patient-FoetusOfRyanneBoulder-Example",
543-
"identifier": [
544-
{
545-
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
546-
"value": "FT-RWT13521",
547-
"assigner": {
548-
"identifier": {
549-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
550-
"value": "RAX"
551-
}
543+
"identifier": {
544+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
545+
"value": "FT-RWT13521",
546+
"assigner": {
547+
"identifier": {
548+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
549+
"value": "RAX"
552550
}
553551
}
554-
]
552+
}
555553
},
556554
"effectiveDateTime": "2023-09-25",
557555
"valueBoolean": false
@@ -905,4 +903,4 @@
905903
}
906904
}
907905
]
908-
}
906+
}

‎ServiceRequest/ServiceRequest-NonWGSTestOrderForm-FetalScenario-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,16 @@
5050
},
5151
"subject": {
5252
"reference": "Patient/Patient-FoetusOfRyanneBoulder-Example",
53-
"identifier": [
54-
{
55-
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
56-
"value": "FT-RWT13521",
57-
"assigner": {
58-
"identifier": {
59-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
60-
"value": "RAX"
61-
}
53+
"identifier": {
54+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
55+
"value": "FT-RWT13521",
56+
"assigner": {
57+
"identifier": {
58+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
59+
"value": "RAX"
6260
}
6361
}
64-
]
62+
}
6563
},
6664
"authoredOn": "2023-09-25",
6765
"requester": {
@@ -122,4 +120,4 @@
122120
"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ E.g. large echogenic kidneys with normal bladder"
123121
}
124122
]
125-
}
123+
}

‎ServiceRequest/ServiceRequest-NonWGSTestOrderForm-UsingStoredSample-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,16 @@
8888
"specimen": [
8989
{
9090
"reference": "Specimen/Specimen-BloodEDTA-WithCollectionDetails-Example",
91-
"identifier": [
92-
{
93-
"system": "https://fhir.bwc.nhs.uk//Id/specimenId",
94-
"value": "RQ3-RTH-698C0-17543",
95-
"assigner": {
96-
"identifier": {
97-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
98-
"value": "RQ3"
99-
}
91+
"identifier": {
92+
"system": "https://fhir.bwc.nhs.uk//Id/specimenId",
93+
"value": "RQ3-RTH-698C0-17543",
94+
"assigner": {
95+
"identifier": {
96+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
97+
"value": "RQ3"
10098
}
10199
}
102-
]
100+
}
103101
}
104102
],
105103
"note": [
@@ -110,4 +108,4 @@
110108
"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ patient to be tested for FH, use existing DNA sample in storage"
111109
}
112110
]
113-
}
111+
}

‎ServiceRequest/ServiceRequest-NonWGSTestOrderFormUpdated-FetalScenario-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,16 @@
5454
},
5555
"subject": {
5656
"reference": "Patient/Patient-FoetusOfRyanneBoulder-Example",
57-
"identifier": [
58-
{
59-
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
60-
"value": "FT-RWT13521",
61-
"assigner": {
62-
"identifier": {
63-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
64-
"value": "RAX"
65-
}
57+
"identifier": {
58+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
59+
"value": "FT-RWT13521",
60+
"assigner": {
61+
"identifier": {
62+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
63+
"value": "RAX"
6664
}
6765
}
68-
]
66+
}
6967
},
7068
"authoredOn": "2023-09-26T10:00:00Z",
7169
"requester": {
@@ -126,4 +124,4 @@
126124
"text": "Free text for diagnosis/reason for referral, relevant information including family history, phenotypic details/ HPO Terms/ E.g. large echogenic kidneys with normal bladder"
127125
}
128126
]
129-
}
127+
}

‎Task/Task-NonWGSRareDiseaseTestOrderAccepted-FetalScenario-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,16 @@
2727
},
2828
"for": {
2929
"reference": "Patient/Patient-FoetusOfRyanneBoulder-Example",
30-
"identifier": [
31-
{
32-
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
33-
"value": "FT-RWT13521",
34-
"assigner": {
35-
"identifier": {
36-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
37-
"value": "RAX"
38-
}
30+
"identifier": {
31+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
32+
"value": "FT-RWT13521",
33+
"assigner": {
34+
"identifier": {
35+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
36+
"value": "RAX"
3937
}
4038
}
41-
]
39+
}
4240
},
4341
"authoredOn": "2023-09-25T10:00:00Z",
4442
"lastModified": "2023-10-02T09:37:00Z",
@@ -57,4 +55,4 @@
5755
"text": "Optional Free Text field to record any additional details"
5856
}
5957
]
60-
}
58+
}

‎Task/Task-NonWGSRareDiseaseTestOrderRejected-FetalScenario-Example.json‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,16 @@
2727
},
2828
"for": {
2929
"reference": "Patient/Patient-FoetusOfRyanneBoulder-Example",
30-
"identifier": [
31-
{
32-
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
33-
"value": "FT-RWT13521",
34-
"assigner": {
35-
"identifier": {
36-
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
37-
"value": "RAX"
38-
}
30+
"identifier": {
31+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
32+
"value": "FT-RWT13521",
33+
"assigner": {
34+
"identifier": {
35+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
36+
"value": "RAX"
3937
}
4038
}
41-
]
39+
}
4240
},
4341
"authoredOn": "2023-09-25T10:00:00Z",
4442
"lastModified": "2023-10-01T10:18:00Z",
@@ -57,4 +55,4 @@
5755
"text": "Optional Free Text field to record any additional details"
5856
}
5957
]
60-
}
58+
}

0 commit comments

Comments
 (0)