From 68e5a76bd9a8b4901bf1a077c9388878bd6fc8d4 Mon Sep 17 00:00:00 2001 From: KazeemHamzat Date: Thu, 5 Dec 2024 15:36:50 +0000 Subject: [PATCH 01/30] Cardinality Issues Changing the cardinality of Extension-DiagnosticReport.media.link to 0 to many (0...*) --- .../Extension-UKCore-DiagnosticReportMediaLink.xml | 10 ++-------- structuredefinitions/UKCore-DiagnosticReport.xml | 13 ++----------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml index 45af7ad8..eeea995d 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml @@ -2,11 +2,11 @@ - + <status value="draft" /> - <date value="2024-06-07" /> + <date value="2024-12-05" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -39,11 +39,6 @@ <element id="Extension"> <path value="Extension" /> <short value="Reference to a DocumentReference resource." /> - <min value="1" /> - </element> - <element id="Extension.extension"> - <path value="Extension.extension" /> - <min value="1" /> </element> <element id="Extension.extension:comment"> <path value="Extension.extension" /> @@ -63,7 +58,6 @@ <element id="Extension.extension:link"> <path value="Extension.extension" /> <sliceName value="link" /> - <min value="1" /> </element> <element id="Extension.extension:link.url"> <path value="Extension.extension.url" /> diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index cd1db8d8..d58a6e34 100644 --- 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" /> @@ -52,15 +52,6 @@ </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" /> From bcd286906f68c636b0f466c84a3e4108bccedd50 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 9 Dec 2024 14:46:32 +0000 Subject: [PATCH 02/30] Cardinality Issues with Extension-DiagnosticReport.media.link Cardinality Issues with Extension-DiagnosticReport.media.link --- ...nsion-UKCore-DiagnosticReportMediaLink.xml | 54 +++++-------------- .../UKCore-DiagnosticReport.xml | 28 ++++++---- 2 files changed, 33 insertions(+), 49 deletions(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml index eeea995d..0d1752b3 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml @@ -17,9 +17,12 @@ <rank value="1" /> </telecom> </contact> - <description value="An extension to replicate the changes within R5 to support adding a reference to image or data source(DocumentReference)." /> - <purpose value="This is a Genomics use case to support the backporting of R5 functionality to support adding a reference to image or data source(DocumentReference)." /> - <copyright value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); 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 "AS IS" 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® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html." /> + <description + value="An extension to replicate the changes within R5 to support adding a reference to image or data source(DocumentReference)." /> + <purpose + value="This is a Genomics use case to support the backporting of R5 functionality to support adding a reference to image or data source(DocumentReference)." /> + <copyright + value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); 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 "AS IS" 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® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html." /> <fhirVersion value="4.0.1" /> <mapping> <identity value="rim" /> @@ -30,54 +33,25 @@ <abstract value="false" /> <context> <type value="element" /> - <expression value="DiagnosticReport" /> + <expression value="DiagnosticReport.media" /> </context> <type value="Extension" /> <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> <derivation value="constraint" /> <differential> - <element id="Extension"> - <path value="Extension" /> - <short value="Reference to a DocumentReference resource." /> - </element> - <element id="Extension.extension:comment"> - <path value="Extension.extension" /> - <sliceName value="comment" /> - </element> - <element id="Extension.extension:comment.url"> - <path value="Extension.extension.url" /> - <fixedUri value="comment" /> - </element> - <element id="Extension.extension:comment.value[x]"> - <path value="Extension.extension.value[x]" /> - <min value="1" /> - <type> - <code value="string" /> - </type> - </element> - <element id="Extension.extension:link"> - <path value="Extension.extension" /> - <sliceName value="link" /> - </element> - <element id="Extension.extension:link.url"> - <path value="Extension.extension.url" /> - <fixedUri value="link" /> + <element id="Extension.url"> + <path value="Extension.url" /> + <fixedUri + value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> </element> - <element id="Extension.extension:link.value[x]"> - <path value="Extension.extension.value[x]" /> + <element id="Extension.value[x]"> + <path value="Extension.value[x]" /> <min value="1" /> <type> <code value="Reference" /> <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-DocumentReference" /> </type> - </element> - <element id="Extension.url"> - <path value="Extension.url" /> - <fixedUri value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> - </element> - <element id="Extension.value[x]"> - <path value="Extension.value[x]" /> - <max value="0" /> + <isSummary value="true" /> </element> </differential> </StructureDefinition> \ No newline at end of file diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index d58a6e34..749e44a1 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -43,15 +43,6 @@ <short value="Reference to a Composition resource." /> <definition value="Reference to a Composition resource instance that provides structure for organizing the contents of the DiagnosticReport." /> </element> - <element id="DiagnosticReport.extension:mediaR5"> - <path value="DiagnosticReport.extension" /> - <sliceName value="mediaR5" /> - <type> - <code value="Extension" /> - <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> - </type> - <isModifier value="false" /> - </element> <element id="DiagnosticReport.extension:noteR5"> <path value="DiagnosticReport.extension" /> <sliceName value="noteR5" /> @@ -140,6 +131,25 @@ <short value="Observations that are part of this diagnostic report." /> <mustSupport value="true" /> </element> + <element id="DiagnosticReport.media"> + <path value="DiagnosticReport.media" /> + <constraint> + <key value="ukcore-diag-lab-002" /> + <severity value="error" /> + <human + value="Only one of DiagnosticReport.media.link or DiagnosticReport.media:mediaLinkR5 can be used at a time." /> + <expression value="media.where(sliceName.exists()).count() = 0 or media.link.exists() = false" /> + </constraint> + </element> + <element id="DiagnosticReport.media.extension:mediaLinkR5"> + <path value="DiagnosticReport.media.extension" /> + <sliceName value="mediaLinkR5" /> + <type> + <code value="Extension" /> + <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> + </type> + <isModifier value="false" /> + </element> <element id="DiagnosticReport.conclusionCode"> <path value="DiagnosticReport.conclusionCode" /> <binding> From 2e162e64849958502c8beeffe9890649956515e9 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 09:26:39 +0000 Subject: [PATCH 03/30] Update Extension-UKCore-DiagnosticReportMediaLink.xml Remove Is Summary Attributes --- .../Extension-UKCore-DiagnosticReportMediaLink.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml index 0d1752b3..094bc674 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml @@ -51,7 +51,6 @@ <code value="Reference" /> <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-DocumentReference" /> </type> - <isSummary value="true" /> </element> </differential> </StructureDefinition> \ No newline at end of file From 227de2e1673b94e687b4ada9f8420a88a938878e Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 12:25:49 +0000 Subject: [PATCH 04/30] Update UKCore-DiagnosticReport.xml Modifying the constraint to target media.link and extension:mediaLinkR5 --- structuredefinitions/UKCore-DiagnosticReport.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 749e44a1..fcbafc2f 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -137,8 +137,9 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human - value="Only one of DiagnosticReport.media.link or DiagnosticReport.media:mediaLinkR5 can be used at a time." /> - <expression value="media.where(sliceName.exists()).count() = 0 or media.link.exists() = false" /> + value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be used at a time." /> + <expression + value="link.exists() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> </constraint> </element> <element id="DiagnosticReport.media.extension:mediaLinkR5"> From 9b2f011c98e89f5062cb0623949e842e796d2aa0 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 18:11:24 +0000 Subject: [PATCH 05/30] Cardinality Issues with Extension-DiagnosticReport.media.link Create the extension at root level and added FHIR path --- ...nsion-UKCore-DiagnosticReportMediaLink.xml | 62 ++++++++++++++----- .../UKCore-DiagnosticReport.xml | 39 ++++++------ 2 files changed, 66 insertions(+), 35 deletions(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml index 094bc674..c1329931 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml @@ -2,11 +2,11 @@ <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.2" /> + <version value="0.0.1" /> <name value="ExtensionUKCoreDiagnosticReportMediaLink" /> <title value="Extension UK Core Diagnostic Report Media Link" /> <status value="draft" /> - <date value="2024-12-05" /> + <date value="2024-06-07" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -17,12 +17,9 @@ <rank value="1" /> </telecom> </contact> - <description - value="An extension to replicate the changes within R5 to support adding a reference to image or data source(DocumentReference)." /> - <purpose - value="This is a Genomics use case to support the backporting of R5 functionality to support adding a reference to image or data source(DocumentReference)." /> - <copyright - value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); 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 "AS IS" 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® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html." /> + <description value="An extension to replicate the changes within R5 to support adding a reference to image or data source(DocumentReference)." /> + <purpose value="This is a Genomics use case to support the backporting of R5 functionality to support adding a reference to image or data source(DocumentReference)." /> + <copyright value="Copyright © 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the "License"); 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 "AS IS" 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® FHIR® standard Copyright © 2011+ HL7 The HL7® FHIR® standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html." /> <fhirVersion value="4.0.1" /> <mapping> <identity value="rim" /> @@ -33,24 +30,59 @@ <abstract value="false" /> <context> <type value="element" /> - <expression value="DiagnosticReport.media" /> + <expression value="DiagnosticReport" /> </context> <type value="Extension" /> <baseDefinition value="http://hl7.org/fhir/StructureDefinition/Extension" /> <derivation value="constraint" /> <differential> - <element id="Extension.url"> - <path value="Extension.url" /> - <fixedUri - value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> + <element id="Extension"> + <path value="Extension" /> + <short value="Reference to a DocumentReference resource." /> </element> - <element id="Extension.value[x]"> - <path value="Extension.value[x]" /> + <element id="Extension.extension"> + <path value="Extension.extension" /> + <min value="1" /> + </element> + <element id="Extension.extension:comment"> + <path value="Extension.extension" /> + <sliceName value="comment" /> + </element> + <element id="Extension.extension:comment.url"> + <path value="Extension.extension.url" /> + <fixedUri value="comment" /> + </element> + <element id="Extension.extension:comment.value[x]"> + <path value="Extension.extension.value[x]" /> + <min value="1" /> + <type> + <code value="string" /> + </type> + </element> + <element id="Extension.extension:link"> + <path value="Extension.extension" /> + <sliceName value="link" /> + <min value="1" /> + </element> + <element id="Extension.extension:link.url"> + <path value="Extension.extension.url" /> + <fixedUri value="link" /> + </element> + <element id="Extension.extension:link.value[x]"> + <path value="Extension.extension.value[x]" /> <min value="1" /> <type> <code value="Reference" /> <targetProfile value="https://fhir.hl7.org.uk/StructureDefinition/UKCore-DocumentReference" /> </type> </element> + <element id="Extension.url"> + <path value="Extension.url" /> + <fixedUri value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> + </element> + <element id="Extension.value[x]"> + <path value="Extension.value[x]" /> + <max value="0" /> + </element> </differential> </StructureDefinition> \ No newline at end of file diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index fcbafc2f..bf913dea 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -27,6 +27,15 @@ <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.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> + <expression value="media.link.exists() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> + </constraint> + </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> <path value="DiagnosticReport.extension" /> <sliceName value="compositionReferenceR5" /> @@ -43,6 +52,16 @@ <short value="Reference to a Composition resource." /> <definition value="Reference to a Composition resource instance that provides structure for organizing the contents of the DiagnosticReport." /> </element> + <element id="DiagnosticReport.extension:mediaLinkR5"> + <path value="DiagnosticReport.extension" /> + <sliceName value="mediaLinkR5" /> + <type> + <code value="Extension" /> + <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> + </type> + <isModifier value="false" /> + <isSummary value='true' /> + </element> <element id="DiagnosticReport.extension:noteR5"> <path value="DiagnosticReport.extension" /> <sliceName value="noteR5" /> @@ -131,26 +150,6 @@ <short value="Observations that are part of this diagnostic report." /> <mustSupport value="true" /> </element> - <element id="DiagnosticReport.media"> - <path value="DiagnosticReport.media" /> - <constraint> - <key value="ukcore-diag-lab-002" /> - <severity value="error" /> - <human - value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be used at a time." /> - <expression - value="link.exists() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> - </constraint> - </element> - <element id="DiagnosticReport.media.extension:mediaLinkR5"> - <path value="DiagnosticReport.media.extension" /> - <sliceName value="mediaLinkR5" /> - <type> - <code value="Extension" /> - <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> - </type> - <isModifier value="false" /> - </element> <element id="DiagnosticReport.conclusionCode"> <path value="DiagnosticReport.conclusionCode" /> <binding> From 122a13a606dcee2735b152d7003a604be1222f75 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 18:23:24 +0000 Subject: [PATCH 06/30] Update UKCore-DiagnosticReport.xml Added isSummar=True --- structuredefinitions/UKCore-DiagnosticReport.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index bf913dea..eb3967a0 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.link.exists() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> + <expression value="media.link.exist() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> @@ -60,7 +60,7 @@ <profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link" /> </type> <isModifier value="false" /> - <isSummary value='true' /> + <isSummary value="true" /> </element> <element id="DiagnosticReport.extension:noteR5"> <path value="DiagnosticReport.extension" /> From 182461f93c7d2abd49681fbd5f52bad724ef9441 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 18:37:44 +0000 Subject: [PATCH 07/30] Update UKCore-DiagnosticReport.xml Modifying FHIR Path Exp. --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index eb3967a0..a6a60dab 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.link.exist() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> + <expression value="media.link.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 01b56519cc6e84a8e086fe780e36bb0f4d79d82a Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 19:01:40 +0000 Subject: [PATCH 08/30] Update UKCore-DiagnosticReport.xml Testing Xor --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index a6a60dab..b3ba938d 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.link.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + <expression value="media.link.empty() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From bda21ccc55d2f3490daeb0931f406577fc37eb10 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 19:25:48 +0000 Subject: [PATCH 09/30] Update UKCore-DiagnosticReport.xml Using XAND --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index b3ba938d..f08163d9 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.link.empty() xor extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + <expression value="media.link.empty() XAND extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 2cbc1451fe463f2cc51ba5d2a9033d071d3aa253 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 19:45:45 +0000 Subject: [PATCH 10/30] Update UKCore-DiagnosticReport.xml Changing the FHIR Exp to not AND --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index f08163d9..4045cf03 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.link.empty() XAND extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + <expression value="not(media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From f66950b8c29aaf08bbf8032de45b160ffb36dccd Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 20:00:32 +0000 Subject: [PATCH 11/30] Update UKCore-DiagnosticReport.xml Re-write the FHIR path expression --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 4045cf03..2d09947a 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not(media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> + <expression value="not media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 9c09a991bca5ead7341e550c17ec7a767b7224f0 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 20:04:10 +0000 Subject: [PATCH 12/30] Update UKCore-DiagnosticReport.xml R-write the FHIR Path Expression --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 2d09947a..c6d9cd3b 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> + <expression value="not (media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 487454a401defbcf6f3ecbbdc654257e755972aa Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 20:28:14 +0000 Subject: [PATCH 13/30] Update UKCore-DiagnosticReport.xml Fhir Path --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index c6d9cd3b..2d09947a 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not (media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> + <expression value="not media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From c6bdbfbcd75041ac4217356335a7856ed79b7a1a Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 20:45:57 +0000 Subject: [PATCH 14/30] Update UKCore-DiagnosticReport.xml Fhir path --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 2d09947a..5fbda95a 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> + <expression value="not (media.exists() and media.link.exists()) and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From c28e3650cbd423dbfb32a7ac2b5348c263e17d3a Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 21:03:59 +0000 Subject: [PATCH 15/30] Update UKCore-DiagnosticReport.xml FHIR Path --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 5fbda95a..42e49374 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not (media.exists() and media.link.exists()) and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> + <expression value="not media.exists() or not media.link.exists() and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 74bae9054fe99463dd5ad23f86e2849ee2687b78 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 21:22:36 +0000 Subject: [PATCH 16/30] Update UKCore-DiagnosticReport.xml FHIR path --- structuredefinitions/UKCore-DiagnosticReport.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 42e49374..6714f01c 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,7 +33,8 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="not media.exists() or not media.link.exists() and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()" /> + <expression + value="not media.link.exist() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 149ce167c423c6d9c3ea6f2fcbb8e31f5a9e4db5 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 21:32:04 +0000 Subject: [PATCH 17/30] Update UKCore-DiagnosticReport.xml ffhir path --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 6714f01c..de7785a1 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="not media.link.exist() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> + value="media.link.exist() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From cd9e111a1ee42e9d5e675bf9c5684cace046cac4 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 21:37:25 +0000 Subject: [PATCH 18/30] Update UKCore-DiagnosticReport.xml FHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index de7785a1..8ad2cfa3 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="media.link.exist() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exist()" /> + value="( (media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.mediaLink').exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.mediaLink').exists()) )" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 90cf5b4606afd9e3cde88f6d20d6f60722226ee4 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 21:53:02 +0000 Subject: [PATCH 19/30] Update UKCore-DiagnosticReport.xml FHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 8ad2cfa3..718f7e17 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,10 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="( (media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.mediaLink').exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.mediaLink').exists()) )" /> + value="( (media.link.exists() and not extension(http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link +).exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link +').exists()) ) +" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From b035325070bcab9bf81492c85c9c239e9095ddd2 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 22:02:51 +0000 Subject: [PATCH 20/30] Update UKCore-DiagnosticReport.xml FHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 718f7e17..794bd376 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,9 +34,9 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="( (media.link.exists() and not extension(http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link + value="(media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link' ).exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link -').exists()) ) +').exists()) " /> </constraint> </element> From 011c9042bdd05ae143cdc915c8350294bbdb8602 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 22:19:20 +0000 Subject: [PATCH 21/30] Update UKCore-DiagnosticReport.xml FHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 794bd376..34e860e7 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,10 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="(media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link' -).exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link -').exists()) -" /> + value="(media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 56f1e92902c500d206d51ce6ac3d755553eaea1a Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 22:51:58 +0000 Subject: [PATCH 22/30] Update UKCore-DiagnosticReport.xml FFHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 34e860e7..4a7c7d69 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="(media.link.exists() and not extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()) or (not media.link.exists() and extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> + value="(media.link.exists() and not DiagnosticReport.extension:mediaLinkR5('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()) or (not media.link.exists() and DiagnosticReport.extension:mediaLinkR5('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From a8195a3669bedf6c04c102369ae52f2ee4d795e8 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Tue, 10 Dec 2024 23:17:53 +0000 Subject: [PATCH 23/30] Update UKCore-DiagnosticReport.xml FHIR PATH --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 4a7c7d69..73e0564e 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="(media.link.exists() and not DiagnosticReport.extension:mediaLinkR5('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()) or (not media.link.exists() and DiagnosticReport.extension:mediaLinkR5('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())" /> + value=" (media.link.exists() and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())) or (not media.link.exists() and (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()))" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From e3707cc3ccdb63cf5f390683868f770c268fbc58 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Thu, 12 Dec 2024 10:06:35 +0000 Subject: [PATCH 24/30] Update UKCore-DiagnosticReport.xml Switching to function empty() --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 73e0564e..1b4a0016 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value=" (media.link.exists() and not (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists())) or (not media.link.exists() and (extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').exists()))" /> + value="media.link.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From b30aa21148c229989f15f3794a6026fcb473d1af Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Thu, 12 Dec 2024 10:26:23 +0000 Subject: [PATCH 25/30] Update UKCore-DiagnosticReport.xml Attaching the constraint to element level --- structuredefinitions/UKCore-DiagnosticReport.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 1b4a0016..657a4856 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -34,7 +34,7 @@ <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> <expression - value="media.link.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + value="media.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From e25f0325bf88b047be68e18fa4fcd173bb2bd0e7 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Thu, 12 Dec 2024 15:42:46 +0000 Subject: [PATCH 26/30] Rename to extension-UKCore-DiagnosticReportMediia Change both file name and URL --- ... => Extension-UKCore-DiagnosticReportMedia.xml} | 14 +++++++------- structuredefinitions/UKCore-DiagnosticReport.xml | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) rename structuredefinitions/{Extension-UKCore-DiagnosticReportMediaLink.xml => Extension-UKCore-DiagnosticReportMedia.xml} (91%) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml similarity index 91% rename from structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml rename to structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml index c1329931..b9a369e0 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMediaLink.xml +++ b/structuredefinitions/Extension-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.2" /> + <name value="ExtensionUKCoreDiagnosticReportMedia" /> + <title value="Extension UK Core Diagnostic Report Media" /> <status value="draft" /> - <date value="2024-06-07" /> + <date value="2024-12-12" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -78,7 +78,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 index 657a4856..7ef92d26 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -33,8 +33,7 @@ <key value="ukcore-diag-lab-002" /> <severity value="error" /> <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression - value="media.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + <expression value="media.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> </constraint> </element> <element id="DiagnosticReport.extension:compositionReferenceR5"> From 3b691c0df172583f118504c1f8d7714c8d78fd68 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Thu, 12 Dec 2024 16:15:14 +0000 Subject: [PATCH 27/30] Update UKCore-DiagnosticReport Update UKCore-DiagnosticReport --- .../Extension-UKCore-DiagnosticReportMedia.xml | 1 + structuredefinitions/UKCore-DiagnosticReport.xml | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml index b9a369e0..cd385394 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml @@ -62,6 +62,7 @@ <element id="Extension.extension:link"> <path value="Extension.extension" /> <sliceName value="link" /> + <short value="Reference to a DocuentReference resource instance that provides structure for organizing the contents of the DiagnosticReport." /> <min value="1" /> </element> <element id="Extension.extension:link.url"> diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index 7ef92d26..bc32f0a0 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -52,15 +52,15 @@ <short value="Reference to a Composition resource." /> <definition value="Reference to a Composition resource instance that provides structure for organizing the contents of the DiagnosticReport." /> </element> - <element id="DiagnosticReport.extension:mediaLinkR5"> + <element id="DiagnosticReport.extension:mediaR5"> <path value="DiagnosticReport.extension" /> - <sliceName value="mediaLinkR5" /> + <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" /> - <isSummary value="true" /> </element> <element id="DiagnosticReport.extension:noteR5"> <path value="DiagnosticReport.extension" /> From cfce067afc1bc7d74aaec65ed56e113fe5d39040 Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 16 Dec 2024 10:03:20 +0000 Subject: [PATCH 28/30] Update UKCore-DiagnosticReport.xml Removing reference to sub element link --- structuredefinitions/UKCore-DiagnosticReport.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/structuredefinitions/UKCore-DiagnosticReport.xml b/structuredefinitions/UKCore-DiagnosticReport.xml index bc32f0a0..0aa520fe 100644 --- a/structuredefinitions/UKCore-DiagnosticReport.xml +++ b/structuredefinitions/UKCore-DiagnosticReport.xml @@ -32,8 +32,9 @@ <constraint> <key value="ukcore-diag-lab-002" /> <severity value="error" /> - <human value="Only one of DiagnosticReport.media.link or DiagnosticReport.media.extension:mediaLinkR5 can be populated at a time." /> - <expression value="media.empty() or extension('http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media.link').empty()" /> + <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"> From 7d3c28cc6e9423620b845a3adf363ea8bb57cee0 Mon Sep 17 00:00:00 2001 From: Ryan May <ryan.may2@nhs.net> Date: Mon, 16 Dec 2024 10:43:59 +0000 Subject: [PATCH 29/30] added description and short display to elements --- .../Extension-UKCore-DiagnosticReportMedia.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml index cd385394..d73c28e5 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml @@ -2,11 +2,11 @@ <StructureDefinition xmlns="http://hl7.org/fhir"> <id value="Extension-UKCore-DiagnosticReportMedia" /> <url value="http://hl7.org/fhir/5.0/StructureDefinition/extension-DiagnosticReport.media" /> - <version value="0.0.2" /> + <version value="0.0.3" /> <name value="ExtensionUKCoreDiagnosticReportMedia" /> <title value="Extension UK Core Diagnostic Report Media" /> <status value="draft" /> - <date value="2024-12-12" /> + <date value="2024-12-16" /> <publisher value="HL7 UK" /> <contact> <name value="HL7 UK" /> @@ -38,7 +38,8 @@ <differential> <element id="Extension"> <path value="Extension" /> - <short value="Reference to a DocumentReference resource." /> + <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" /> @@ -47,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" /> @@ -62,7 +66,8 @@ <element id="Extension.extension:link"> <path value="Extension.extension" /> <sliceName value="link" /> - <short value="Reference to a DocuentReference resource instance that provides structure for organizing the contents of the DiagnosticReport." /> + <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"> From 15333e9b50b972db95301cf614322ca98916290a Mon Sep 17 00:00:00 2001 From: KazeemHamzat <kazeem.hamzat@nhs.net> Date: Mon, 16 Dec 2024 11:53:42 +0000 Subject: [PATCH 30/30] Update Extension-UKCore-DiagnosticReportMedia.xml Added full-stop to re-initiate approval --- structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml index d73c28e5..3ce03003 100644 --- a/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml +++ b/structuredefinitions/Extension-UKCore-DiagnosticReportMedia.xml @@ -66,7 +66,7 @@ <element id="Extension.extension:link"> <path value="Extension.extension" /> <sliceName value="link" /> - <short value="Reference to the image or data source" /> + <short value="Reference to the image or data source." /> <definition value="Reference to the image or data source." /> <min value="1" /> </element>