Merge branch 'master' into do-20230609-trivy

gradle.properties

@@ -1,5 +1,5 @@
 # Versions
-kindlingVersion=1.8.7-SNAPSHOT
+kindlingVersion=1.8.9-SNAPSHOT
 
 org.gradle.parallel=true
 org.gradle.daemon=true

implementations/translations.xml

@@ -841,6 +841,9 @@
 	<item id="InsurancePlan">
 		<translation lang="en">InsurancePlan</translation>
 	</item>
+	<item id="InsuranceProduct">
+		<translation lang="en">InsuranceProduct</translation>
+	</item>
 	<item id="Network">
 		<translation lang="en">Network</translation>
 	</item>
@@ -1384,6 +1387,7 @@
 	</item>
 	<item id="MSG_REMOTE_FAIL" ecode="true">
 		<translation lang="en">Unable to resolve local reference to resource %s</translation>
+		<translation lang="nl">Kon referentie naar lokale resource %s niet vinden</translation>
 	</item>
 	<item id="MSG_NO_MATCH" ecode="true">
 		<translation lang="en">No Resource found matching the query "%s"</translation>
@@ -1471,6 +1475,7 @@
 	</item>
   <item id="MSG_PARAM_INVALID_TARGETTYPE">
 		<translation lang="en">Parameter "%s" is invalid because the type of resource referenced is not specified</translation>
+  	<translation lang="nl">Parameter "%s" is ongeldig omdat het type ontbreekt van de resource waarnaar wordt verwezen</translation>
   </item>
 	<item id="MSG_RESOURCE_EXAMPLE_PROTECTED" ecode="true">
 		<translation lang="en">Resources with identity "example" cannot be deleted (for testing/training purposes)</translation>
@@ -2247,63 +2252,83 @@
 
 	<item id="DJSON-ASYNC">
 		<translation lang="en">ND-json is only supported for asynchronous calls</translation>
+		<translation lang="nl">ND-json wordt alleen ondersteund voor asynchrone aanroepen</translation>
 	</item>
 	<item id="VERSION_MISSING">
 		<translation lang="en">No specific version specified in the Accept: header</translation>
+		<translation lang="nl">Geen specifieke versie opgenomen in de Accept: header</translation>
 	</item>
 	<item id="VERSION_UNSUPPORTED">
 		<translation lang="en">The version %s is not supported</translation>
+		<translation lang="nl">Versie %s wordt niet ondersteund</translation>
 	</item>
 	<item id="CANNOT_FIND">
 		<translation lang="en">Unable to fetch %s/%s</translation>
+		<translation lang="nl">Kan %s/%s niet ophalen</translation>
 	</item>
 	<item id="LOGIN_REQUIRED">
 		<translation lang="en">You must login before performing this action</translation>
+		<translation lang="nl">Voor deze actie is inloggen vereist</translation>
 	</item>
 	<item id="NO_ASYNC">
 		<translation lang="en">Asynchronous processing not supported for this request</translation>
+		<translation lang="nl">Asynchrone verwerking wordt niet ondersteund voor dit verzoek</translation>
 	</item>
 	<item id="TASK_FMT_MISMATCH">
 		<translation lang="en">Error: the request format (%s) does not match the task format (%s)</translation>
+		<translation lang="nl">Fout: het request-formaat (%s) komt niet overeen met het task-formaat (%s)</translation>
 	</item>
 	<item id="FORMAT_UNRECOGNIZED">
 		<translation lang="en">Unable to determine the format for %s</translation>
+		<translation lang="nl">Kon het formaat niet bepalen voor %s</translation>
 	</item>
 	<item id="VERSION_HEADER_MISMATCH">
 		<translation lang="en">Version mismatch between Accept: and Content-Type: Headers</translation>
+		<translation lang="nl">Versies komen niet overeen tussen Accept: en Content-Type: headers</translation>
 	</item>
 	<item id="GRAPHQL_NOT_FOUND">
 		<translation lang="en">Unable to find GraphQL to execute</translation>
