Skip to content

Commit 9d249b7

Browse files
omarisgreatomarisgreat
authored
Merge pull request #214 from NHSDigital/Feature-IOPS-4132-GEL-Issues
IOPS-4132 GEL Simplifier Issues #2731 #2727 #2728
2 parents db61fee + 7dd72b7 commit 9d249b7

38 files changed

Lines changed: 731 additions & 282 deletions

File tree

‎Bundle/Bundle-NonWGSScenario3-FetusAsProband-Example.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,17 @@
279279
]
280280
},
281281
"subject": {
282-
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305"
282+
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305",
283+
"identifier": {
284+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
285+
"value": "Fetus-A-8955713713",
286+
"assigner": {
287+
"identifier": {
288+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
289+
"value": "RAX"
290+
}
291+
}
292+
}
283293
},
284294
"effectiveDateTime": "2023-09-25",
285295
"valueBoolean": false
@@ -311,7 +321,17 @@
311321
]
312322
},
313323
"subject": {
314-
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305"
324+
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305",
325+
"identifier": {
326+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
327+
"value": "Fetus-A-8955713713",
328+
"assigner": {
329+
"identifier": {
330+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
331+
"value": "RAX"
332+
}
333+
}
334+
}
315335
},
316336
"request": [
317337
{

‎Bundle/Bundle-NonWGSScenario4-ProbandWithMultipleFetus-Example.json‎

Lines changed: 66 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,17 @@
199199
]
200200
},
201201
"subject": {
202-
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305"
202+
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305",
203+
"identifier": {
204+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
205+
"value": "Fetus-A-8955713713",
206+
"assigner": {
207+
"identifier": {
208+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
209+
"value": "RAX"
210+
}
211+
}
212+
}
203213
},
204214
"authoredOn": "2023-09-25",
205215
"requester": {
@@ -270,7 +280,17 @@
270280
]
271281
},
272282
"subject": {
273-
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305"
283+
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305",
284+
"identifier": {
285+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
286+
"value": "Fetus-A-8955713713",
287+
"assigner": {
288+
"identifier": {
289+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
290+
"value": "RAX"
291+
}
292+
}
293+
}
274294
},
275295
"effectiveDateTime": "2023-09-25",
276296
"valueBoolean": false
@@ -302,7 +322,17 @@
302322
]
303323
},
304324
"subject": {
305-
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305"
325+
"reference": "Patient/849705be-9ed3-499c-ab8a-5579dd02d305",
326+
"identifier": {
327+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
328+
"value": "Fetus-A-8955713713",
329+
"assigner": {
330+
"identifier": {
331+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
332+
"value": "RAX"
333+
}
334+
}
335+
}
306336
},
307337
"request": [
308338
{
@@ -476,7 +506,17 @@
476506
]
477507
},
478508
"subject": {
479-
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c"
509+
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c",
510+
"identifier": {
511+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
512+
"value": "Fetus-B-7855713723",
513+
"assigner": {
514+
"identifier": {
515+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
516+
"value": "RAX"
517+
}
518+
}
519+
}
480520
},
481521
"authoredOn": "2026-01-27",
482522
"requester": {
@@ -547,7 +587,17 @@
547587
]
548588
},
549589
"subject": {
550-
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c"
590+
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c",
591+
"identifier": {
592+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
593+
"value": "Fetus-B-7855713723",
594+
"assigner": {
595+
"identifier": {
596+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
597+
"value": "RAX"
598+
}
599+
}
600+
}
551601
},
552602
"effectiveDateTime": "2023-09-25",
553603
"valueBoolean": false
@@ -579,7 +629,17 @@
579629
]
580630
},
581631
"subject": {
582-
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c"
632+
"reference": "Patient/a3e24d16-9079-4b07-b406-5c28f05bea8c",
633+
"identifier": {
634+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
635+
"value": "Fetus-B-7855713723",
636+
"assigner": {
637+
"identifier": {
638+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
639+
"value": "RAX"
640+
}
641+
}
642+
}
583643
},
584644
"request": [
585645
{

‎Bundle/Bundle-NonWGSScenario5-ProductsofConception-Example.json‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,16 @@
395395
},
396396
{
397397
"reference": "urn:uuid:037d8ff3-da35-4fad-9d28-7a120d4fffe9",
398+
"identifier": {
399+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
400+
"value": "FoetusA",
401+
"assigner": {
402+
"identifier": {
403+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
404+
"value": "RAX"
405+
}
406+
}
407+
},
398408
"type": "Patient"
399409
}
400410
],
@@ -562,6 +572,16 @@
562572
},
563573
"subject": {
564574
"reference": "urn:uuid:037d8ff3-da35-4fad-9d28-7a120d4fffe9",
575+
"identifier": {
576+
"system": "urn:oid:2.16.840.1.113883.2.1.3.2.4.18.24",
577+
"value": "FoetusA",
578+
"assigner": {
579+
"identifier": {
580+
"system": "https://fhir.nhs.uk/Id/ods-organization-code",
581+
"value": "RAX"
582+
}
583+
}
584+
},
565585
"type": "Patient"
566586
},
567587
"effectiveDateTime": "2025-08-25",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@
447447
]
448448
},
449449
"subject": {
450+
"reference": "Patient/Patient-ZelmaHadjkiss-Example",
450451
"identifier": {
451452
"system": "https://fhir.nhs.uk/Id/nhs-number",
452453
"value": "944930555"

0 commit comments

Comments
 (0)