Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions api/consumer/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "4409815415"
value: "9000000017"
date: "2022-12-20T09:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -200,7 +200,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "4409815415"
value: "9000000017"
date: "2022-12-21T10:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -315,7 +315,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "4409815415"
value: "9000000017"
date: "2022-12-22T11:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -1308,7 +1308,7 @@ components:
RequestQuerySubject:
type: string
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/nhs-number\|(\d+)$
example: "https://fhir.nhs.uk/Id/nhs-number|4409815415"
example: "https://fhir.nhs.uk/Id/nhs-number|9000000017"
RequestQueryCustodian:
type: string
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/ods-organization-code\|(\w+)$
Expand Down Expand Up @@ -1362,13 +1362,13 @@ components:
value: ""
valid_1:
summary: "Valid #1"
value: https://fhir.nhs.uk/Id/nhs-number|4409815415
value: https://fhir.nhs.uk/Id/nhs-number|9000000017
valid_2:
summary: "Valid #2"
value: https://fhir.nhs.uk/Id/nhs-number|3495456481
value: https://fhir.nhs.uk/Id/nhs-number|9999999999
invalid:
summary: Unknown
value: https://fhir.nhs.uk/Id/nhs-number|3495456001
value: https://fhir.nhs.uk/Id/nhs-number|9000000001
custodian:
name: custodian:identifier
in: query
Expand Down
20 changes: 10 additions & 10 deletions api/producer/swagger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ paths:
"subject": {
"identifier": {
"system": "https://fhir.nhs.uk/Id/nhs-number",
"value": "3495456481"
"value": "9999999999"
}
},
```
Expand Down Expand Up @@ -231,7 +231,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "3495456481"
value: "9999999999"
date: "2022-12-22T11:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -308,7 +308,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "3495456481"
value: "9999999999"
date: "2022-12-21T10:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -513,7 +513,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "3495456481"
value: "9999999999"
date: "2022-12-22T11:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -590,7 +590,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "3495456481"
value: "9999999999"
date: "2022-12-21T10:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -708,7 +708,7 @@ paths:
subject:
identifier:
system: https://fhir.nhs.uk/Id/nhs-number
value: "4409815415"
value: "9000000017"
date: "2022-12-22T11:45:41+11:00"
author:
- identifier:
Expand Down Expand Up @@ -1951,7 +1951,7 @@ components:
RequestQuerySubject:
type: string
pattern: ^https\:\/\/fhir\.nhs\.uk\/Id\/nhs-number\|(\d+)$
example: "https://fhir.nhs.uk/Id/nhs-number|4409815415"
example: "https://fhir.nhs.uk/Id/nhs-number|9000000017"
RequestQueryType:
type: string
example: "http://snomed.info/sct|736253002"
Expand Down Expand Up @@ -1997,13 +1997,13 @@ components:
value: ""
valid_1:
summary: "Valid #1"
value: https://fhir.nhs.uk/Id/nhs-number|4409815415
value: https://fhir.nhs.uk/Id/nhs-number|9000000017
valid_2:
summary: "Valid #2"
value: https://fhir.nhs.uk/Id/nhs-number|3495456481
value: https://fhir.nhs.uk/Id/nhs-number|9999999999
invalid:
summary: Unknown
value: https://fhir.nhs.uk/Id/nhs-number|3495456001
value: https://fhir.nhs.uk/Id/nhs-number|9000000001
type:
name: type
in: query
Expand Down
2 changes: 1 addition & 1 deletion layer/nrlf/consumer/fhir/r4/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ class RequestQuerySubject(RootModel[str]):
root: Annotated[
str,
Field(
examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"],
examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"],
pattern="^https\\:\\/\\/fhir\\.nhs\\.uk\\/Id\\/nhs-number\\|(\\d+)$",
),
]
Expand Down
2 changes: 1 addition & 1 deletion layer/nrlf/producer/fhir/r4/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ class RequestQuerySubject(RootModel[str]):
root: Annotated[
str,
Field(
examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"],
examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"],
pattern="^https\\:\\/\\/fhir\\.nhs\\.uk\\/Id\\/nhs-number\\|(\\d+)$",
),
]
Expand Down
2 changes: 1 addition & 1 deletion layer/nrlf/producer/fhir/r4/strict_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ class RequestPathParams(Parent):

class RequestQuerySubject(RootModel[StrictStr]):
root: Annotated[
StrictStr, Field(examples=["https://fhir.nhs.uk/Id/nhs-number|4409815415"])
StrictStr, Field(examples=["https://fhir.nhs.uk/Id/nhs-number|9000000017"])
]


Expand Down
Loading