diff --git a/source/capabilitystatement/capabilitystatement-notes.xml b/source/capabilitystatement/capabilitystatement-notes.xml index f712d5ad638..0dd4d662b1b 100644 --- a/source/capabilitystatement/capabilitystatement-notes.xml +++ b/source/capabilitystatement/capabilitystatement-notes.xml @@ -108,7 +108,7 @@ For a discussion of the use of these two types of resources, see

Using additional resources in CapabilityStatements

-CapabilityStatements may represent the use of additional resource. +CapabilityStatements may represent the use of additional resources. When doing so, CapabilityStatement.rest.resource.type contains the type of the resource as defined in the HL7 registry, along with a reference to the definition of the resource in CapabilityStatement.rest.resource.definition. diff --git a/source/consent/consent-event-mapping-exceptions.xml b/source/consent/consent-event-mapping-exceptions.xml index d9aa12ef4c6..30622c892fd 100644 --- a/source/consent/consent-event-mapping-exceptions.xml +++ b/source/consent/consent-event-mapping-exceptions.xml @@ -71,7 +71,7 @@ - <_pattern value="This indicates when the activity actually occurred or is occurring, not when it was asked/requested/ordered to occur. For the latter, look at the occurrence element of the Request this {{event}} is "basedOn". The status code allows differentiation of whether the timing reflects a historic event or an ongoing event. Ongoing events should not include an upper bound in the Period or Timing.bounds. ."/> + <_pattern value="This indicates when the activity actually occurred or is occurring, not when it was asked/requested/ordered to occur. For the latter, look at the occurence element of the Request this {{event}} is "basedOn". The status code allows differentiation of whether the timing reflects a historic event or an ongoing event. Ongoing events should not include an upper bound in the Period or Timing.bounds. ."/> diff --git a/source/references.html b/source/references.html index 6e5fb57c9e1..1e00441ba62 100644 --- a/source/references.html +++ b/source/references.html @@ -313,22 +313,17 @@

Additional References

don't even exist in the version of FHIR being used, in which case the target would be a Basic instance using the inter-version conversion rules.
  • An additional resource has been defined that is a logical target for the element. Core elements - aren't permitted to have resource targets that are additional resources, though profiles might - wish to allow pointing to them.
    • + aren't permitted to have resource targets that are additional resources. When defining additional resources, the + additional-resource-reference-target + extension allows the relevant work group to indicate and approve that a core element (or another additional resource) + may refer to the resource. This allows the use of normal Reference.reference in deployments where both + the core and additional resource definitions are in scope.

    -In both of these cases, the solution is to use the alternate-reference extension. It allows -referencing any type of resource - including additional resources. The targetProfile used when -profiling this extension is free to point to a narrower profile than a resource - e.g., a specific +When the approach mentioned above does not apply, the solution is to use the alternate-reference extension. +The targetProfile used when profiling the extension is free to point to a narrower profile than a resource - e.g., a specific inter-version resource profile on Basic.

    -

    -In some cases, an additional resource may migrate to be a core resource and become allowed as a -target resource. Systems that have not yet updated to support that new core resource may -struggle with the migration of the reference from the additional-reference to the standard -Reference.reference element. Communication partners will need to manage this transition." -

    -

    Canonical URLs

    diff --git a/source/resource/resource-introduction.xml b/source/resource/resource-introduction.xml index 66ed925b519..15d8aebef5f 100644 --- a/source/resource/resource-introduction.xml +++ b/source/resource/resource-introduction.xml @@ -46,7 +46,7 @@ Note: there is documentation for the Structure, -

    Additional Resources defined Outside This Specification

    +

    Additional Resources Defined Outside This Specification

    This specification defines the base <%res-type-count%> resources that comprise the "FHIR resources". Additional resources may be defined in other specifications, @@ -56,7 +56,7 @@ other resources, or find that they need to, the following rules apply:

    @@ -78,6 +78,7 @@ encountered through this specification:
  • DomainResource.contained
  • Parameters.parameter.resource
    • +

    The introduction of 'custom' resource not defined through the process documented here is not conformant with the FHIR specification. Instances communicating resources not defined in this core specification or via the additional resources registration process cannot be called FHIR conformant.

    Moving Additional Resources to FHIR Core

    diff --git a/source/search.html b/source/search.html index 088ef713271..7d6abce7d42 100644 --- a/source/search.html +++ b/source/search.html @@ -3255,6 +3255,10 @@

    reference

    SHOULD match instances that match the reference in it contains a versioned reference.

    +

    + Instead of Reference.reference, some elements might instead contain the additionalReference extension. + Systems SHOULD support indexing and searching against content found in this extension as well unless there are constraints in place that ensure that additionalReference is never present. +

    For example, if the base URL of a server is http://example.org/fhir, the search: diff --git a/source/searchparameter/bundle-SearchParameter-search-params.xml b/source/searchparameter/bundle-SearchParameter-search-params.xml index 5595f9c2093..2fd6d519104 100644 --- a/source/searchparameter/bundle-SearchParameter-search-params.xml +++ b/source/searchparameter/bundle-SearchParameter-search-params.xml @@ -15,7 +15,7 @@ - + @@ -348,7 +348,7 @@ - + diff --git a/source/searchparameter/searchparameter-example.xml b/source/searchparameter/searchparameter-example.xml index 77522754470..21f231e9f6d 100644 --- a/source/searchparameter/searchparameter-example.xml +++ b/source/searchparameter/searchparameter-example.xml @@ -41,7 +41,7 @@ - + diff --git a/source/searchparameter/searchparameter-filter.xml b/source/searchparameter/searchparameter-filter.xml index 5570c6246d1..4359f4c9225 100644 --- a/source/searchparameter/searchparameter-filter.xml +++ b/source/searchparameter/searchparameter-filter.xml @@ -20,6 +20,6 @@ - + \ No newline at end of file diff --git a/source/searchparameter/structuredefinition-SearchParameter.xml b/source/searchparameter/structuredefinition-SearchParameter.xml index e9b0a7c6bd1..81123867e8b 100644 --- a/source/searchparameter/structuredefinition-SearchParameter.xml +++ b/source/searchparameter/structuredefinition-SearchParameter.xml @@ -510,7 +510,7 @@ - + @@ -518,8 +518,8 @@ - - + + @@ -601,15 +601,15 @@ - + - - + + diff --git a/source/structuredefinition/structuredefinition-notes.xml b/source/structuredefinition/structuredefinition-notes.xml index 25648c0bff5..daccbe535ef 100644 --- a/source/structuredefinition/structuredefinition-notes.xml +++ b/source/structuredefinition/structuredefinition-notes.xml @@ -231,7 +231,7 @@ This technique has many uses: following these rules:

      -
    • The canonical URL of the definition is in some other canonical space than http://hl7.org/fhir
      • +
    • The canonical URL of the definition is in the canonical space http://hl7.org/fhir
    • The fhirVersion SHALL be 6.0.0 or a subsequent published version of FHIR
    • The kind SHALL be resource
    • abstract SHALL be false
      • @@ -252,11 +252,11 @@ Here is an example with other properties removed: 
       {
   "resourceType" : "StructureDefinition",
-  "url" : "http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition",
+  "url" : "http://hl7.org/fhir/StructureDefinition/ViewDefinition",
   "fhirVersion" : "6.0.0",
   "kind" : "resource",
   "abstract" : false,
-  "type" : "http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition",
+  "type" : "http://hl7.org/fhir/StructureDefinition/ViewDefinition",
   "baseDefinition" : "http://hl7.org/fhir/StructureDefinition/CanonicalResource",
   "derivation" : "specialization",
   "differential" : {