Merge pull request #376 from NHSDigital/fix/ExamplesSTU2

changed examples to non lab
NHSDigital · May 25, 2023 · 78d69a1 · 78d69a1
2 parents d705cec + b4d35c7
commit 78d69a1
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 63 deletions.
diff --git a/examples/UKCore-DiagnosticReport-DiagnosticStudiesReport-Example.xml b/examples/UKCore-DiagnosticReport-DiagnosticStudiesReport-Example.xml
@@ -6,6 +6,13 @@
 		<value value="727071dc-eb01-4224-8ee8-cc0a029787ac"/>
 	</identifier>
 	<status value="final"/>
+	<category>
+		<coding>
+			<system value="http://terminology.hl7.org/CodeSystem/v2-0074"/>
+			<code value="PHY"/>
+			<display value="Physician (Hx. Dx, admission note, etc.)"/>
+		</coding>
+	</category>
 	<code>
 		<coding>
 			<system value="http://snomed.info/sct"/>
@@ -16,14 +23,12 @@
 	<subject>
 		<reference value="Patient/UKCore-Patient-RichardSmith-Example"/>
 	</subject>
+	<effectiveDateTime value="2023-01-13T14:53:23+00:00"/>
 	<performer>
 		<reference value="Organization/UKCore-Organization-LeedsTeachingHospital-Example"/>
 		<display value="LEEDS TEACHING HOSPITALS NHS TRUST"/>
 	</performer>
-	<specimen>
-		<reference value="Specimen/UKCore-Specimen-BloodSpecimen-Example"/>
-	</specimen>
 	<result>
-		<reference value="Observation/UKCore-Observation-WhiteCellCount-Example"/>
+		<reference value="UKCore-Observation-FingerJointInflamed-Example"/>
 	</result>
 </DiagnosticReport>
diff --git a/examples/UKCore-Observation-WhiteCellCount-Example.xml b/examples/UKCore-Observation-WhiteCellCount-Example.xml
diff --git a/structuredefinitions/UKCore-DiagnosticReport-Lab.xml b/structuredefinitions/UKCore-DiagnosticReport-Lab.xml
@@ -26,6 +26,15 @@
   <baseDefinition value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport" />
   <derivation value="constraint" />
   <differential>
+    <element id="DiagnosticReport">
+      <path value="DiagnosticReport" />
+      <constraint>
+        <key value="ukcore-diag-lab-001" />
+        <severity value="warning" />
+        <human value="An effective time SHALL be given present if status = partial, preliminary, final, amended, corrected or appended" />
+        <expression value="effective.exists() or (effective.empty() and (status in ('partial' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'appended')).not())" />
+      </constraint>
+    </element>
     <element id="DiagnosticReport.category">
       <path value="DiagnosticReport.category" />
       <slicing>
@@ -67,15 +76,6 @@
         <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient" />
       </type>
     </element>
-    <element id="DiagnosticReport.effective[x]">
-      <path value="DiagnosticReport.effective[x]" />
-      <constraint>
-        <key value="ukcore-diag-lab-001" />
-        <severity value="warning" />
-        <human value="An effective time SHALL be given present if status = partial, preliminary, final, amended, corrected or appended" />
-        <expression value="effective.exists() or (effective.empty() and (status in ('partial' | 'preliminary' | 'final' | 'amended' | 'corrected' | 'appended')).not())" />
-      </constraint>
-    </element>
     <element id="DiagnosticReport.result">
       <path value="DiagnosticReport.result" />
       <type>

diff --git a/structuredefinitions/UKCore-Observation-LabGroup.xml b/structuredefinitions/UKCore-Observation-LabGroup.xml
@@ -26,6 +26,15 @@
   <baseDefinition value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Observation" />
   <derivation value="constraint" />
   <differential>
+    <element id="Observation">
+      <path value="Observation" />
+      <constraint>
+        <key value="ukcore-obs-labgrp-001" />
+        <severity value="warning" />
+        <human value="value[x] SHOULD NOT be used within this Profile" />
+        <expression value="value.empty()" />
+      </constraint>
+    </element>
     <element id="Observation.category">
       <path value="Observation.category" />
       <slicing>
@@ -71,15 +80,6 @@
         <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-Patient" />
       </type>
     </element>
-    <element id="Observation.value[x]">
-      <path value="Observation.value[x]" />
-      <constraint>
-        <key value="ukcore-obs-labgrp-001" />
-        <severity value="warning" />
-        <human value="This element SHOULD NOT be used within this Profile" />
-        <expression value="value.empty()" />
-      </constraint>
-    </element>
     <element id="Observation.hasMember">
       <path value="Observation.hasMember" />
       <type>