Skip to content

Commit baa02aa

Browse files
ygaudetygaudet
authored
Merge branch 'master' into ygaudet-FHIR-49167
2 parents 86661c3 + 8e71abb commit baa02aa

37 files changed

Lines changed: 561 additions & 161 deletions

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Versions
2-
kindlingVersion=1.11.0-SNAPSHOT
2+
kindlingVersion=1.12.0-SNAPSHOT
33

44
org.gradle.parallel=true
55
org.gradle.daemon=true

source/examplescenario/codesystem-examplescenario-actor-type.xml renamed to source/actordefinition/codesystem-actordefinition-actor-type.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<CodeSystem xmlns="http://hl7.org/fhir">
4-
<id value="examplescenario-actor-type"/>
4+
<id value="actordefinition-actor-type"/>
55
<meta>
66
<profile value="http://hl7.org/fhir/StructureDefinition/shareablecodesystem"/>
77
</meta>
@@ -14,14 +14,10 @@
1414
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm">
1515
<valueInteger value="0"/>
1616
</extension>
17-
<url value="http://hl7.org/fhir/examplescenario-actor-type"/>
18-
<identifier>
19-
<system value="urn:ietf:rfc:3986"/>
20-
<value value="urn:oid:2.16.840.1.113883.4.642.4.859"/>
21-
</identifier>
17+
<url value="http://hl7.org/fhir/actordefinition-actor-type"/>
2218
<version value="6.0.0"/>
23-
<name value="ExampleScenarioActorType"/>
24-
<title value="Example Scenario Actor Type"/>
19+
<name value="ActorDefinitionActorType"/>
20+
<title value="Actor Definition Actor Type"/>
2521
<status value="draft"/>
2622
<experimental value="false"/>
2723
<date value="2021-01-05T10:01:24+11:00"/>
@@ -38,7 +34,7 @@
3834
</contact>
3935
<description value="The type of actor - system or human."/>
4036
<caseSensitive value="true"/>
41-
<valueSet value="http://hl7.org/fhir/ValueSet/examplescenario-actor-type"/>
37+
<valueSet value="http://hl7.org/fhir/ValueSet/actordefinition-actor-type"/>
4238
<content value="complete"/>
4339
<concept>
4440
<code value="system"/>

‎source/actordefinition/structuredefinition-ActorDefinition.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -410,11 +410,11 @@
410410
<isSummary value="true"/>
411411
<binding>
412412
<extension url="http://hl7.org/fhir/StructureDefinition/elementdefinition-bindingName">
413-
<valueString value="ExampleScenarioActorType"/>
413+
<valueString value="ActorDefinitionActorType"/>
414414
</extension>
415415
<strength value="required"/>
416416
<description value="The type of actor - system or human."/>
417-
<valueSet value="http://hl7.org/fhir/ValueSet/examplescenario-actor-type"/>
417+
<valueSet value="http://hl7.org/fhir/ValueSet/actordefinition-actor-type"/>
418418
</binding>
419419
</element>
420420
<element id="ActorDefinition.documentation">

source/examplescenario/valueset-examplescenario-actor-type.xml renamed to source/actordefinition/valueset-actordefinition-actor-type.xml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22

33
<ValueSet xmlns="http://hl7.org/fhir">
4-
<id value="examplescenario-actor-type"/>
4+
<id value="actordefinition-actor-type"/>
55
<meta>
66
<profile value="http://hl7.org/fhir/StructureDefinition/shareablevalueset"/>
77
</meta>
@@ -14,14 +14,10 @@
1414
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm">
1515
<valueInteger value="0"/>
1616
</extension>
17-
<url value="http://hl7.org/fhir/ValueSet/examplescenario-actor-type"/>
18-
<identifier>
19-
<system value="urn:ietf:rfc:3986"/>
20-
<value value="urn:oid:2.16.840.1.113883.4.642.3.858"/>
21-
</identifier>
17+
<url value="http://hl7.org/fhir/ValueSet/actordefinition-actor-type"/>
2218
<version value="6.0.0"/>
23-
<name value="ExampleScenarioActorType"/>
24-
<title value="Example Scenario Actor Type"/>
19+
<name value="ActorDefinitionActorType"/>
20+
<title value="Actor Definition Actor Type"/>
2521
<status value="draft"/>
2622
<experimental value="false"/>
2723
<date value="2020-12-28T16:55:11+11:00"/>
@@ -40,7 +36,7 @@
4036
<immutable value="true"/>
4137
<compose>
4238
<include>
43-
<system value="http://hl7.org/fhir/examplescenario-actor-type"/>
39+
<system value="http://hl7.org/fhir/actordefinition-actor-type"/>
4440
</include>
4541
</compose>
4642
</ValueSet>

