Merge pull request #575 from NHSDigital/develop

merge dev in main
NHSDigital · Dec 17, 2024 · 015015e · 015015e
2 parents c1f2f4d + e0ab5d5
commit 015015e
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 21 deletions.
diff --git a/...sion-UKCore-DiagnosticReportMediaLink.xml → ...xtension-UKCore-DiagnosticReportMedia.xml b/...sion-UKCore-DiagnosticReportMediaLink.xml → ...xtension-UKCore-DiagnosticReportMedia.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <StructureDefinition xmlns="http://hl7.org/fhir">
-  <id value="Extension-UKCore-DiagnosticReportMediaLink" />
-  <url value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" />
-  <version value="0.0.1" />
-  <name value="ExtensionUKCoreDiagnosticReportMediaLink" />
-  <title value="Extension UK Core Diagnostic Report Media Link" />
+  <id value="Extension-UKCore-DiagnosticReportMedia" />
+  <url value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media" />
+  <version value="0.0.3" />
+  <name value="ExtensionUKCoreDiagnosticReportMedia" />
+  <title value="Extension UK Core Diagnostic Report Media" />
   <status value="draft" />
-  <date value="2024-06-07" />
+  <date value="2024-12-16" />
   <publisher value="HL7 UK" />
   <contact>
     <name value="HL7 UK" />
@@ -38,8 +38,8 @@
   <differential>
     <element id="Extension">
       <path value="Extension" />
-      <short value="Reference to a  DocumentReference resource." />
-      <min value="1" />
+      <short value="Key images or data associated with this report" />
+      <definition value="A list of key images or data associated with this report. The images or data are generally created during the diagnostic process, and may be directly of the patient, or of treated specimens (i.e. slides of interest)." />
     </element>
     <element id="Extension.extension">
       <path value="Extension.extension" />
@@ -48,6 +48,9 @@
     <element id="Extension.extension:comment">
       <path value="Extension.extension" />
       <sliceName value="comment" />
+      <short value="Comment about the image or data (e.g. explanation)" />
+      <definition value="A comment about the image or data. Typically, this is used to provide an explanation for why the image or data is included, or to draw the viewer's attention to important features." />
+      <comment value="The comment should be displayed with the image or data. It would be common for the report to include additional discussion of the image or data contents or in other sections such as the conclusion." />
     </element>
     <element id="Extension.extension:comment.url">
       <path value="Extension.extension.url" />
@@ -63,6 +66,8 @@
     <element id="Extension.extension:link">
       <path value="Extension.extension" />
       <sliceName value="link" />
+      <short value="Reference to the image or data source." />
+      <definition value="Reference to the image or data source." />
       <min value="1" />
     </element>
     <element id="Extension.extension:link.url">
@@ -79,7 +84,7 @@
     </element>
     <element id="Extension.url">
       <path value="Extension.url" />
-      <fixedUri value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" />
+      <fixedUri value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media" />
     </element>
     <element id="Extension.value[x]">
       <path value="Extension.value[x]" />

diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml
@@ -2,11 +2,11 @@
 <StructureDefinition xmlns="http://hl7.org/fhir">
   <id value="UKCore-DiagnosticReport" />
   <url value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-DiagnosticReport" />
-  <version value="2.5.0" />
+  <version value="2.6.0" />
   <name value="UKCoreDiagnosticReport" />
   <title value="UK Core Diagnostic Report" />
   <status value="active" />
-  <date value="2024-06-07" />
+  <date value="2024-12-05" />
   <publisher value="HL7 UK" />
   <contact>
     <name value="HL7 UK" />
@@ -27,6 +27,16 @@
   <baseDefinition value="http://hl7.org/fhir/StructureDefinition/DiagnosticReport" />
   <derivation value="constraint" />
   <differential>
+    <element id="DiagnosticReport">
+      <path value="DiagnosticReport" />
+      <constraint>
+        <key value="ukcore-diag-lab-002" />
+        <severity value="error" />
+        <human
+          value="Only one of DiagnosticReport.media or DiagnosticReport.extension:mediaR5 can be populated at a time." />
+        <expression value="media.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media').empty()" />
+      </constraint>
+    </element>
     <element id="DiagnosticReport.extension:compositionReferenceR5">
       <path value="DiagnosticReport.extension" />
       <sliceName value="compositionReferenceR5" />
@@ -46,21 +56,13 @@
     <element id="DiagnosticReport.extension:mediaR5">
       <path value="DiagnosticReport.extension" />
       <sliceName value="mediaR5" />
+      <short value="Reference to a DocuentReference resource instance that provides structure for organizing the contents of the DiagnosticReport." />
       <type>
         <code value="Extension" />
-        <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" />
+        <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media" />
       </type>
       <isModifier value="false" />
     </element>
-    <element id="DiagnosticReport.extension:mediaR5.extension">
-      <path value="DiagnosticReport.extension.extension" />
-      <min value="1" />
-    </element>
-    <element id="DiagnosticReport.extension:mediaR5.extension:link">
-      <path value="DiagnosticReport.extension.extension" />
-      <sliceName value="link" />
-      <min value="1" />
-    </element>
     <element id="DiagnosticReport.extension:noteR5">
       <path value="DiagnosticReport.extension" />
       <sliceName value="noteR5" />