Skip to content

Commit dd46ec1

Browse files
omarisgreatomarisgreat
authored
Merge pull request #115 from NHSDigital/Issue-2623
Correction to datatype
2 parents c651fb8 + 71387c2 commit dd46ec1

2 files changed

Lines changed: 30 additions & 30 deletions

File tree

‎GraphDefinition/GraphDefinition-Genomics-Test-Order.json‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -37,18 +37,18 @@
3737
"path": "ServiceRequest.subject",
3838
"description": "Link to patient the request is for",
3939
"min": 1,
40-
"max": 1,
40+
"max": "1",
4141
"target": [
4242
{
43-
"type": "Patient",
43+
"type": "Patient"
4444
}
4545
]
4646
},
4747
{
4848
"path": "ServiceRequest.requester",
4949
"description": "Link to the requester of the genomic test order",
5050
"min": 1,
51-
"max": 1,
51+
"max": "1",
5252
"target": [
5353
{
5454
"type": "PractitionerRole"
@@ -59,7 +59,7 @@
5959
"path": "ServiceRequest.reasonReference",
6060
"description": "Optional link to the primary condition constituting the reason for testing",
6161
"min": 0,
62-
"max": 1,
62+
"max": "1",
6363
"target": [
6464
{
6565
"type": "Condition"
@@ -78,7 +78,7 @@
7878
{
7979
"description": "Patient linked to this RelatedPerson",
8080
"min": 1,
81-
"max": 1,
81+
"max": "1",
8282
"target": [
8383
{
8484
"type": "Patient",
@@ -95,7 +95,7 @@
9595
"path": "Observation.extension.valueReference",
9696
"description": "Optional link to body structure related to the observation",
9797
"min": 0,
98-
"max": 1,
98+
"max": "1",
9999
"target": [
100100
{
101101
"type": "BodyStructure"
@@ -106,7 +106,7 @@
106106
"path": "Observation.focus",
107107
"description": "Optional link to specimen the observation is about, if relevant",
108108
"min": 0,
109-
"max": 1,
109+
"max": "1",
110110
"target": [
111111
{
112112
"type": "Specimen"
@@ -117,7 +117,7 @@
117117
"path": "Observation.performer",
118118
"description": "Optional link to actor who performed the observation (could be Patient, PractitionerRole or RelatedPerson)",
119119
"min": 0,
120-
"max": 1,
120+
"max": "1",
121121
"target": [
122122
{
123123
"type": "Resource"
@@ -144,7 +144,7 @@
144144
"path": "Condition.recorder",
145145
"description": "Optional link to actor which recorded condition (could be Patient, PreactitionerRole or RelatedPerson)",
146146
"min": 0,
147-
"max": 1,
147+
"max": "1",
148148
"target": [
149149
{
150150
"type": "Resource"
@@ -155,7 +155,7 @@
155155
"path": "Condition.asserter",
156156
"description": "Optional link to actor which asserted condition (could be Patient, PreactitionerRole or RelatedPerson)",
157157
"min": 0,
158-
"max": 1,
158+
"max": "1",
159159
"target": [
160160
{
161161
"type": "Resource"
@@ -209,7 +209,7 @@
209209
"path": "Consent.sourceReference",
210210
"description": "Optional link to structured QuestionnaireResponse or DocumentReference for RoD/consent forms",
211211
"min": 0,
212-
"max": 1,
212+
"max": "1",
213213
"target": [
214214
{
215215
"type": "QuestionnaireResponse",
@@ -218,7 +218,7 @@
218218
"path": "QuestionnaireResponse.author",
219219
"description": "Author of the RoD, most likely a PractitionerRole resource (if a reference)",
220220
"min": 1,
221-
"max": 1,
221+
"max": "1",
222222
"target": [
223223
{
224224
"type": "PractitionerRole"
@@ -229,7 +229,7 @@
229229
"path": "QuestionnaireResponse.source",
230230
"description": "Source of the RoD (could be Patient, PractitionerRole or RelatedPerson)",
231231
"min": 1,
232-
"max": 1,
232+
"max": "1",
233233
"target": [
234234
{
235235
"type": "Resource"
@@ -247,7 +247,7 @@
247247
"path": "Consent.patient",
248248
"description": "Link to Patient resource (relevant for instances where the consent does not apply to the proband)",
249249
"min": 1,
250-
"max": 1,
250+
"max": "1",
251251
"target": [
252252
{
253253
"type": "Patient"
@@ -263,7 +263,7 @@
263263
"path": "Specimen.subject",
264264
"description": "Link to the patient the specimen is from",
265265
"min": 1,
266-
"max": 1,
266+
"max": "1",
267267
"target": [
268268
{
269269
"type": "Patient"
@@ -274,7 +274,7 @@
274274
"path": "Specimen.parent",
275275
"description": "Link to parent specimen resource",
276276
"min": 0,
277-
"max": 1,
277+
"max": "1",
278278
"target": [
279279
{
280280
"type": "Specimen"
@@ -285,7 +285,7 @@
285285
"path": "Specimen.collection.collector",
286286
"description": "Link to collector of the specimen",
287287
"min": 0,
288-
"max": 1,
288+
"max": "1",
289289
"target": [
290290
{
291291
"type": "PractitionerRole"
@@ -297,7 +297,7 @@
297297
"sliceName": "bodySiteReference",
298298
"description": "Link to the body structure detailing the morphology and topography of the specimen",
299299
"min": 0,
300-
"max": 1,
300+
"max": "1",
301301
"target": [
302302
{
303303
"type": "BodyStructure"
@@ -321,7 +321,7 @@
321321
"path": "Specimen.subject",
322322
"description": "Link to the patient the specimen is from",
323323
"min": 1,
324-
"max": 1,
324+
"max": "1",
325325
"target": [
326326
{
327327
"type": "Patient"
@@ -332,7 +332,7 @@
332332
"path": "Specimen.parent",
333333
"description": "Link to parent specimen resource",
334334
"min": 0,
335-
"max": 1,
335+
"max": "1",
336336
"target": [
337337
{
338338
"type": "Specimen"
@@ -343,7 +343,7 @@
343343
"path": "Specimen.collection.collector",
344344
"description": "Link to collector of the specimen",
345345
"min": 0,
346-
"max": 1,
346+
"max": "1",
347347
"target": [
348348
{
349349
"type": "PractitionerRole"
@@ -355,7 +355,7 @@
355355
"sliceName": "bodySiteReference",
356356
"description": "Link to the body structure detailing the morphology and topography of the specimen",
357357
"min": 0,
358-
"max": 1,
358+
"max": "1",
359359
"target": [
360360
{
361361
"type": "BodyStructure"

‎GraphDefinition/GraphDefinition-Genomics-Test-Result.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"path": "DiagnosticReport.basedOn",
6868
"description": "Link to request this DiagnosticReport is in fulfillment of",
6969
"min": 1,
70-
"max": 1,
70+
"max": "1",
7171
"target": [
7272
{
7373
"type": "ServiceRequest"
@@ -78,10 +78,10 @@
7878
"path": "DiagnosticReport.subject",
7979
"description": "Link to the patient the report is concerning",
8080
"min": 1,
81-
"max": 1,
81+
"max": "1",
8282
"target": [
8383
{
84-
"type": "Patient",
84+
"type": "Patient"
8585
}
8686
]
8787
},
@@ -98,7 +98,7 @@
9898
"path": "Specimen.subject",
9999
"description": "Link to the patient the specimen is from",
100100
"min": 1,
101-
"max": 1,
101+
"max": "1",
102102
"target": [
103103
{
104104
"type": "Patient"
@@ -109,7 +109,7 @@
109109
"path": "Specimen.parent",
110110
"description": "Link to parent specimen resource",
111111
"min": 0,
112-
"max": 1,
112+
"max": "1",
113113
"target": [
114114
{
115115
"type": "Specimen"
@@ -120,7 +120,7 @@
120120
"path": "Specimen.collection.collector",
121121
"description": "Link to collector of the specimen",
122122
"min": 0,
123-
"max": 1,
123+
"max": "1",
124124
"target": [
125125
{
126126
"type": "PractitionerRole"
@@ -132,7 +132,7 @@
132132
"sliceName": "bodySiteReference",
133133
"description": "Link to the body structure detailing the morphology and topography of the specimen",
134134
"min": 0,
135-
"max": 1,
135+
"max": "1",
136136
"target": [
137137
{
138138
"type": "BodyStructure"
@@ -156,7 +156,7 @@
156156
"path": "Observation.performer",
157157
"description": "Optional link to actor who performed the observation (could be Patient, PractitionerRole or RelatedPerson)",
158158
"min": 0,
159-
"max": 1,
159+
"max": "1",
160160
"target": [
161161
{
162162
"type": "Resource"

0 commit comments

Comments
 (0)