Merge pull request #511 from NHSDigital/stu2ballot/Min1MustSupport

must support on min 1.. elements (STU2)
NHSDigital · Feb 16, 2024 · b75b5a3 · b75b5a3
2 parents 91cf4c2 + 1a14eb3
commit b75b5a3
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 4 deletions.
diff --git a/structuredefinitions/UKCore-DiagnosticReport-Lab.xml b/structuredefinitions/UKCore-DiagnosticReport-Lab.xml
@@ -101,6 +101,7 @@
       <sliceName value="laboratory" />
       <min value="1" />
       <max value="1" />
+      <mustSupport value="true" />
     </element>
     <element id="DiagnosticReport.category:laboratory.coding.system">
       <path value="DiagnosticReport.category.coding.system" />

diff --git a/structuredefinitions/UKCore-Encounter.xml b/structuredefinitions/UKCore-Encounter.xml
@@ -71,6 +71,10 @@
       <path value="Encounter.identifier" />
       <mustSupport value="true" />
     </element>
+    <element id="Encounter.status">
+      <path value="Encounter.status" />
+      <mustSupport value="true" />
+    </element>
     <element id="Encounter.class">
       <path value="Encounter.class" />
       <mustSupport value="true" />

diff --git a/structuredefinitions/UKCore-List.xml b/structuredefinitions/UKCore-List.xml
@@ -51,6 +51,10 @@
       <path value="List.status" />
       <mustSupport value="true" />
     </element>
+    <element id="List.mode">
+      <path value="List.mode" />
+      <mustSupport value="true" />
+    </element>
     <element id="List.code">
       <path value="List.code" />
       <mustSupport value="true" />

diff --git a/structuredefinitions/UKCore-Observation-Group-Lab.xml b/structuredefinitions/UKCore-Observation-Group-Lab.xml
@@ -81,9 +81,9 @@
         <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.bodyStructure" />
       </type>
     </element>
-    <element id="Observation.extension:bodyStructureR5.url">
-      <path value="Observation.extension.url" />
-      <fixedUri value="http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.bodyStructure" />
+    <element id="Observation.status">
+      <path value="Observation.status" />
+      <mustSupport value="true" />
     </element>
     <element id="Observation.category">
       <path value="Observation.category" />
@@ -95,12 +95,14 @@
         <rules value="open" />
       </slicing>
       <min value="1" />
+      <mustSupport value="true" />
     </element>
     <element id="Observation.category:laboratory">
       <path value="Observation.category" />
       <sliceName value="laboratory" />
       <min value="1" />
       <max value="1" />
+      <mustSupport value="true" />
     </element>
     <element id="Observation.category:laboratory.coding.system">
       <path value="Observation.category.coding.system" />
@@ -112,6 +114,7 @@
     </element>
     <element id="Observation.code">
       <path value="Observation.code" />
+      <mustSupport value="true" />
       <binding>
         <strength value="preferred" />
         <description value="A code from the SNOMED Clinical Terminology UK coding system regrading laboratory medicine test requests and test group results" />
@@ -142,4 +145,4 @@
       <max value="0" />
     </element>
   </differential>
-</StructureDefinition>
+</StructureDefinition>
diff --git a/structuredefinitions/UKCore-Observation-Lab.xml b/structuredefinitions/UKCore-Observation-Lab.xml
@@ -81,6 +81,10 @@
         <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.bodyStructure" />
       </type>
     </element>
+    <element id="Observation.status">
+      <path value="Observation.status" />
+      <mustSupport value="true" />
+    </element>
     <element id="Observation.category">
       <path value="Observation.category" />
       <slicing>
@@ -91,12 +95,14 @@
         <rules value="open" />
       </slicing>
       <min value="1" />
+      <mustSupport value="true" />
     </element>
     <element id="Observation.category:laboratory">
       <path value="Observation.category" />
       <sliceName value="laboratory" />
       <min value="1" />
       <max value="1" />
+      <mustSupport value="true" />
     </element>
     <element id="Observation.category:laboratory.coding.system">
       <path value="Observation.category.coding.system" />
@@ -108,6 +114,7 @@
     </element>
     <element id="Observation.code">
       <path value="Observation.code" />
+      <mustSupport value="true" />
       <binding>
         <strength value="preferred" />
         <description value="A code from the SNOMED Clinical Terminology UK coding system regrading laboratory medicine test results" />

diff --git a/structuredefinitions/UKCore-Slot.xml b/structuredefinitions/UKCore-Slot.xml
@@ -49,6 +49,10 @@
       <path value="Slot.appointmentType" />
       <mustSupport value="true" />
     </element>
+    <element id="Slot.schedule">
+      <path value="Slot.schedule" />
+      <mustSupport value="true" />
+    </element>
     <element id="Slot.status">
       <path value="Slot.status" />
       <mustSupport value="true" />