‎source/bundle/bundle-notes.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,50 @@
1212
<li>Bundles have both .id and .identifier - see <a href="resource.html#id">Resource Identities</a> for further information</li>
1313
</ul>
1414

15+
16+
<a name="additional"></a>
17+
<h3>Using additional resources in Bundles</h3>
18+
<p>
19+
Bundle entries contain resources which may be either be one of the <%res-type-count%> resources
20+
defined in this specification, or an <a href="resource.html#additional">additional resource</a>.
21+
</p>
22+
<p>
23+
In JSON, this looks like:
24+
</p>
25+
<pre class="json">
26+
{
27+
"resourceType" : "Bundle",
28+
"entry" : [{
29+
"resource" : {
30+
"resourceType" : "ViewDefinition",
31+
"resourceDefinition" : "http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition|2.0.0-pre",
32+
"id": "a-valid-id",
33+
// etc
34+
}
35+
}]
36+
}
37+
</pre>
38+
<p>
39+
In XML, this looks like:
40+
</p>
41+
<pre class="xml">
42+
&lt;Bundle xmlns="http://hl7.org/fhir"&gt;
43+
&lt;entry&gt;
44+
&lt;resource&gt;
45+
&lt;ViewDefinition xmlns="http://hl7.org/fhir"
46+
resourceDefinition="http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition|2.0.0-pre">
47+
<id value="a-valid-id"/>
48+
// etc
49+
&lt;ViewDefinition&gt;
50+
&lt;/resource&gt;
51+
&lt;/entry&gt;
52+
&lt;/Bundle&gt;
53+
</pre>
54+
55+
<blockquote class="ballot-note">
56+
<p>See <a href="resource.html#additional">general note to balloters</a> about Additional resources</p>
57+
</blockquote>
58+
1559
<a name="using"></a>
1660

1761
<h3>Using Bundles</h3>

‎source/bundle/structuredefinition-Bundle.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,7 @@
412412
<path value="Bundle.entry.resource"/>
413413
<short value="A resource in the bundle"/>
414414
<definition value="The Resource for the entry. The purpose/meaning of the resource is determined by the Bundle.type. This is allowed to be a Parameters resource if and only if it is referenced by something else within the Bundle that provides context/meaning."/>
415+
<comment value="This may be a resource defined in the FHIR specification, or an [additional resource](resource.html#additional)"/>
415416
<min value="0"/>
416417
<max value="1"/>
417418
<type>

‎source/capabilitystatement/capabilitystatement-notes.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,21 @@ A CapabilityStatement declares two different kinds of profiles for the functiona
104104
For a discussion of the use of these two types of resources, see <a href="profiling.html">two uses for profiles</a>.
105105
</p>
106106

107+
108+
<a name="additional"> </a>
109+
<h3>Using additional resources in CapabilityStatements</h3>
110+
<p>
111+
CapabilityStatements may represent the use of <a href="resource.html#additional">additional resource</a>.
112+
When doing so, <code>CapabilityStatement.rest.resource.type</code> contains the type of the resource
113+
as defined in the <a href="https://chat.fhir.org/#narrow/channel/491058-Additional-Resource-Proposals">HL7 registry</a>,
114+
along with a reference to the definition of the resource in <code>CapabilityStatement.rest.resource.definition</code>.
115+
The definition SHALL contain a version specific reference to the definition. The definition SHALL NOT be present
116+
if the resource type is one defined in this specification.
117+
</p>
118+
119+
<blockquote class="ballot-note">
120+
<p>See <a href="resource.html#additional">general note to balloters</a> about Additional resources</p>
121+
</blockquote>
122+
123+
107124
</div>

