From 59880148e4fb4043101fea82bb239cd2551189f2 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Tue, 19 Dec 2023 13:45:07 +0100 Subject: [PATCH 1/8] Build with Sushi 3.5.0 --- .../CodeSystem-GEM-ERPCHRG-CS-ConsentType.json | 2 +- ...eDefinition-GEM-ERPCHRG-EX-MarkingFlag.json | 18 ------------------ .../ValueSet-GEM-ERPCHRG-VS-ConsentType.json | 2 +- 3 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json index af60708..0977094 100644 --- a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json +++ b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json @@ -6,7 +6,6 @@ "id": "GEM-ERPCHRG-CS-ConsentType", "title": "CodeSystem of types for a consent", "description": "Type of patient consent.", - "version": "1.0", "url": "https://gematik.de/fhir/erpchrg/CodeSystem/GEM_ERPCHRG_CS_ConsentType", "concept": [ { @@ -14,6 +13,7 @@ "display": "Consent for saving electronic charge item" } ], + "version": "1.0", "publisher": "gematik GmbH", "contact": [ { diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json index c466b6f..609a1bb 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json +++ b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json @@ -85,12 +85,6 @@ } ] }, - { - "id": "Extension.extension:insuranceProvider.valueBoolean", - "path": "Extension.extension.valueBoolean", - "min": 0, - "max": "1" - }, { "id": "Extension.extension:subsidy", "path": "Extension.extension", @@ -129,12 +123,6 @@ } ] }, - { - "id": "Extension.extension:subsidy.valueBoolean", - "path": "Extension.extension.valueBoolean", - "min": 0, - "max": "1" - }, { "id": "Extension.extension:taxOffice", "path": "Extension.extension", @@ -173,12 +161,6 @@ } ] }, - { - "id": "Extension.extension:taxOffice.valueBoolean", - "path": "Extension.extension.valueBoolean", - "min": 0, - "max": "1" - }, { "id": "Extension.url", "path": "Extension.url", diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json index 787bd34..da48cf5 100644 --- a/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json +++ b/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json @@ -5,8 +5,8 @@ "id": "GEM-ERPCHRG-VS-ConsentType", "title": "ValueSet of Consent Codes", "description": "Type of Consents for the ePrescription.", - "version": "1.0", "url": "https://gematik.de/fhir/erpchrg/ValueSet/GEM_ERPCHRG_VS_ConsentType", + "version": "1.0", "publisher": "gematik GmbH", "contact": [ { From 25765547bdcdd860b552a199319965ee0f9b81f4 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 07:09:03 +0100 Subject: [PATCH 2/8] updated dependencies --- Resources/sushi-config.yaml | 5 ++--- fhirpkg.lock.json | 10 +++++----- package.json | 5 +++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index a5274f6..f8775c0 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -17,7 +17,6 @@ publisher: dependencies: de.basisprofil.r4: 1.3.2 hl7.fhir.r4.core: 4.0.1 - de.gematik.erezept-workflow.r4: 1.2.1 + de.gematik.erezept-workflow.r4: 1.2.x kbv.ita.for: 1.1.0 - kbv.basis: 1.3.0 - de.abda.eRezeptAbgabedatenPKV: 1.2.0 + de.abda.eRezeptabgabedatenpkv: 1.2.0 \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 70a4aad..ef083af 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,12 +1,12 @@ { - "updated": "2022-12-13T12:33:11.9069776+01:00", + "updated": "2023-12-19T13:58:10.172589+01:00", "dependencies": { "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1", "kbv.ita.for": "1.1.0", "KBV.Basis": "1.3.0", - "de.gematik.erezept-workflow.r4": "1.2.0", - "kbv.ita.erp": "1.1.0" - }, - "missing": {} + "de.abda.eRezeptAbgabedatenpkv": "1.2.0", + "de.abda.erezeptabgabedatenbasis": "1.3.1", + "de.gematik.erezept-workflow.r4": "1.2.3" + } } diff --git a/package.json b/package.json index 37370a1..72bdf7b 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,8 @@ "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1", "kbv.ita.for": "1.1.0", - "kbv.basis": "1.3.0", - "de.gematik.erezept-workflow.r4": "1.2.1" + "de.gematik.erezept-workflow.r4": "1.2.3", + "de.abda.eRezeptAbgabedatenpkv": "1.2.0", + "KBV.Basis": "1.3.0" } } From d0b43b60ce3d5895b93b6477472c3e7807e3d282 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 07:17:57 +0100 Subject: [PATCH 3/8] set gematik workflow package hard --- Resources/sushi-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index f8775c0..c68e968 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -17,6 +17,6 @@ publisher: dependencies: de.basisprofil.r4: 1.3.2 hl7.fhir.r4.core: 4.0.1 - de.gematik.erezept-workflow.r4: 1.2.x + de.gematik.erezept-workflow.r4: 1.2.3 kbv.ita.for: 1.1.0 de.abda.eRezeptabgabedatenpkv: 1.2.0 \ No newline at end of file From d75426c01dd1910fffdace86f4daa77d66a4742f Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 07:19:18 +0100 Subject: [PATCH 4/8] correct branch triggers --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9cd877b..10a87b8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -6,9 +6,9 @@ name: CI (FHIR Validation) on: # Triggers the workflow on push or pull request events but only for the master branch push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: From 3f1fa5c67797cf5f1a5196184a37fa2f42faeba9 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 12:10:56 +0100 Subject: [PATCH 5/8] set dependency config back to 1.2.x --- Resources/sushi-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index c68e968..f8775c0 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -17,6 +17,6 @@ publisher: dependencies: de.basisprofil.r4: 1.3.2 hl7.fhir.r4.core: 4.0.1 - de.gematik.erezept-workflow.r4: 1.2.3 + de.gematik.erezept-workflow.r4: 1.2.x kbv.ita.for: 1.1.0 de.abda.eRezeptabgabedatenpkv: 1.2.0 \ No newline at end of file From a15dc1a471ee004f2af0f5b08b4ebabf484a7d3a Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 14:46:41 +0100 Subject: [PATCH 6/8] to lowercase --- Resources/sushi-config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index f8775c0..c5fc18b 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -19,4 +19,4 @@ dependencies: hl7.fhir.r4.core: 4.0.1 de.gematik.erezept-workflow.r4: 1.2.x kbv.ita.for: 1.1.0 - de.abda.eRezeptabgabedatenpkv: 1.2.0 \ No newline at end of file + de.abda.erezeptabgabedatenpkv: 1.2.0 \ No newline at end of file From 19db45263ba408047a2dc584e9c1526682920d86 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 14:48:47 +0100 Subject: [PATCH 7/8] restore pkg.lock --- fhirpkg.lock.json | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index ef083af..46bcea8 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,12 +1,14 @@ { - "updated": "2023-12-19T13:58:10.172589+01:00", + "updated": "2023-12-20T14:47:59.704922+01:00", "dependencies": { "de.basisprofil.r4": "1.3.2", "hl7.fhir.r4.core": "4.0.1", "kbv.ita.for": "1.1.0", "KBV.Basis": "1.3.0", + "de.gematik.erezept-workflow.r4": "1.2.3", + "kbv.ita.erp": "1.1.2", "de.abda.eRezeptAbgabedatenpkv": "1.2.0", - "de.abda.erezeptabgabedatenbasis": "1.3.1", - "de.gematik.erezept-workflow.r4": "1.2.3" - } + "de.abda.erezeptabgabedatenbasis": "1.3.1" + }, + "missing": {} } From 5b7c13a58825bcfe8662d92761afa1940072fac1 Mon Sep 17 00:00:00 2001 From: florianschoffke Date: Wed, 20 Dec 2023 14:52:34 +0100 Subject: [PATCH 8/8] add kbv.ita.erp --- Resources/sushi-config.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index c5fc18b..955e03f 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -19,4 +19,5 @@ dependencies: hl7.fhir.r4.core: 4.0.1 de.gematik.erezept-workflow.r4: 1.2.x kbv.ita.for: 1.1.0 + kbv.ita.erp: 1.1.x de.abda.erezeptabgabedatenpkv: 1.2.0 \ No newline at end of file