Merge all recent develop changes into main

.github/workflows/QualityControlChecker.yml

@@ -14,4 +14,4 @@ on:
 jobs:
   # This workflow contains a single job called "call-workflow" which references the FHIR validator repo
   call-workflow:
-    uses: NHSDigital/IOPS-FHIR-Test-Scripts/.github/workflows/QualityControlCheckerUKCore.yml@main
+    uses: NHSDigital/IOPS-FHIR-Test-Scripts/.github/workflows/QualityControlChecker.yml@main

README.md

@@ -1,4 +1,5 @@
 # FHIR-R4-UKCORE-STAGING-MAIN
+This repository is maintained by [Interoperability Team]( https://nhsd-confluence.digital.nhs.uk/pages/viewpage.action?spaceKey=IOPS&title=Interoperability+Standards) Any queries contact us via [email]( [email protected]).
 
 UK Core Repository of FHIR Assets for HL7 FHIR® UK Core Implementation Guide [Simplifier project](https://simplifier.net/hl7fhirukcorer4).
 

codesystems/CodeSystem-UKCore-DateTimeType.xml

@@ -1,11 +1,11 @@
 <CodeSystem xmlns="http://hl7.org/fhir">
 	<id value="UKCore-DateTimeType"/>
 	<url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-DateTimeType"/>
-	<version value="2.0.0"/>
+	<version value="2.1.0"/>
 	<name value="UKCoreDateTimeType"/>
 	<title value="UK Core Date Time Type"/>
 	<status value="draft" />
-	<date value="2021-09-10" />
+	<date value="2023-10-13" />
 	<publisher value="HL7 UK" />
 	<contact>
 		<name value="HL7 UK" />
@@ -85,4 +85,9 @@
 		<display value="Clock Stop Date Time"/>
 		<definition value="The date/time that the first response arrived at the incident location that counts as the arrival time based on the National Ambulance Quality Indicator definitions"/>
 	</concept>
+	<concept>
+		<code value="last-changed-date"/>
+		<display value="Last Changed Date"/>
+		<definition value="The date/time that the data was last changed"/>
+	</concept>
 </CodeSystem>

codesystems/CodeSystem-UKCore-LegalStatusClassificationWales.xml

@@ -46,7 +46,7 @@
 	</concept>
 	<concept>
 		<code value="07" />
-		<display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused’s mental condition)" />
+		<display value="Formally detained under Mental Health Act Section 35 (Remand to hospital for report on accused's mental condition)" />
 	</concept>
 	<concept>
 		<code value="08" />

codesystems/CodeSystem-UKCore-MedicationRequestCategory.xml

@@ -1,34 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <CodeSystem xmlns="http://hl7.org/fhir">
-<id value="UKCore-MedicationRequestCategory"/>
-  <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-MedicationRequestCategory"/>
-  <version value="1.1.0" />
-  <name value="UKCoreMedicationRequestCategory"/>
-  <title value="UK Core Medication Request Category"/>
-  <status value="active" />
-  <date value="2022-12-16" />
-  <publisher value="HL7 UK" />
-  <contact>
-    <name value="HL7 UK" />
-    <telecom>
-      <system value="email" />
-      <value value="[email protected]" />
-      <use value="work" />
-      <rank value="1" />
-    </telecom>
-  </contact>
-  <description value="A set of codes to define additional category concepts for a medication request."/>
-  <copyright value="Copyright &#169; 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html." />
-  <caseSensitive value="true"/>
-  <content value="complete"/> 
-  <concept>
-    <code value="leave"/>
-    <display value="Leave"/>
-    <definition value="Requests for medications that the patient will take away with him/her during any short break from inpatient care. Typically requests would be dispensed by the hospital pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/>
-  </concept>
-  <concept>
-    <code value="primarycare"/>
-    <display value="Primary Care"/>
-    <definition value="Requests for medications originating in a primary care setting. Typically requests would be dispensed by the patients nominated pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/>
-  </concept>
+	<id value="UKCore-MedicationRequestCategory"/>
+	<url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-MedicationRequestCategory"/>
+	<version value="1.1.1"/>
+	<name value="UKCoreMedicationRequestCategory"/>
+	<title value="UK Core Medication Request Category"/>
+	<status value="active"/>
+	<date value="2023-10-06"/>
+	<publisher value="HL7 UK"/>
+	<contact>
+		<name value="HL7 UK"/>
+		<telecom>
+			<system value="email"/>
+			<value value="[email protected]"/>
+			<use value="work"/>
+			<rank value="1"/>
+		</telecom>
+	</contact>
+	<description value="A set of codes to define additional category concepts for a medication request."/>
+	<copyright value="Copyright &#169; 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html."/>
+	<caseSensitive value="true"/>
+	<content value="complete"/>
+	<concept>
+		<code value="leave"/>
+		<display value="Leave"/>
+		<definition value="Requests for medications that the patient will take away with him/her during any short break from inpatient care. Typically requests would be dispensed by the hospital pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/>
+	</concept>
+	<concept>
+		<code value="primarycare"/>
+		<display value="Primary Care"/>
+		<definition value="Requests for medications originating in a primary care setting. Typically requests would be dispensed by the patients nominated pharmacy to be self-administered at home with or without the assistance of community based nursing staff."/>
+		<property>
+			<code value="inactive"/>
+			<valueBoolean value="True"/>
+		</property>
+	</concept>
 </CodeSystem>

codesystems/CodeSystem-UKCore-PeriodType.xml

@@ -0,0 +1,31 @@
+<CodeSystem xmlns="http://hl7.org/fhir">
+	<id value="UKCore-PeriodType"/>
+	<url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PeriodType"/>
+	<version value="1.0.0"/>
+	<name value="UKCorePeriodType"/>
+	<title value="UK Core Period Type"/>
+	<status value="draft" />
+	<date value="2023-10-13" />
+	<publisher value="HL7 UK" />
+	<contact>
+		<name value="HL7 UK" />
+		<telecom>
+			<system value="email" />
+			<value value="[email protected]" />
+			<use value="work" />
+			<rank value="1" />
+		</telecom>
+	</contact>
+	<description value="CodeSystem to identify the type of period data being recorded."/>
+	<copyright value="Copyright &#169; 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html." />
+	<caseSensitive value="true"/>
+	<content value="complete"/>
+	<concept>
+		<code value="legal"/>
+		<display value="Legal"/>
+	</concept>
+	<concept>
+		<code value="operational"/>
+		<display value="Operational"/>
+	</concept>
+</CodeSystem>

codesystems/CodeSystem-UKCore-PreferredContactMethod.xml

@@ -2,11 +2,11 @@
 <CodeSystem xmlns="http://hl7.org/fhir">
   <id value="UKCore-PreferredContactMethod" />
   <url value="https://fhir.hl7.org.uk/CodeSystem/UKCore-PreferredContactMethod" />
-  <version value="2.1.0" />
+  <version value="2.2.0" />
   <name value="UKCorePreferredContactMethod" />
   <title value="UK Core Preferred Contact Method" />
   <status value="active" />
-  <date value="2021-09-10" />
+	<date value="2023-10-09" />
   <publisher value="HL7 UK" />
   <contact>
     <name value="HL7 UK" />
@@ -17,7 +17,7 @@
       <rank value="1" />
     </telecom>
   </contact>
-  <description value="A CodeSystem to identify the preferred contact method of a patient, contact or related person." />
+  <description value="A set of codes to identify the preferred contact method of a patient, contact or related person. These codes and their descriptions represent common communication methods and are originally sourced from the removed [NHS Data Dictionary PreferredContactMethod](https://data.developer.nhs.uk/dms/mim/3.1.09/Vocabulary/PreferredContactMethod.htm) list. SMS added 10/10/2023 for Galleri / Grail usage with a sequential code ID." />
   <copyright value="Copyright &#169; 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at  http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; standard is used under the FHIR license. You may obtain a copy of the FHIR license at  https://www.hl7.org/fhir/license.html." />
   <caseSensitive value="true" />
   <content value="complete" />
@@ -53,4 +53,8 @@
     <code value="8" />
     <display value="No Telephone contact" />
   </concept>
+  <concept>
+    <code value="9" />
+    <display value="SMS" />
+  </concept>
 </CodeSystem>

examples/UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example.xml → examples/UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example.xml

@@ -1,5 +1,5 @@
 <AllergyIntolerance xmlns="http://hl7.org/fhir">
-	<id value="UKCore-AllergyIntolerance-Sn-TransferDegradDrugAllergy-Example"/>
+	<id value="UKCore-AllergyIntolerance-Sn-TransferDegradedDrugAllergy-Example"/>
 	<clinicalStatus>
 		<coding>
 			<system value="http://terminology.hl7.org/CodeSystem/allergyintolerance-clinical"/>

examples/UKCore-Extension-BodySiteReference-Example.xml

@@ -26,7 +26,7 @@
 			</coding>
 		</method>
 		<bodySite>
-			<!-- Use of the bodySite R5 backport extension to reference a BodyStucture, in this case, the draw site. -->
+			<!-- Use of the bodySite R5 backport extension to reference a BodyStructure, in this case, the draw site. -->
 			<extension url="https://fhir.hl7.org.uk/StructureDefinition/Extension-UKCore-BodySiteReference">
 				<valueReference>
 					<reference value="BodyStructure/UKCore-BodyStructure-MedianCubitalVeinExample"/>

examples/UKCore-HealthcareService-OrthopaedicService-Example.xml

@@ -51,7 +51,7 @@
 		<coding>
 			<system value="http://terminology.hl7.org/CodeSystem/service-provision-conditions"/>
 			<code value="free"/>
-			<display value="	This service is available for no patient cost."/>
+			<display value="This service is available for no patient cost."/>
 		</coding>
 	</serviceProvisionCode>
 	<program>

examples/UKCore-Medication-Sn-TransferDegradMedEntry-Example.xml → examples/UKCore-Medication-Sn-TransferDegradedMedEntry-Example.xml

@@ -1,5 +1,5 @@
 <Medication xmlns="http://hl7.org/fhir">
-	<id value="UKCore-Medication-Sn-TransferDegradMedEntry-Example"/>
+	<id value="UKCore-Medication-Sn-TransferDegradedMedEntry-Example"/>
 	<!-- **************Snippet start************** -->
 	<code>
 		<coding>

structuredefinitions/Extension-UKCore-AnaestheticIssues.xml

@@ -47,8 +47,8 @@
     </element>
     <element id="Extension.value[x]">
       <path value="Extension.value[x]" />
-      <short value="Snomed Concept or a link to the Condition resource" />
-      <definition value="Snomed Concept or a link to the Condition resource." />
+      <short value="SNOMED CT Concept or a link to the Condition resource" />
+      <definition value="SNOMED CT Concept or a link to the Condition resource." />
       <min value="1" />
       <type>
         <code value="CodeableConcept" />