‎source/capabilitystatement/structuredefinition-CapabilityStatement.xml‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@
925925
<element id="CapabilityStatement.rest.resource.type">
926926
<path value="CapabilityStatement.rest.resource.type"/>
927927
<short value="A resource type that is supported"/>
928-
<definition value="A type of resource exposed via the restful interface."/>
928+
<definition value="A type of resource exposed via the restful interface, either a resource defined in this specification, or an [additional resource](resource.html#additional)."/>
929929
<min value="1"/>
930930
<max value="1"/>
931931
<type>
@@ -941,10 +941,22 @@
941941
<valueBoolean value="true"/>
942942
</extension>
943943
<strength value="required"/>
944-
<description value="One of the resource types defined as part of this version of FHIR."/>
945-
<valueSet value="http://hl7.org/fhir/ValueSet/resource-types"/>
944+
<description value="One of the resource types defined as part of this version of FHIR. Note that this includes additional resources, and is not a fixed list"/>
945+
<valueSet value="http://hl7.org/fhir/ValueSet/extended-resource-types"/>
946946
</binding>
947947
</element>
948+
<element id="CapabilityStatement.rest.resource.definition">
949+
<path value="CapabilityStatement.rest.resource.definition"/>
950+
<short value="The definition for an additional resource"/>
951+
<definition value="The definition of the resource, if the resource is an additional resource. If it is not an additional resource, then this element must not be present."/>
952+
<min value="0"/>
953+
<max value="1"/>
954+
<type>
955+
<code value="canonical"/>
956+
<targetProfile value="http://hl7.org/fhir/StructureDefinition/StructureDefinition"/>
957+
</type>
958+
<isSummary value="true"/>
959+
</element>
948960
<element id="CapabilityStatement.rest.resource.profile">
949961
<path value="CapabilityStatement.rest.resource.profile"/>
950962
<short value="System-wide profile"/>

‎source/capabilitystatement/valueset-extended-resource-types.xml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<ValueSet xmlns="http://hl7.org/fhir">
4+
<id value="extended-resource-types"/>
5+
<meta>
6+
<profile value="http://hl7.org/fhir/StructureDefinition/shareablevalueset"/>
7+
</meta>
8+
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-wg">
9+
<valueCode value="fhir"/>
10+
</extension>
11+
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-standards-status">
12+
<valueCode value="normative"/>
13+
</extension>
14+
<extension url="http://hl7.org/fhir/StructureDefinition/structuredefinition-fmm">
15+
<valueInteger value="5"/>
16+
</extension>
17+
<url value="http://hl7.org/fhir/ValueSet/extended-resource-types"/>
18+
<version value="6.0.0"/>
19+
<name value="ExtendedResourceTypes"/>
20+
<title value="Extended Resource Types"/>
21+
<status value="active"/>
22+
<experimental value="false"/>
23+
<publisher value="HL7, International"/>
24+
<description value="Current and past FHIR resource types (deleted or renamed), and additional resource types. Note that the binding to additional resources is not version fixed, and will change over time"/>
25+
<immutable value="true"/>
26+
<compose>
27+
<include>
28+
<valueSet value="http://hl7.org/fhir/ValueSet/resource-types"/>
29+
</include>
30+
<include>
31+
<system value="http://hl7.org/fhir/fhir-old-types"/>
32+
</include>
33+
<include>
34+
<system value="http://hl7.org/fhir/tools/CodeSystem/additional-resources"/>
35+
</include>
36+
</compose>
37+
</ValueSet>

‎source/conceptmap/conceptmap-example-priority.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<version value="20220809"/>
55
<title value="Example map with priorities"/>
66
<status value="draft"/>
7+
<experimental value="false"/>
78
<publisher value="HL7 International / Terminology Infrastructure"/>
89
<contact>
910
<telecom>

0 commit comments

Comments
 (0)