Skip to content

Commit 9c16a6c

Browse files
eesa456eesa456
committed
Merge branch 'develop' of github.com:NHSDigital/NRLF into feature/eema1-NRL-1076-IdentifyLinkedStudiesAndReports
2 parents 123f837 + 8215abe commit 9c16a6c

32 files changed

+2054
-620
lines changed

‎api/consumer/swagger.yaml‎

Lines changed: 82 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1065,15 +1065,19 @@ components:
10651065
$ref: "#/components/schemas/Attachment"
10661066
description: The document or URL of the document along with critical metadata to prove content has integrity.
10671067
format:
1068-
$ref: "#/components/schemas/Coding"
1068+
$ref: "#/components/schemas/NRLFormatCode"
10691069
description: An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.
10701070
extension:
10711071
type: array
10721072
items:
1073-
$ref: "#/components/schemas/Extension"
1074-
description: Additional content defined by implementations.
1073+
$ref: "#/components/schemas/ContentStabilityExtension"
1074+
description: Additional extension for content stability.
1075+
minItems: 1
1076+
maxItems: 1
10751077
required:
10761078
- attachment
1079+
- format
1080+
- extension
10771081
DocumentReferenceRelatesTo:
10781082
type: object
10791083
properties:
@@ -1130,6 +1134,9 @@ components:
11301134
type: string
11311135
pattern: ([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?
11321136
description: The date that the attachment was first created.
1137+
required:
1138+
- contentType
1139+
- url
11331140
CodeableConcept:
11341141
type: object
11351142
properties:
@@ -1146,11 +1153,6 @@ components:
11461153
type: string
11471154
pattern: "[ \\r\\n\\t\\S]+"
11481155
description: A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user.
1149-
extension:
1150-
type: array
1151-
items:
1152-
$ref: "#/components/schemas/Extension"
1153-
description: Additional content defined by implementations.
11541156
Coding:
11551157
type: object
11561158
properties:
@@ -1187,6 +1189,78 @@ components:
11871189
type: string
11881190
pattern: \S*
11891191
description: The reference details for the link.
1192+
ContentStabilityExtension:
1193+
allOf:
1194+
- $ref: "#/components/schemas/Extension"
1195+
- type: object
1196+
properties:
1197+
url:
1198+
type: string
1199+
enum:
1200+
- "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
1201+
valueCodeableConcept:
1202+
$ref: "#/components/schemas/ContentStabilityExtensionValueCodeableConcept"
1203+
required:
1204+
- url
1205+
- valueCodeableConcept
1206+
ContentStabilityExtensionValueCodeableConcept:
1207+
allOf:
1208+
- $ref: "#/components/schemas/CodeableConcept"
1209+
- type: object
1210+
properties:
1211+
coding:
1212+
type: array
1213+
items:
1214+
$ref: "#/components/schemas/ContentStabilityExtensionCoding"
1215+
minItems: 1
1216+
maxItems: 1
1217+
required:
1218+
- coding
1219+
ContentStabilityExtensionCoding:
1220+
allOf:
1221+
- $ref: "#/components/schemas/Coding"
1222+
- type: object
1223+
properties:
1224+
system:
1225+
type: string
1226+
enum:
1227+
- "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability"
1228+
code:
1229+
type: string
1230+
enum: ["static", "dynamic"]
1231+
display:
1232+
type: string
1233+
enum: ["Static", "Dynamic"]
1234+
required:
1235+
- system
1236+
- code
1237+
- display
1238+
NRLFormatCode:
1239+
allOf:
1240+
- $ref: "#/components/schemas/Coding"
1241+
- type: object
1242+
properties:
1243+
system:
1244+
type: string
1245+
enum:
1246+
- "https://fhir.nhs.uk/England/CodeSystem/England-NRLFormatCode"
1247+
description: The system URL for the NRLF Format Code.
1248+
code:
1249+
type: string
1250+
enum:
1251+
- "urn:nhs-ic:record-contact"
1252+
- "urn:nhs-ic:unstructured"
1253+
description: The code representing the format of the document.
1254+
display:
1255+
type: string
1256+
enum:
1257+
- "Contact details (HTTP Unsecured)"
1258+
- "Unstructured Document"
1259+
description: The display text for the code.
1260+
required:
1261+
- system
1262+
- code
1263+
- display
11901264
Identifier:
11911265
type: object
11921266
properties:

‎api/producer/swagger.yaml‎

Lines changed: 84 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -334,7 +334,7 @@ paths:
334334
{
335335
"system": "https://fhir.nhs.uk/England/CodeSystem/England-NRLFormatCode",
336336
"code": "urn:nhs-ic:unstructured"
337-
"display": "Unstructured document"
337+
"display": "Unstructured Document"
338338
}
339339
]
340340
```
@@ -1215,7 +1215,7 @@ components:
12151215
format:
12161216
system: https://fhir.nhs.uk/England/CodeSystem/England-NRLFormatCode
12171217
code: "urn:nhs-ic:unstructured"
1218-
display: Unstructured document
1218+
display: Unstructured Document
12191219
context:
12201220
event:
12211221
- coding:
@@ -1630,15 +1630,19 @@ components:
16301630
$ref: "#/components/schemas/Attachment"
16311631
description: The document or URL of the document along with critical metadata to prove content has integrity.
16321632
format:
1633-
$ref: "#/components/schemas/Coding"
1633+
$ref: "#/components/schemas/NRLFormatCode"
16341634
description: An identifier of the document encoding, structure, and template that the document conforms to beyond the base format indicated in the mimeType.
16351635
extension:
16361636
type: array
16371637
items:
1638-
$ref: "#/components/schemas/Extension"
1639-
description: Additional content defined by implementations.
1638+
$ref: "#/components/schemas/ContentStabilityExtension"
1639+
description: Additional extension for content stability.
1640+
minItems: 1
1641+
maxItems: 1
16401642
required:
16411643
- attachment
1644+
- format
1645+
- extension
16421646
DocumentReferenceRelatesTo:
16431647
type: object
16441648
properties:
@@ -1695,6 +1699,9 @@ components:
16951699
type: string
16961700
pattern: ([0-9]([0-9]([0-9][1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2][0-9]|3[0-1])(T([01][0-9]|2[0-3]):[0-5][0-9]:([0-5][0-9]|60)(\.[0-9]+)?(Z|(\+|-)((0[0-9]|1[0-3]):[0-5][0-9]|14:00)))?)?)?
16971701
description: The date that the attachment was first created.
1702+
required:
1703+
- contentType
1704+
- url
16981705
CodeableConcept:
16991706
type: object
17001707
properties:
@@ -1711,12 +1718,6 @@ components:
17111718
type: string
17121719
pattern: "[ \\r\\n\\t\\S]+"
17131720
description: A human language representation of the concept as seen/selected/uttered by the user who entered the data and/or which represents the intended meaning of the user.
1714-
extension:
1715-
type: array
1716-
items:
1717-
$ref: "#/components/schemas/Extension"
1718-
description: Additional content defined by implementations.
1719-
17201721
Coding:
17211722
type: object
17221723
properties:
@@ -1753,6 +1754,78 @@ components:
17531754
type: string
17541755
pattern: \S*
17551756
description: The reference details for the link.
1757+
ContentStabilityExtension:
1758+
allOf:
1759+
- $ref: "#/components/schemas/Extension"
1760+
- type: object
1761+
properties:
1762+
url:
1763+
type: string
1764+
enum:
1765+
- "https://fhir.nhs.uk/England/StructureDefinition/Extension-England-ContentStability"
1766+
valueCodeableConcept:
1767+
$ref: "#/components/schemas/ContentStabilityExtensionValueCodeableConcept"
1768+
required:
1769+
- url
1770+
- valueCodeableConcept
1771+
ContentStabilityExtensionValueCodeableConcept:
1772+
allOf:
1773+
- $ref: "#/components/schemas/CodeableConcept"
1774+
- type: object
1775+
properties:
1776+
coding:
1777+
type: array
1778+
items:
1779+
$ref: "#/components/schemas/ContentStabilityExtensionCoding"
1780+
minItems: 1
1781+
maxItems: 1
1782+
required:
1783+
- coding
1784+
ContentStabilityExtensionCoding:
1785+
allOf:
1786+
- $ref: "#/components/schemas/Coding"
1787+
- type: object
1788+
properties:
1789+
system:
1790+
type: string
1791+
enum:
1792+
- "https://fhir.nhs.uk/England/CodeSystem/England-NRLContentStability"
1793+
code:
1794+
type: string
1795+
enum: ["static", "dynamic"]
1796+
display:
1797+
type: string
1798+
enum: ["Static", "Dynamic"]
1799+
required:
1800+
- system
1801+
- code
1802+
- display
1803+
NRLFormatCode:
1804+
allOf:
1805+
- $ref: "#/components/schemas/Coding"
1806+
- type: object
1807+
properties:
1808+
system:
1809+
type: string
1810+
enum:
1811+
- "https://fhir.nhs.uk/England/CodeSystem/England-NRLFormatCode"
1812+
description: The system URL for the NRLF Format Code.
1813+
code:
1814+
type: string
1815+
enum:
1816+
- "urn:nhs-ic:record-contact"
1817+
- "urn:nhs-ic:unstructured"
1818+
description: The code representing the format of the document.
1819+
display:
1820+
type: string
1821+
enum:
1822+
- "Contact details (HTTP Unsecured)"
1823+
- "Unstructured Document"
1824+
description: The display text for the code.
1825+
required:
1826+
- system
1827+
- code
1828+
- display
17561829
Identifier:
17571830
type: object
17581831
properties:

0 commit comments

Comments
 (0)