From cca6c6be433a10bc6ff0b8146abab6c738a60a4e Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Fri, 19 Sep 2025 12:42:14 +0200 Subject: [PATCH 1/8] Solved the issue with the concept map not rendering on Simplifier, mapping added to requester in lu-OrderData --- Resources/fhirpkg.lock.json | 9 +++------ Resources/lu-OrderData.xml | 13 ++++++++----- ...Map-AanvraagStatusCodelijst-to-RequestStatus.xml | 6 ++---- package.json | 2 +- 4 files changed, 14 insertions(+), 16 deletions(-) diff --git a/Resources/fhirpkg.lock.json b/Resources/fhirpkg.lock.json index 18cab3d..9ad2f28 100644 --- a/Resources/fhirpkg.lock.json +++ b/Resources/fhirpkg.lock.json @@ -1,10 +1,7 @@ { - "updated": "2023-02-23T10:46:51.6284213+01:00", - "updated": "2025-09-01T12:33:07.694504+02:00", + "updated": "2025-09-19T12:29:18.6964606+02:00", "dependencies": { - "nictiz.fhir.nl.r4.nl-core": "0.8.0-beta.1", - "hl7.fhir.r4.core": "4.0.1", - "nictiz.fhir.nl.r4.zib2020": "0.8.0-beta.1" + "hl7.fhir.r4.core": "4.0.1" }, "missing": {} -} +} diff --git a/Resources/lu-OrderData.xml b/Resources/lu-OrderData.xml index e075823..84fbb27 100644 --- a/Resources/lu-OrderData.xml +++ b/Resources/lu-OrderData.xml @@ -2,11 +2,9 @@ - -
+
No narrative is provided for definitional resources. A human-readable rendering can be found in the implementation guide(s) where this resource is used. -
- +
@@ -119,7 +117,12 @@ - + + + + + + diff --git a/Resources/terminology/manual/ConceptMap-AanvraagStatusCodelijst-to-RequestStatus.xml b/Resources/terminology/manual/ConceptMap-AanvraagStatusCodelijst-to-RequestStatus.xml index dda6aa0..7f8ef17 100644 --- a/Resources/terminology/manual/ConceptMap-AanvraagStatusCodelijst-to-RequestStatus.xml +++ b/Resources/terminology/manual/ConceptMap-AanvraagStatusCodelijst-to-RequestStatus.xml @@ -23,7 +23,7 @@ - + @@ -51,11 +51,10 @@ - - + @@ -110,6 +109,5 @@ - \ No newline at end of file diff --git a/package.json b/package.json index 0468598..520a008 100644 --- a/package.json +++ b/package.json @@ -25,6 +25,6 @@ "license": "CC0-1.0", "dependencies": { "hl7.fhir.r4.core": "4.0.1", - "nictiz.fhir.nl.r4.nl-core": "0.6.0-beta.2" + "nictiz.fhir.nl.r4.nl-core": "0.12.0-beta.1" } } From 181e6cd85d1173a4640150be9999169629a25d02 Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Fri, 19 Sep 2025 16:33:20 +0200 Subject: [PATCH 2/8] Package manifest update -> added dependency on zib2020 --- package.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 520a008..1045388 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,11 @@ ], "license": "CC0-1.0", "dependencies": { + "nictiz.fhir.nl.r4.nl-core": "0.12.0-beta.1", "hl7.fhir.r4.core": "4.0.1", - "nictiz.fhir.nl.r4.nl-core": "0.12.0-beta.1" - } + "nictiz.fhir.nl.r4.zib2020": "0.12.0-beta.1" + }, + "fhirVersions": [ + "4.0.1" + ] } From 3f23b636ebef9ed0a77f48f6e297cafc6dd08fc1 Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Wed, 22 Oct 2025 14:28:52 +0200 Subject: [PATCH 3/8] DiagnosticReport.basedOn update (targetProfile, short and mapping) --- Resources/lu-LaboratoryTestResult-DiagnosticReport.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml b/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml index 3a28fe7..1449d5d 100644 --- a/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml +++ b/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml @@ -44,7 +44,7 @@ - + @@ -68,18 +68,19 @@ - - + + + - + From 79ccff669fd528cb0e5966290fb36025eb6a978b Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Wed, 22 Oct 2025 14:48:19 +0200 Subject: [PATCH 4/8] Delete redundant package manifest and update the lock file --- Resources/fhirpkg.lock.json | 8 +++++--- Resources/package.json | 11 ----------- 2 files changed, 5 insertions(+), 14 deletions(-) delete mode 100644 Resources/package.json diff --git a/Resources/fhirpkg.lock.json b/Resources/fhirpkg.lock.json index 9ad2f28..d6797f2 100644 --- a/Resources/fhirpkg.lock.json +++ b/Resources/fhirpkg.lock.json @@ -1,7 +1,9 @@ { - "updated": "2025-09-19T12:29:18.6964606+02:00", + "updated": "2025-10-22T12:29:18.6964606+02:00", "dependencies": { - "hl7.fhir.r4.core": "4.0.1" + "nictiz.fhir.nl.r4.nl-core": "0.8.0-beta.1", + "hl7.fhir.r4.core": "4.0.1", + "nictiz.fhir.nl.r4.zib2020": "0.8.0-beta.1" }, "missing": {} -} +} diff --git a/Resources/package.json b/Resources/package.json deleted file mode 100644 index 0b7a5da..0000000 --- a/Resources/package.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "Resources", - "version": "0.1.0", - "description": "Put a description here", - "dependencies": { - "hl7.fhir.r4.core": "4.0.1" - }, - "fhirVersions": [ - "4.0.1" - ] -} From b5626b42aae7c85c4bbebcffb92fda9507cdaf18 Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Wed, 22 Oct 2025 15:04:20 +0200 Subject: [PATCH 5/8] package version amended --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1045388..a3ecbec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nictiz.fhir.nl.r4.labexchange", - "version": "3.0.0-beta.3", + "version": "3.0.0-beta.4", "canonical": null, "url": "https://informatiestandaarden.nictiz.nl/wiki/Landingspagina_Labuitwisseling", "title": "Nictiz FHIR NL R4 Lab Exchange", From 0950c10e366eb49a6e3f6b5f0a81219ca8bc3e5e Mon Sep 17 00:00:00 2001 From: Michal Ciszewski Date: Fri, 24 Oct 2025 10:46:22 +0200 Subject: [PATCH 6/8] version upgrade for resources --- Resources/lu-Composition.xml | 2 +- Resources/lu-LaboratoryTestResult-DiagnosticReport.xml | 2 +- Resources/lu-OrderData.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/lu-Composition.xml b/Resources/lu-Composition.xml index 293d3e3..a66db43 100644 --- a/Resources/lu-Composition.xml +++ b/Resources/lu-Composition.xml @@ -8,7 +8,7 @@ - + <status value="draft" /> diff --git a/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml b/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml index 1449d5d..523ce3f 100644 --- a/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml +++ b/Resources/lu-LaboratoryTestResult-DiagnosticReport.xml @@ -8,7 +8,7 @@ </div> </text> <url value="http://nictiz.nl/fhir/StructureDefinition/lu-LaboratoryTestResult-DiagnosticReport" /> - <version value="3.0.0-beta.3" /> + <version value="3.0.0-beta.4" /> <name value="LuLaboratoryTestResultDiagnosticReport" /> <title value="lu LaboratoryTestResult DiagnosticReport" /> <status value="draft" /> diff --git a/Resources/lu-OrderData.xml b/Resources/lu-OrderData.xml index 84fbb27..833b3dd 100644 --- a/Resources/lu-OrderData.xml +++ b/Resources/lu-OrderData.xml @@ -6,7 +6,7 @@ No narrative is provided for definitional resources. A human-readable rendering can be found in the implementation guide(s) where this resource is used. </div></text> <url value="http://nictiz.nl/fhir/StructureDefinition/lu-OrderData" /> - <version value="3.0.0-beta.3" /> + <version value="3.0.0-beta.4" /> <name value="LuOrderData" /> <title value="lu OrderData" /> <status value="draft" /> From 5c6d5fa15eb3d20e2e5c7226fdd2bfa945052d42 Mon Sep 17 00:00:00 2001 From: Michal Ciszewski <michal.ciszewski@nictiz.nl> Date: Fri, 24 Oct 2025 10:57:35 +0200 Subject: [PATCH 7/8] valueset uri adapted according to FHIR uri guidelines --- Resources/lu-OrderData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/lu-OrderData.xml b/Resources/lu-OrderData.xml index 833b3dd..a8bc979 100644 --- a/Resources/lu-OrderData.xml +++ b/Resources/lu-OrderData.xml @@ -79,7 +79,7 @@ <alias value="Vraagstelling" /> <binding> <strength value="required" /> - <valueSet value="https://decor.nictiz.nl/fhir/4.0/zib2020bbr-/ValueSet/2.16.840.1.113883.2.4.3.11.60.121.11.7--20200901000000" /> + <valueSet value="http://art-decor.org/fhir/3.0/zib2020bbr-/ValueSet/2.16.840.1.113883.2.4.3.11.60.121.11.7--20200901000000" /> </binding> <mapping> <identity value="lu-dataset-300-beta2-20230525" /> From 5f889f2d38246b088146fdc2c84b0f10a187cc76 Mon Sep 17 00:00:00 2001 From: Michal Ciszewski <michal.ciszewski@nictiz.nl> Date: Fri, 24 Oct 2025 11:01:44 +0200 Subject: [PATCH 8/8] canonical fix --- Resources/lu-OrderData.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/lu-OrderData.xml b/Resources/lu-OrderData.xml index a8bc979..8234b2a 100644 --- a/Resources/lu-OrderData.xml +++ b/Resources/lu-OrderData.xml @@ -79,7 +79,7 @@ <alias value="Vraagstelling" /> <binding> <strength value="required" /> - <valueSet value="http://art-decor.org/fhir/3.0/zib2020bbr-/ValueSet/2.16.840.1.113883.2.4.3.11.60.121.11.7--20200901000000" /> + <valueSet value="https://decor.nictiz.nl/fhir/ValueSet/2.16.840.1.113883.2.4.3.11.60.121.11.7--20200901000000" /> </binding> <mapping> <identity value="lu-dataset-300-beta2-20230525" />