+		<translation lang="nl">Kon GraphQL niet vinden om uit te voeren</translation>
 	</item>
 	<item id="GRAPHQL_ERROR">
 		<translation lang="en">Error processing graphQL</translation>
+		<translation lang="nl">Fout bij verwerken graphQL</translation>
 	</item>
 	<item id="NOT_DONE_YET">
 		<translation lang="en">Not Done Yet</translation>
+		<translation lang="nl">Nog niet gereed</translation>
 	</item>
 	<item id="UNKNOWN_QUERY">
 		<translation lang="en">The query "%s" is not known</translation>
+		<translation lang="nl">De query "%s" is onbekend</translation>
 	</item>
 	<item id="SUBSETTED">
 		<translation lang="en">Error %s: This resource has been subsetted, and cannot be used as the basis for this operation</translation>
+		<translation lang="nl">Fout %s: Deze resource is een subset van gemaakt en kan niet als basis dienen voor deze bewerking</translation>
 	</item>
 	<item id="UNKNOWN_FILTER_OPERATOR">
 		<translation lang="en">Unhandled filter operator value "%s"</translation>
+		<translation lang="nl">Niet-verwerkte filteroperatorwaarde "%s"</translation>
 	</item>
 	<item id="COMPARTMENT_ERROR">
 		<translation lang="en">Compartment error: no access to compartment for %s</translation>
+		<translation lang="nl">Compartment fout: geen toegang tot compartment voor %s</translation>
 	</item>
 	<item id="JWT_NO_SOURCE">
 		<translation lang="en">No Source System specified</translation>
+		<translation lang="nl">Geen Source System gespecificeerd</translation>
 	</item>
 	<item id="OP_NO_RESOURCE">
 		<translation lang="en">Unable to find %s to expand (not provided by id, identifier, or directly)</translation>
+		<translation lang="nl">Kon %s niet vinden voor expansie (niet op id, identifier of direct)</translation>
 	</item>
 	<item id="TRANSACTION_RESOURCE_MISSING">
 		<translation lang="en">A resource must be provided unless the entry has a transaction with method = delete and a url (entry %s)</translation>
+		<translation lang="nl">Er moet een resource wordt meegegeven tenzij de entry een transactie heeft met methode = delete en een url (entry %s)</translation>
 	</item>
 	<item id="MSG_UNKNOWN_COMPARTMENT">
 		<translation lang="en">Unknown Compartment %s    </translation>
+		<translation lang="nl">Onbekende compartment %s    </translation>
 	</item>
 
 

master-branch-pipeline.yml

@@ -77,10 +77,9 @@ jobs:
             -d "type=stream" \
             -d "to=$(ZULIP_STREAM_ID_COMMITTERS)" \
             -d "subject=FHIR Build Status" \
