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: 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": [ { diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index a5274f6..955e03f 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -17,7 +17,7 @@ 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 + kbv.ita.erp: 1.1.x + de.abda.erezeptabgabedatenpkv: 1.2.0 \ No newline at end of file diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json index 70a4aad..46bcea8 100644 --- a/fhirpkg.lock.json +++ b/fhirpkg.lock.json @@ -1,12 +1,14 @@ { - "updated": "2022-12-13T12:33:11.9069776+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.0", - "kbv.ita.erp": "1.1.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" }, "missing": {} } 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" } }