diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/data/fsh-index.json similarity index 85% rename from src/fhir/fsh-generated/fsh-index.json rename to src/fhir/fsh-generated/data/fsh-index.json index 4ae9515..04d0c04 100644 --- a/src/fhir/fsh-generated/fsh-index.json +++ b/src/fhir/fsh-generated/data/fsh-index.json @@ -5,7 +5,7 @@ "fshType": "Instance", "fshFile": "examples/ExampleVSDMBundle.fsh", "startLine": 1, - "endLine": 21 + "endLine": 25 }, { "outputFile": "CodeSystem-vsdm-errorcode-cs.json", @@ -63,6 +63,22 @@ "startLine": 1, "endLine": 15 }, + { + "outputFile": "Organization-2a6924bf-6e6a-4ef3-b79f-c2138c10712f.json", + "fshName": "VSDMKostentraegerMain", + "fshType": "Instance", + "fshFile": "examples/ExampleVSDMKostentraeger.fsh", + "startLine": 1, + "endLine": 9 + }, + { + "outputFile": "Organization-d1f7b106-7f99-40d6-9f21-50b051301127.json", + "fshName": "VSDMKostentraegerBilling", + "fshType": "Instance", + "fshFile": "examples/ExampleVSDMKostentraeger.fsh", + "startLine": 11, + "endLine": 29 + }, { "outputFile": "Patient-437f2555-2396-4c64-a656-e9553161ca3c.json", "fshName": "VSDMPatientSample", @@ -93,7 +109,7 @@ "fshType": "Profile", "fshFile": "profiles/VSDMBundle.fsh", "startLine": 1, - "endLine": 39 + "endLine": 42 }, { "outputFile": "StructureDefinition-vsdm-composition.json", @@ -101,7 +117,7 @@ "fshType": "Profile", "fshFile": "profiles/VSDMComposition.fsh", "startLine": 1, - "endLine": 20 + "endLine": 19 }, { "outputFile": "StructureDefinition-vsdm-contactpoint-timessenger.json", @@ -117,7 +133,7 @@ "fshType": "Profile", "fshFile": "profiles/VSDMCoverage.fsh", "startLine": 1, - "endLine": 50 + "endLine": 46 }, { "outputFile": "StructureDefinition-vsdm-dmp-kennzeichen-basis-ex.json", @@ -143,6 +159,14 @@ "startLine": 1, "endLine": 14 }, + { + "outputFile": "StructureDefinition-vsdm-kostentraeger.json", + "fshName": "VSDMKostentraeger", + "fshType": "Profile", + "fshFile": "profiles/VSDMKostentraeger.fsh", + "startLine": 1, + "endLine": 12 + }, { "outputFile": "StructureDefinition-vsdm-operationoutcome.json", "fshName": "VSDMOperationOutcome", @@ -183,6 +207,14 @@ "startLine": 1, "endLine": 8 }, + { + "outputFile": "ValueSet-vsdm-kostentraeger-typ-vs.json", + "fshName": "VSDMKostentraegerTypVS", + "fshType": "ValueSet", + "fshFile": "valuesets/VSDMKostentraegerTypVS.fsh", + "startLine": 1, + "endLine": 8 + }, { "outputFile": "ValueSet-vsdm-versicherungsart-vs.json", "fshName": "VSDMVersicherungsartVS", diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt index 29b3394..e74ad14 100644 --- a/src/fhir/fsh-generated/fsh-index.txt +++ b/src/fhir/fsh-generated/fsh-index.txt @@ -1,5 +1,5 @@ Output File Name Type FSH File Lines -Bundle-9b6ac30d-246d-4eab-af83-544564792089.json Vsdm2BundleSample Instance examples/ExampleVSDMBundle.fsh 1 - 21 +Bundle-9b6ac30d-246d-4eab-af83-544564792089.json Vsdm2BundleSample Instance examples/ExampleVSDMBundle.fsh 1 - 25 CodeSystem-vsdm-errorcode-cs.json VSDMErrorcodeCS CodeSystem codesystems/VSDMErrorcodeCS.fsh 1 - 23 CodeSystem-vsdm-versicherungsart-cs.json VSDMVersicherungsartCS CodeSystem codesystems/VSDMVersicherungsartCS.fsh 1 - 12 CodeSystem-vsdm-wahltarife-cs.json VSDMWahltarifeCS CodeSystem codesystems/VSDMWahltarifeCS.fsh 1 - 13 @@ -7,21 +7,25 @@ CodeSystem-vsdmkostentreager-angabestatus-cs.json VSDMKostentreagerAng Coverage-2d4da53a-413a-48fe-b908-2e67b5761523.json VSDMCoverageSample Instance examples/ExampleVSDMCoverage.fsh 2 - 9 Coverage-VALID-413a-48fe-b908-2e67b5761523.json VALID-VSDMCoverageSample Instance examples/ExampleVSDMCoverage.fsh 13 - 19 OperationOutcome-example-vsdm-operationoutcome.json ExampleOperationOutcome Instance examples/ExampleOperationOutcome.fsh 1 - 15 +Organization-2a6924bf-6e6a-4ef3-b79f-c2138c10712f.json VSDMKostentraegerMain Instance examples/ExampleVSDMKostentraeger.fsh 1 - 9 +Organization-d1f7b106-7f99-40d6-9f21-50b051301127.json VSDMKostentraegerBilling Instance examples/ExampleVSDMKostentraeger.fsh 11 - 29 Patient-437f2555-2396-4c64-a656-e9553161ca3c.json VSDMPatientSample Instance profiles/VSDMPatient.fsh 36 - 59 Patient-Valid-437f2555-2396-4c64-a656-e9553161ca3c.json ValidExampleVSDMPatient Instance examples/ExampleVSDMPatient.fsh 1 - 30 StructureDefinition-gem-vsdm2-log-vsd-confirmation.json GEM_VSDM2_LOG_VSD_Confirmation Logical logicalmodel/logical_VSD_Datensatz.fsh 1 - 65 -StructureDefinition-vsdm-bundle.json VSDMBundle Profile profiles/VSDMBundle.fsh 1 - 39 -StructureDefinition-vsdm-composition.json VSDMComposition Profile profiles/VSDMComposition.fsh 1 - 20 +StructureDefinition-vsdm-bundle.json VSDMBundle Profile profiles/VSDMBundle.fsh 1 - 42 +StructureDefinition-vsdm-composition.json VSDMComposition Profile profiles/VSDMComposition.fsh 1 - 19 StructureDefinition-vsdm-contactpoint-timessenger.json VSDMContactPointTIMessenger Profile profiles/VSDMContactPointTIMessenger.fsh 1 - 7 -StructureDefinition-vsdm-coverage.json VSDMCoverage Profile profiles/VSDMCoverage.fsh 1 - 50 +StructureDefinition-vsdm-coverage.json VSDMCoverage Profile profiles/VSDMCoverage.fsh 1 - 46 StructureDefinition-vsdm-dmp-kennzeichen-basis-ex.json VSDMDMPKennzeichenBasisEX Extension extensions/VSDMDMPKennzeichenBasis.fsh 1 - 11 StructureDefinition-vsdm-dmpKennzeichen-ex.json VSDMDMPKennzeichenEX Extension extensions/VSDMDMPKennzeichen.fsh 1 - 25 StructureDefinition-vsdm-kostentraeger-laendercode-ex.json VSDMKostentraegerLaendercodeEX Extension extensions/VSDMKostentraegerLaendercodeEX.fsh 1 - 14 +StructureDefinition-vsdm-kostentraeger.json VSDMKostentraeger Profile profiles/VSDMKostentraeger.fsh 1 - 12 StructureDefinition-vsdm-operationoutcome.json VSDMOperationOutcome Profile profiles/VSDMOperationOutcome.fsh 1 - 34 StructureDefinition-vsdm-patient.json VSDMPatient Profile profiles/VSDMPatient.fsh 1 - 26 StructureDefinition-vsdm-wahltarife-ex.json VSDMWahltarifeEX Extension extensions/VSDMWahltarifeEX.fsh 1 - 35 StructureDefinition-vsdmkostentreager-angabestatus-ex.json VSDMKostentreagerAngabestatusEX Extension extensions/VSDMKostentreagerAngabestatusEX.fsh 1 - 11 ValueSet-vsdm-errorcode-vs.json VSDMErrorcodeVS ValueSet valuesets/VSDMErrorcodeVS.fsh 1 - 8 +ValueSet-vsdm-kostentraeger-typ-vs.json VSDMKostentraegerTypVS ValueSet valuesets/VSDMKostentraegerTypVS.fsh 1 - 8 ValueSet-vsdm-versicherungsart-vs.json VSDMVersicherungsartVS ValueSet valuesets/VSDMVersicherungsartVS.fsh 1 - 7 ValueSet-vsdm-wahltarife-vs.json VSDMWahltarifeVS ValueSet valuesets/VSDMWahltarifeVS.fsh 1 - 7 ValueSet-vsdmkostentreager-angabestatus-vs.json VSDMKostentreagerAngabestatusVS ValueSet valuesets/VSDMKostentreagerAngabestatusVS.fsh 1 - 7 \ No newline at end of file diff --git a/src/fhir/fsh-generated/resources/Bundle-9b6ac30d-246d-4eab-af83-544564792089.json b/src/fhir/fsh-generated/resources/Bundle-9b6ac30d-246d-4eab-af83-544564792089.json index 17c6e33..192bfa9 100644 --- a/src/fhir/fsh-generated/resources/Bundle-9b6ac30d-246d-4eab-af83-544564792089.json +++ b/src/fhir/fsh-generated/resources/Bundle-9b6ac30d-246d-4eab-af83-544564792089.json @@ -51,17 +51,29 @@ } ] }, + "date": "2023-11-03T12:02:23.157+01:00", + "title": "VSDM 2 data", "author": [ { - "identifier": { - "system": "http://fhir.de/sid/arge-ik/iknr", - "value": "12345678" - } + "type": "Organization", + "reference": "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" } ], - "date": "2023-11-03T12:02:23.157+01:00", - "title": "VSDM 2 data", "section": [ + { + "entry": [ + { + "reference": "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" + } + ] + }, + { + "entry": [ + { + "reference": "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" + } + ] + }, { "entry": [ { @@ -79,6 +91,87 @@ ] } }, + { + "fullUrl": "https://gematik.de/fhir/Kostentraeger/2a6924bf-6e6a-4ef3-b79f-c2138c10712f", + "resource": { + "resourceType": "Organization", + "id": "2a6924bf-6e6a-4ef3-b79f-c2138c10712f", + "meta": { + "profile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" + ] + }, + "identifier": [ + { + "system": "http://fhir.de/sid/arge-ik/iknr", + "value": "12345678" + } + ], + "name": "Beispiel-Kostenträger (Haupt-IK)", + "type": [ + { + "coding": [ + { + "code": "ins", + "display": "Haupt-IK" + } + ] + } + ] + } + }, + { + "fullUrl": "https://gematik.de/fhir/Kostentraeger/d1f7b106-7f99-40d6-9f21-50b051301127", + "resource": { + "resourceType": "Organization", + "id": "d1f7b106-7f99-40d6-9f21-50b051301127", + "meta": { + "profile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" + ] + }, + "identifier": [ + { + "system": "http://fhir.de/sid/arge-ik/iknr", + "value": "18765432" + } + ], + "name": "Beispiel-Kostenträger (Abrechnungs-IK)", + "type": [ + { + "coding": [ + { + "code": "pay", + "display": "Abrechnungs-IK" + } + ] + } + ], + "contact": [ + { + "purpose": { + "coding": [ + { + "code": "BILL", + "system": "http://terminology.hl7.org/CodeSystem/contactentity-type" + } + ], + "text": "Kontakt für Abrechnungsfragen" + }, + "telecom": [ + { + "system": "phone", + "value": "+490123456789" + }, + { + "system": "email", + "value": "contact@invalid.de" + } + ] + } + ] + } + }, { "fullUrl": "https://gematik.de/fhir/Patient/437f2555-2396-4c64-a656-e9553161ca3c", "resource": { @@ -281,15 +374,6 @@ "url": "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMWahltarifeEX" } ], - "payor": [ - { - "identifier": { - "system": "http://fhir.de/sid/arge-ik/iknr", - "value": "12345678" - }, - "display": "Test GKV Krankenkasse" - } - ], "type": { "coding": [ { @@ -304,7 +388,15 @@ }, "beneficiary": { "reference": "Patient/437f2555-2396-4c64-a656-e9553161ca3c" - } + }, + "payor": [ + { + "reference": "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" + }, + { + "reference": "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" + } + ] } } ] diff --git a/src/fhir/fsh-generated/resources/Coverage-2d4da53a-413a-48fe-b908-2e67b5761523.json b/src/fhir/fsh-generated/resources/Coverage-2d4da53a-413a-48fe-b908-2e67b5761523.json index daebeb5..8068b0a 100644 --- a/src/fhir/fsh-generated/resources/Coverage-2d4da53a-413a-48fe-b908-2e67b5761523.json +++ b/src/fhir/fsh-generated/resources/Coverage-2d4da53a-413a-48fe-b908-2e67b5761523.json @@ -131,15 +131,6 @@ "url": "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMWahltarifeEX" } ], - "payor": [ - { - "identifier": { - "system": "http://fhir.de/sid/arge-ik/iknr", - "value": "12345678" - }, - "display": "Test GKV Krankenkasse" - } - ], "type": { "coding": [ { @@ -154,5 +145,13 @@ }, "beneficiary": { "reference": "Patient/437f2555-2396-4c64-a656-e9553161ca3c" - } + }, + "payor": [ + { + "reference": "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" + }, + { + "reference": "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" + } + ] } diff --git a/src/fhir/fsh-generated/resources/Coverage-VALID-413a-48fe-b908-2e67b5761523.json b/src/fhir/fsh-generated/resources/Coverage-VALID-413a-48fe-b908-2e67b5761523.json index ccc80cc..2afdba0 100644 --- a/src/fhir/fsh-generated/resources/Coverage-VALID-413a-48fe-b908-2e67b5761523.json +++ b/src/fhir/fsh-generated/resources/Coverage-VALID-413a-48fe-b908-2e67b5761523.json @@ -127,15 +127,6 @@ "url": "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMWahltarifeEX" } ], - "payor": [ - { - "identifier": { - "system": "http://fhir.de/sid/arge-ik/iknr", - "value": "12345678" - }, - "display": "Test GKV Krankenkasse" - } - ], "type": { "coding": [ { @@ -150,5 +141,13 @@ }, "beneficiary": { "reference": "Patient/437f2555-2396-4c64-a656-e9553161ca3c" - } + }, + "payor": [ + { + "reference": "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" + }, + { + "reference": "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" + } + ] } diff --git a/src/fhir/fsh-generated/resources/Organization-2a6924bf-6e6a-4ef3-b79f-c2138c10712f.json b/src/fhir/fsh-generated/resources/Organization-2a6924bf-6e6a-4ef3-b79f-c2138c10712f.json new file mode 100644 index 0000000..d686436 --- /dev/null +++ b/src/fhir/fsh-generated/resources/Organization-2a6924bf-6e6a-4ef3-b79f-c2138c10712f.json @@ -0,0 +1,26 @@ +{ + "resourceType": "Organization", + "id": "2a6924bf-6e6a-4ef3-b79f-c2138c10712f", + "meta": { + "profile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" + ] + }, + "identifier": [ + { + "system": "http://fhir.de/sid/arge-ik/iknr", + "value": "12345678" + } + ], + "name": "Beispiel-Kostenträger (Haupt-IK)", + "type": [ + { + "coding": [ + { + "code": "ins", + "display": "Haupt-IK" + } + ] + } + ] +} diff --git a/src/fhir/fsh-generated/resources/Organization-d1f7b106-7f99-40d6-9f21-50b051301127.json b/src/fhir/fsh-generated/resources/Organization-d1f7b106-7f99-40d6-9f21-50b051301127.json new file mode 100644 index 0000000..788c53a --- /dev/null +++ b/src/fhir/fsh-generated/resources/Organization-d1f7b106-7f99-40d6-9f21-50b051301127.json @@ -0,0 +1,49 @@ +{ + "resourceType": "Organization", + "id": "d1f7b106-7f99-40d6-9f21-50b051301127", + "meta": { + "profile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" + ] + }, + "identifier": [ + { + "system": "http://fhir.de/sid/arge-ik/iknr", + "value": "18765432" + } + ], + "name": "Beispiel-Kostenträger (Abrechnungs-IK)", + "type": [ + { + "coding": [ + { + "code": "pay", + "display": "Abrechnungs-IK" + } + ] + } + ], + "contact": [ + { + "purpose": { + "coding": [ + { + "code": "BILL", + "system": "http://terminology.hl7.org/CodeSystem/contactentity-type" + } + ], + "text": "Kontakt für Abrechnungsfragen" + }, + "telecom": [ + { + "system": "phone", + "value": "+490123456789" + }, + { + "system": "email", + "value": "contact@invalid.de" + } + ] + } + ] +} diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-bundle.json b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-bundle.json index 8d072fe..c8725b8 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-bundle.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-bundle.json @@ -71,7 +71,7 @@ ], "rules": "closed" }, - "min": 3 + "min": 4 }, { "id": "Bundle.entry:DocumentInformation", @@ -93,6 +93,26 @@ } ] }, + { + "id": "Bundle.entry:VSDMKostentraeger", + "path": "Bundle.entry", + "sliceName": "VSDMKostentraeger", + "min": 1, + "max": "*" + }, + { + "id": "Bundle.entry:VSDMKostentraeger.resource", + "path": "Bundle.entry.resource", + "min": 1, + "type": [ + { + "code": "Organization", + "profile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" + ] + } + ] + }, { "id": "Bundle.entry:VSDMPatient", "path": "Bundle.entry", diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-composition.json b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-composition.json index 3f7dcf3..9042fec 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-composition.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-composition.json @@ -38,6 +38,7 @@ "path": "url" } ], + "description": "Extensions are always sliced by (at least) url", "rules": "closed" } }, @@ -69,14 +70,13 @@ "mustSupport": true }, { - "id": "Composition.author.identifier", - "path": "Composition.author.identifier", - "min": 1, + "id": "Composition.author", + "path": "Composition.author", "type": [ { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-iknr" + "code": "Reference", + "targetProfile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" ] } ] diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-coverage.json b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-coverage.json index 62be13c..3a73085 100644 --- a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-coverage.json +++ b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-coverage.json @@ -299,41 +299,14 @@ { "id": "Coverage.payor", "path": "Coverage.payor", - "max": "1" - }, - { - "id": "Coverage.payor.extension:abrechnendeIK", - "path": "Coverage.payor.extension", - "sliceName": "abrechnendeIK", - "min": 0, - "max": "1", - "type": [ - { - "code": "Extension", - "profile": [ - "http://fhir.de/StructureDefinition/AbrechnendeIK" - ] - } - ] - }, - { - "id": "Coverage.payor.identifier", - "path": "Coverage.payor.identifier", - "min": 1, "type": [ { - "code": "Identifier", - "profile": [ - "http://fhir.de/StructureDefinition/identifier-iknr" + "code": "Reference", + "targetProfile": [ + "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" ] } ] - }, - { - "id": "Coverage.payor.display", - "path": "Coverage.payor.display", - "short": "Name des Kostenträgers", - "min": 1 } ] } diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-kostentraeger.json b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-kostentraeger.json new file mode 100644 index 0000000..6c00786 --- /dev/null +++ b/src/fhir/fsh-generated/resources/StructureDefinition-vsdm-kostentraeger.json @@ -0,0 +1,57 @@ +{ + "resourceType": "StructureDefinition", + "id": "vsdm-kostentraeger", + "url": "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger", + "name": "VSDMKostentraeger", + "status": "draft", + "experimental": false, + "date": "2023-12-31", + "publisher": "gematik GmbH", + "fhirVersion": "4.0.1", + "kind": "resource", + "abstract": false, + "type": "Organization", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Organization", + "derivation": "constraint", + "differential": { + "element": [ + { + "id": "Organization.identifier", + "path": "Organization.identifier", + "min": 1, + "max": "1", + "type": [ + { + "code": "Identifier", + "profile": [ + "http://fhir.de/StructureDefinition/identifier-iknr" + ] + } + ] + }, + { + "id": "Organization.active", + "path": "Organization.active", + "fixedBoolean": true + }, + { + "id": "Organization.type", + "path": "Organization.type", + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/vsdm2/CodeSystem/VSDMKostentraegerTypVS" + } + }, + { + "id": "Organization.type.coding.system", + "path": "Organization.type.coding.system", + "patternUri": "http://terminology.hl7.org/CodeSystem/organization-type" + }, + { + "id": "Organization.name", + "path": "Organization.name", + "min": 1 + } + ] + } +} diff --git a/src/fhir/fsh-generated/resources/ValueSet-vsdm-kostentraeger-typ-vs.json b/src/fhir/fsh-generated/resources/ValueSet-vsdm-kostentraeger-typ-vs.json new file mode 100644 index 0000000..62819b8 --- /dev/null +++ b/src/fhir/fsh-generated/resources/ValueSet-vsdm-kostentraeger-typ-vs.json @@ -0,0 +1,28 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "VSDMKostentraegerTypVS", + "id": "vsdm-kostentraeger-typ-vs", + "title": "VSDM Kostentraegertyp VS", + "url": "https://gematik.de/fhir/vsdm2/CodeSystem/VSDMKostentraegerTypVS", + "experimental": false, + "publisher": "gematik GmbH", + "date": "2023-12-31", + "compose": { + "include": [ + { + "system": "http://terminology.hl7.org/CodeSystem/organization-type", + "concept": [ + { + "code": "ins", + "display": "Kostenträger (Haupt-IK)" + }, + { + "code": "pay", + "display": "Kostenträger (Abrechnungs-IK)" + } + ] + } + ] + } +} diff --git a/src/fhir/input/fsh/aliases.fsh b/src/fhir/input/fsh/aliases.fsh index 3b9eeb0..fa27876 100644 --- a/src/fhir/input/fsh/aliases.fsh +++ b/src/fhir/input/fsh/aliases.fsh @@ -6,6 +6,8 @@ Alias: $v3-ActCode = http://terminology.hl7.org/CodeSystem/v3-ActCode Alias: $loinc = http://loinc.org Alias: $versichertenart-de-basis-cs = http://fhir.de/CodeSystem/versicherungsart-de-basis Alias: $operationoutcomecodes = http://terminology.hl7.org/CodeSystem/operation-outcome +Alias: $organizationtype = http://terminology.hl7.org/CodeSystem/organization-type +Alias: $contactentitytype = http://terminology.hl7.org/CodeSystem/contactentity-type // in Patient Alias: $identifier-kvid-10 = http://fhir.de/StructureDefinition/identifier-kvid-10 diff --git a/src/fhir/input/fsh/examples/ExampleVSDMBundle.fsh b/src/fhir/input/fsh/examples/ExampleVSDMBundle.fsh index 29ffa7d..b95e8a8 100644 --- a/src/fhir/input/fsh/examples/ExampleVSDMBundle.fsh +++ b/src/fhir/input/fsh/examples/ExampleVSDMBundle.fsh @@ -8,6 +8,10 @@ Usage: #example * timestamp = "2023-11-03T12:02:23.157+01:00" * entry[DocumentInformation][+].fullUrl = "https://gematik.de/fhir/Composition/c624cf47-e235-4624-af71-0a09dc9254dc" * entry[DocumentInformation][=].resource = VSDM2CompositionSample +* entry[VSDMKostentraeger][+].fullUrl = "https://gematik.de/fhir/Kostentraeger/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" +* entry[VSDMKostentraeger][=].resource = VSDMKostentraegerMain +* entry[VSDMKostentraeger][+].fullUrl = "https://gematik.de/fhir/Kostentraeger/d1f7b106-7f99-40d6-9f21-50b051301127" +* entry[VSDMKostentraeger][=].resource = VSDMKostentraegerBilling * entry[VSDMPatient][+].fullUrl = "https://gematik.de/fhir/Patient/437f2555-2396-4c64-a656-e9553161ca3c" * entry[VSDMPatient][=].resource = VSDMPatientSample * entry[VSDMCoverage][+].fullUrl = "https://gematik.de/fhir/Coverage/2d4da53a-413a-48fe-b908-2e67b5761523" diff --git a/src/fhir/input/fsh/examples/ExampleVSDMComposition.fsh b/src/fhir/input/fsh/examples/ExampleVSDMComposition.fsh index f2099e3..e97701c 100644 --- a/src/fhir/input/fsh/examples/ExampleVSDMComposition.fsh +++ b/src/fhir/input/fsh/examples/ExampleVSDMComposition.fsh @@ -7,7 +7,9 @@ Usage: #inline * status = #final * date = "2023-11-03T12:02:23.157+01:00" * title = "VSDM 2 data" -* author.identifier.system = "http://fhir.de/sid/arge-ik/iknr" -* author.identifier.value = "12345678" +* author.type = #Organization +* author.reference = "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" +* section[+].entry.reference = "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" +* section[+].entry.reference = "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" * section[+].entry.reference = "Patient/437f2555-2396-4c64-a656-e9553161ca3c" * section[+].entry.reference = "Coverage/2d4da53a-413a-48fe-b908-2e67b5761523" \ No newline at end of file diff --git a/src/fhir/input/fsh/examples/ExampleVSDMCoverage.fsh b/src/fhir/input/fsh/examples/ExampleVSDMCoverage.fsh index 3ab8eca..ab77342 100644 --- a/src/fhir/input/fsh/examples/ExampleVSDMCoverage.fsh +++ b/src/fhir/input/fsh/examples/ExampleVSDMCoverage.fsh @@ -24,8 +24,8 @@ RuleSet: ExampleCoverage * period.start = "2022-04-01" * period.end = "2027-07-31" * beneficiary.reference = "Patient/437f2555-2396-4c64-a656-e9553161ca3c" -* payor.identifier.value = "12345678" -* payor.display = "Test GKV Krankenkasse" +* payor[+].reference = "Organization/2a6924bf-6e6a-4ef3-b79f-c2138c10712f" +* payor[+].reference = "Organization/d1f7b106-7f99-40d6-9f21-50b051301127" * extension[vsdm-kostentragerAngabestatus].valueCodeableConcept.coding[+] = VSDMKostentreagerAngabestatusCS#dmp * extension[vsdm-kostentragerAngabestatus].valueCodeableConcept.coding[+] = VSDMKostentreagerAngabestatusCS#wahltarife diff --git a/src/fhir/input/fsh/examples/ExampleVSDMKostentraeger.fsh b/src/fhir/input/fsh/examples/ExampleVSDMKostentraeger.fsh new file mode 100644 index 0000000..b13877e --- /dev/null +++ b/src/fhir/input/fsh/examples/ExampleVSDMKostentraeger.fsh @@ -0,0 +1,29 @@ +Instance: VSDMKostentraegerMain +InstanceOf: VSDMKostentraeger +Title: "Kostenträger (Haupt-IK)" +Usage: #example +* id = "2a6924bf-6e6a-4ef3-b79f-c2138c10712f" // to be discussed: might also be identical to the identifier (IK) +* meta.profile = "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" +* identifier.value = "12345678" +* name = "Beispiel-Kostenträger (Haupt-IK)" +* type = #ins "Haupt-IK" // text is optional, could be left out + +Instance: VSDMKostentraegerBilling +InstanceOf: VSDMKostentraeger +Title: "Kostenträger (Abrechnungs-IK)" +Usage: #example +* id = "d1f7b106-7f99-40d6-9f21-50b051301127" // to be discussed: might also be identical to the identifier (IK) +* meta.profile = "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" +* identifier.value = "18765432" +* name = "Beispiel-Kostenträger (Abrechnungs-IK)" +* type = #pay "Abrechnungs-IK" // text is optional, could be left out +// The following lines show an example how additional contact information might be transmitted. +* contact[+].purpose + * coding = $contactentitytype#BILL + * text = "Kontakt für Abrechnungsfragen" +* contact[=].telecom[+] + * system = #phone + * value = "+490123456789" +* contact[=].telecom[+] + * system = #email + * value = "contact@invalid.de" diff --git a/src/fhir/input/fsh/profiles/VSDMBundle.fsh b/src/fhir/input/fsh/profiles/VSDMBundle.fsh index 6c62b40..a964c34 100644 --- a/src/fhir/input/fsh/profiles/VSDMBundle.fsh +++ b/src/fhir/input/fsh/profiles/VSDMBundle.fsh @@ -21,10 +21,13 @@ Id: vsdm-bundle * entry ^slicing.rules = #closed * entry contains DocumentInformation 1..1 and + VSDMKostentraeger 1..* and VSDMPatient 1..1 and - VSDMCoverage 1..1 + VSDMCoverage 1..1 * entry[DocumentInformation].resource 1.. * entry[DocumentInformation].resource only VSDMComposition +* entry[VSDMKostentraeger].resource 1.. +* entry[VSDMKostentraeger].resource only VSDMKostentraeger * entry[VSDMPatient].resource 1.. * entry[VSDMPatient].resource only VSDMPatient * entry[VSDMCoverage].resource 1.. diff --git a/src/fhir/input/fsh/profiles/VSDMComposition.fsh b/src/fhir/input/fsh/profiles/VSDMComposition.fsh index bf7280a..304c319 100644 --- a/src/fhir/input/fsh/profiles/VSDMComposition.fsh +++ b/src/fhir/input/fsh/profiles/VSDMComposition.fsh @@ -16,5 +16,4 @@ Title: "VSDM 2 Composition for VSDM 2 Bundle" * type.coding 1..1 * type.coding = $loinc#55188-7 "Patient data Document" * date MS -* author.identifier 1..1 -* author.identifier only IdentifierIknr \ No newline at end of file +* author only Reference(VSDMKostentraeger) diff --git a/src/fhir/input/fsh/profiles/VSDMCoverage.fsh b/src/fhir/input/fsh/profiles/VSDMCoverage.fsh index 0ea5253..4e421ed 100644 --- a/src/fhir/input/fsh/profiles/VSDMCoverage.fsh +++ b/src/fhir/input/fsh/profiles/VSDMCoverage.fsh @@ -42,10 +42,5 @@ Id: vsdm-coverage * period 1..1 * start 1..1 * end 1..1 -* payor 1..1 - * extension contains $AbrechnendeIK named abrechnendeIK 0..1 - * identifier 1..1 - * identifier only IdentifierIknr - * display 1..1 - * ^short = "Name des Kostenträgers" - +* payor 1..* +* payor only Reference(VSDMKostentraeger) diff --git a/src/fhir/input/fsh/profiles/VSDMKostentraeger.fsh b/src/fhir/input/fsh/profiles/VSDMKostentraeger.fsh new file mode 100644 index 0000000..34f52e5 --- /dev/null +++ b/src/fhir/input/fsh/profiles/VSDMKostentraeger.fsh @@ -0,0 +1,12 @@ +Profile: VSDMKostentraeger +Parent: Organization +Id: vsdm-kostentraeger +* ^url = "https://gematik.de/fhir/vsdm2/StructureDefinition/VSDMKostentraeger" +* insert Meta +* identifier 1..1 +* identifier only IdentifierIknr +* active = true (exactly) +* type from VSDMKostentraegerTypVS (required) +* type + * coding.system = $organizationtype +* name 1..1 // to be discussed diff --git a/src/fhir/input/fsh/valuesets/VSDMKostentraegerTypVS.fsh b/src/fhir/input/fsh/valuesets/VSDMKostentraegerTypVS.fsh new file mode 100644 index 0000000..c608152 --- /dev/null +++ b/src/fhir/input/fsh/valuesets/VSDMKostentraegerTypVS.fsh @@ -0,0 +1,8 @@ +ValueSet: VSDMKostentraegerTypVS +Id: vsdm-kostentraeger-typ-vs +Title: "VSDM Kostentraegertyp VS" +* ^url = "https://gematik.de/fhir/vsdm2/CodeSystem/VSDMKostentraegerTypVS" +* insert Meta + +* include $organizationtype#ins "Kostenträger (Haupt-IK)" +* include $organizationtype#pay "Kostenträger (Abrechnungs-IK)"