-            -d $"content=PR Build success for master branch:thumbs_up:! [build logs](https://dev.azure.com/fhir-pipelines/fhir-publisher/_build/results?buildId=$(Build.BuildId)&view=results) 
-            Published webpage can be viewed [here](https://build.fhir.org/)
+            -d $"content=PR Build success for master branch:thumbs_up:!
+            [build logs](https://dev.azure.com/fhir-pipelines/fhir-publisher/_build/results?buildId=$(Build.BuildId)&view=results) | [published webpage](https://build.fhir.org/)
             "
-
   - task: Bash@3
     condition: failed()
     inputs:

records.csv

@@ -1,4 +1,4 @@
-date,resources,types,profiles,paths,bindings,codelists,valuesets,codes,hints,warnings,uncovered,brokenlinks
+date,resources,types,profiles,paths,bindings,codelists,valuesets,codes,hints,warnings,uncovered,brokenlinks
 14/05/2013,43,75,2,1088,183,85,25,542,19,76,487,6
 15/05/2013,43,75,2,1083,183,85,25,543,19,74,482,6
 16/05/2013,44,76,2,1101,185,87,25,553,19,86,495,7
@@ -463,4 +463,5 @@ date,resources,types,profiles,paths,bindings,codelists,valuesets,codes,hints,war
 06/04/2023,157,225,22,6148,,,6064,,1874,160,,
 26/03/2023,157,225,22,6148,,,6064,,1874,160,,
 26/03/2023,157,225,22,6148,,,6064,,1874,160,,
-28/03/2023,157,225,22,6148,,,6064,,1874,160,,
+28/03/2023,157,225,22,6148,,,6064,,1874,160,,
+01/09/2023,157,225,22,6154,,,6084,,1890,159,,

source/account/structuredefinition-Account.xml

@@ -33,7 +33,7 @@
   <title value="Account"/>
   <status value="draft"/>
   <date value="2021-01-02T08:58:31+11:00"/>
-  <publisher value="Health Level Seven International (Patient Administration)"/>
+  <publisher value="HL7 International / Patient Administration"/>
   <contact>
     <telecom>
       <system value="url"/>

source/activitydefinition/structuredefinition-ActivityDefinition.xml

@@ -35,7 +35,7 @@
 	<title value="Activity Definition"/>
 	<status value="draft"/>
 	<date value="2021-01-05T10:01:24+11:00"/>
-	<publisher value="Health Level Seven International (Clinical Decision Support)"/>
+	<publisher value="HL7 International / Clinical Decision Support"/>
 	<contact>
 		<telecom>
 			<system value="url"/>

source/actordefinition/actordefinition-client.xml

@@ -11,6 +11,19 @@
   <title value="Client Actor"/>
   <status value="active"/>
   <date value="2021-11-02T14:31:30.239Z"/>
+  <publisher value="HL7 International / FHIR Infrastructure"/>
+  <contact>
+    <telecom>
+      <system value="url"/>
+      <value value="http://hl7.org/fhir"/>
+    </telecom>
+  </contact>
+  <contact>
+    <telecom>
+      <system value="url"/>
+      <value value="http://www.hl7.org/Special/committees/fiwg/index.cfm"/>
+    </telecom>
+  </contact>
   <description value="Client Actor"/>
   <type value="system"/>
 </ActorDefinition>

source/actordefinition/actordefinition-server.xml

@@ -11,6 +11,19 @@
   <title value="Server Actor"/>
   <status value="active"/>
   <date value="2021-11-02T14:31:30.239Z"/>
+  <publisher value="HL7 International / FHIR Infrastructure"/>
+  <contact>
+    <telecom>
+      <system value="url"/>
+      <value value="http://hl7.org/fhir"/>
+    </telecom>
+  </contact>
+  <contact>
+    <telecom>
+      <system value="url"/>
+      <value value="http://www.hl7.org/Special/committees/fiwg/index.cfm"/>
+    </telecom>
+  </contact>
   <description value="Server Actor"/>
   <type value="system"/>
 </ActorDefinition>

source/actordefinition/structuredefinition-ActorDefinition.xml

@@ -35,7 +35,7 @@
 	<title value="Actor Definition"/>
 	<status value="active"/>
 	<date value="2021-01-05T10:01:24+11:00"/>
-	<publisher value="Health Level Seven International (Vocabulary)"/>
+	<publisher value="HL7 International / Terminology Infrastructure"/>
 	<contact>
 		<telecom>
 			<system value="url"/>

source/administrableproductdefinition/structuredefinition-AdministrableProductDefinition.xml

@@ -33,7 +33,7 @@
   <title value="Administrable Product Definition"/>
   <status value="draft"/>
   <date value="2020-12-31T07:32:20+11:00"/>
-  <publisher value="Health Level Seven International (Biomedical Research and Regulation)"/>
+  <publisher value="HL7 International / Biomedical Research and Regulation"/>
   <contact>
     <telecom>
       <system value="url"/>

source/administration-module.html

@@ -146,6 +146,7 @@ <h4>Service Provider Directory Resources</h4>
             [%res-item Endpoint%]
             [%res-item OrganizationAffiliation%]
             [%res-item InsurancePlan%]
+            [%res-item InsuranceProduct%]
         </table>
         <div>
             <img src="administration-module-prov-dir.png" alt="Image showing the provider directory resources" width="513px" />

source/adverseevent/adverseevent-event-mapping-exceptions.xml

@@ -40,8 +40,7 @@
         </definitionUnmatched>
     </divergentElement>
     <divergentElement patternPath="Event.subject" resourcePath="AdverseEvent.subject">
-        <extraTypes
-            _resource="Reference(Practitioner,RelatedPerson,ResearchSubject)" reason="Unknown"/>
+        <extraTypes _resource="Reference(Practitioner,RelatedPerson)" reason="Unknown"/>
         <shortUnmatched reason="Unknown">
             <_pattern value="Individual service was done for/to"/>
             <resource value="Subject impacted by event"/>
@@ -73,14 +72,30 @@
             <resource value=""/>
         </requirementsUnmatched>
     </divergentElement>
-    <divergentElement patternPath="Event.occurrence[x]" resourcePath="AdverseEvent.occurrence[x]">
+    <divergentElement patternPath="Event.occurrence[x]" resourcePath="AdverseEvent.cause[x]">
+        <missingTypes _pattern="Timing" reason="Unknown"/>
         <shortUnmatched reason="Unknown">
             <_pattern value="When adverse event occurred/is occurring"/>
-            <resource value="When the event occurred"/>
+            <resource value="When the cause of the AdverseEvent occurred"/>
         </shortUnmatched>
         <definitionUnmatched reason="Unknown">
             <_pattern value="The date, period or timing when the adverse event did occur or is occurring."/>
-            <resource value="The date (and perhaps time) when the adverse event occurred."/>
+            <resource value="The date (and perhaps time) when the cause of the AdverseEvent occurred."/>
+        </definitionUnmatched>
+        <commentsUnmatched reason="Unknown">
+            <_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 &quot;basedOn&quot;.  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.&#xa;."/>
+            <resource value=""/>
+        </commentsUnmatched>
+    </divergentElement>
+    <divergentElement patternPath="Event.occurrence[x]" resourcePath="AdverseEvent.effect[x]">
+        <missingTypes _pattern="Timing" reason="Unknown"/>
+        <shortUnmatched reason="Unknown">
+            <_pattern value="When adverse event occurred/is occurring"/>
+            <resource value="When the effect of the AdverseEvent occurred"/>
+        </shortUnmatched>
+        <definitionUnmatched reason="Unknown">
+            <_pattern value="The date, period or timing when the adverse event did occur or is occurring."/>
+            <resource value="The date (and perhaps time) when the effect of the AdverseEvent occurred."/>
         </definitionUnmatched>
         <commentsUnmatched reason="Unknown">
             <_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 &quot;basedOn&quot;.  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.&#xa;."/>
@@ -123,7 +138,6 @@
         </requirementsUnmatched>
     </divergentElement>
     <divergentElement patternPath="Event.performer.actor" resourcePath="AdverseEvent.participant.actor">
-        <extraTypes _resource="Reference(ResearchSubject)" reason="Unknown"/>
         <shortUnmatched reason="Unknown">
             <_pattern value="Who performed adverse event"/>
             <resource value="Who was involved in the adverse event or the potential adverse event"/>

source/adverseevent/adverseevent-introduction.xml

@@ -37,16 +37,15 @@
 		<p>
 			The AdverseEvent resource is designed to represent events that had a harmful impact on a subject, or had the potential to cause harm to a subject but were avoided.  In the course of medical care, there are many actions that may impact how a subject responds to a particular treatment impacting patient safety.  Therefore, the AdverseEvent resource may reference multiple other resources to represent the context or details of an adverse event such as Observation, Condition, MedicationAdministration, Immunization, Procedure, or ResearchStudy.  
 		</p>
-		<p>
-			A DetectedIssue reference is also related to the context of an AdverseEvent to the extent that a known risk for a potential issue, such as a drug-drug interaction, is documented. If, in the context of a known issue, an adverse event occurs, citing this relationship is important for preventing such an occurrence in the future.
-		</p>
 		<p>
 			The AdverseEvent resource should not be used when a more specific resource exists. 
 		</p>
 		<ul>
 			<li>The AllergyIntolerance resource is a case specific means of capturing the condition of an allergy or intolerance and the criticality (or potential for future harm) based on the response of a particular individual.</li>
 			<li>The Clinical Reasoning module provides resources and operations to enable the representation, distribution, and evaluation of clinical knowledge artifacts, such as clinical decision support rules, quality measures, order sets, and protocols.  The suite of resources within the clinical reasoning module should be used to capture clinical quality measures and clinical protocols that help drive clinical best practices.</li>
 			<li>The AdverseEvent resource is not intended to be used to capture potential subject risk in a prospective manner.  A more appropriate resource for this purpose would be RiskAssessment which captures predicted outcomes for a patient or population on the basis of source information. Examples include a prognosis statement for a particular condition, risk of health outcome (heart attack, particular type of cancer) on the basis of lifestyle factors and/or family history, or list of potential health risks based on a patient's genetic analysis.</li>
+			<li>A DetectedIssue reference is also related to the context of an AdverseEvent to the extent that a known risk for a potential issue, such as a drug-drug interaction, is documented. If, in the context of a known issue, an adverse event occurs, citing this relationship is important for preventing such an occurrence in the future. DetectedIssue only applies to documenting a risk associated with a specific planned or ongoing action, or the lack of an action which should be planned - not a general propensity to risk.</li>
+			<li>Flags highlight highly condensed view of information found in other resources, which may include AdverseEvent. The purpose of these other resources is to provide detailed clinical information. The purpose of a Flag is to alert practitioners to information that is important to influence their interaction with a Patient prior to detailed review of the record.</li>
 		</ul>
 	</div>
 

source/adverseevent/structuredefinition-AdverseEvent.xml

@@ -33,7 +33,7 @@
   <title value="Adverse Event"/>
   <status value="draft"/>
   <date value="2021-01-02T08:58:31+11:00"/>
-  <publisher value="Health Level Seven International (Patient Care)"/>
+  <publisher value="HL7 International / Patient Care"/>
   <contact>
     <telecom>
       <system value="url"/>

source/allergyintolerance/structuredefinition-AllergyIntolerance.xml

@@ -33,7 +33,7 @@
   <title value="Allergy Intolerance"/>
   <status value="draft"/>
   <date value="2021-01-02T08:58:31+11:00"/>
-  <publisher value="Health Level Seven International (Patient Care)"/>
+  <publisher value="HL7 International / Patient Care"/>
   <contact>
     <telecom>
       <system value="url"/>

source/ansi.html

@@ -18,7 +18,7 @@ <h2>HL7, ANSI and the FHIR Standard</h2>
 <p>
 FHIR Release 5 will not be submitted to <a href="https://www.ansi.org/">ANSI</a>
 for consideration as a Normative standard. None of the new content in R5 
-is considered Normative, and will be subject for futher review during the 
+is considered Normative, and will be subject for further review during the 
 review and ballot process for Release 6. Note that content that was 
 normative for Release 4 remains in effect normative, and will be treated 
 accordingly during the R6 process.

source/appointment/structuredefinition-Appointment.xml

@@ -33,7 +33,7 @@
   <title value="Appointment"/>
   <status value="draft"/>
   <date value="2021-01-02T08:58:31+11:00"/>
-  <publisher value="Health Level Seven International (Patient Administration)"/>
+  <publisher value="HL7 International / Patient Administration"/>
   <contact>
     <telecom>
       <system value="url"/>
@@ -229,7 +229,7 @@
     <element id="Appointment.cancellationReason">
       <path value="Appointment.cancellationReason"/>
       <short value="The coded reason for the appointment being cancelled"/>
-      <definition value="The coded reason for the appointment being cancelled. This is often used in reporting/billing/futher processing to determine if further actions are required, or specific fees apply."/>
+      <definition value="The coded reason for the appointment being cancelled. This is often used in reporting/billing/further processing to determine if further actions are required, or specific fees apply."/>
       <min value="0"/>
       <max value="1"/>
       <type>