From 10bbf2b342d5c129a4ebdfc360558782cfb1e6fe Mon Sep 17 00:00:00 2001 From: Patrick Werner Date: Sun, 1 Dec 2024 16:23:57 +0100 Subject: [PATCH] fixed all relevant validation issues/errors --- Resources/fsh-generated/fsh-index.json | 36 +++++++++---------- Resources/fsh-generated/fsh-index.txt | 22 ++++++------ ...ndle-ExampleISiKMedikationTransaction.json | 3 +- ...mpleISiKMedikationTransactionResponse.json | 3 +- ...Statement-ISiKCapabilityStatementAMTS.json | 6 ++-- ...abilityStatementMedikationInformation.json | 2 +- ...ilityStatementMedikationVerabreichung.json | 2 +- ...pabilityStatementMedikationVerordnung.json | 2 +- .../CodeSystem-ISiKMedikationsartCS.json | 2 +- .../Medication-ExampleISiKMedikament1.json | 3 +- .../Medication-ExampleISiKMedikament2.json | 1 + .../Medication-ExampleISiKMedikament5.json | 6 ++-- .../Medication-ExampleISiKMedikament7.json | 3 +- .../Medication-ExampleISiKMedikament8.json | 6 ++-- .../Medication-ExampleISiKMedikament9.json | 6 ++-- ...-ExampleISiKMedikationsVerabreichung3.json | 6 ++-- ...-ExampleISiKMedikationsVerabreichung4.json | 6 ++-- ...eDefinition-ExtensionISiKAcceptedRisk.json | 2 +- ...finition-ExtensionISiKBehandlungsziel.json | 2 +- ...xtensionISiKMedicationRequestReplaces.json | 2 +- ...ensionISiKMedicationStatementReplaces.json | 2 +- ...efinition-ExtensionISiKMedikationsart.json | 2 +- ...inition-ExtensionISiKSelbstmedikation.json | 2 +- ...StructureDefinition-ISiKAMTSBewertung.json | 2 +- .../StructureDefinition-ISiKMedikament.json | 2 +- ...eDefinition-ISiKMedikationTransaction.json | 2 +- ...ion-ISiKMedikationTransactionResponse.json | 2 +- ...Definition-ISiKMedikationsInformation.json | 2 +- ...uctureDefinition-ISiKMedikationsListe.json | 2 +- ...finition-ISiKMedikationsVerabreichung.json | 2 +- ...eDefinition-ISiKMedikationsVerordnung.json | 2 +- ...tructureDefinition-MedicationQuantity.json | 2 +- .../ValueSet-ISiKMedikationsartVS.json | 2 +- .../ValueSet-MedikationsListeListModeVS.json | 2 +- .../ValueSet-SctRouteOfAdministration.json | 2 +- .../input/fsh/ISiKCapabilityStatementAMTS.fsh | 5 +-- Resources/input/fsh/ISiKMedikament.fsh | 9 +++++ .../fsh/ISiKMedikationsVerabreichung.fsh | 4 +-- 38 files changed, 95 insertions(+), 74 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 4358b7c3..30e84847 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -21,7 +21,7 @@ "fshType": "Instance", "fshFile": "ISiKCapabilityStatementAMTS.fsh", "startLine": 1, - "endLine": 858 + "endLine": 859 }, { "outputFile": "CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json", @@ -85,71 +85,71 @@ "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", "startLine": 118, - "endLine": 125 + "endLine": 126 }, { "outputFile": "Medication-ExampleISiKMedikament2.json", "fshName": "ExampleISiKMedikament2", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 127, - "endLine": 159 + "startLine": 128, + "endLine": 161 }, { "outputFile": "Medication-ExampleISiKMedikament3.json", "fshName": "ExampleISiKMedikament3", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 161, - "endLine": 168 + "startLine": 163, + "endLine": 170 }, { "outputFile": "Medication-ExampleISiKMedikament4.json", "fshName": "ExampleISiKMedikament4", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 170, - "endLine": 208 + "startLine": 172, + "endLine": 210 }, { "outputFile": "Medication-ExampleISiKMedikament5.json", "fshName": "ExampleISiKMedikament5", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 210, - "endLine": 248 + "startLine": 212, + "endLine": 252 }, { "outputFile": "Medication-ExampleISiKMedikament6.json", "fshName": "ExampleISiKMedikament6", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 250, - "endLine": 254 + "startLine": 254, + "endLine": 258 }, { "outputFile": "Medication-ExampleISiKMedikament7.json", "fshName": "ExampleISiKMedikament7", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 256, - "endLine": 289 + "startLine": 260, + "endLine": 294 }, { "outputFile": "Medication-ExampleISiKMedikament8.json", "fshName": "ExampleISiKMedikament8", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 291, - "endLine": 333 + "startLine": 296, + "endLine": 340 }, { "outputFile": "Medication-ExampleISiKMedikament9.json", "fshName": "ExampleISiKMedikament9", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 335, - "endLine": 377 + "startLine": 342, + "endLine": 386 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 62ae66af..433d0c2a 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -1,7 +1,7 @@ Output File Name Type FSH File Lines Bundle-ExampleISiKMedikationTransaction.json ExampleISiKMedikationTransaction Instance ISiKMedikationTransaction.fsh 28 - 43 Bundle-ExampleISiKMedikationTransactionResponse.json ExampleISiKMedikationTransactionResponse Instance ISiKMedikationTransactionResponse.fsh 30 - 45 -CapabilityStatement-ISiKCapabilityStatementAMTS.json ISiKCapabilityStatementAMTS Instance ISiKCapabilityStatementAMTS.fsh 1 - 858 +CapabilityStatement-ISiKCapabilityStatementAMTS.json ISiKCapabilityStatementAMTS Instance ISiKCapabilityStatementAMTS.fsh 1 - 859 CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json ISiKCapabilityStatementMedikationInformation Instance ISiKCapabilityStatementMedikationInformation.fsh 1 - 494 CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json ISiKCapabilityStatementMedikationVerabreichung Instance ISiKCapabilityStatementMedikationVerabreichung.fsh 1 - 411 CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json ISiKCapabilityStatementMedikationVerordnung Instance ISiKCapabilityStatementMedikationVerordnung.fsh 1 - 425 @@ -9,15 +9,15 @@ CodeSystem-ISiKMedikationsartCS.json ISiKMed Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance referencedExamples.fsh 53 - 87 List-ExampleISiKMedikationsListe.json ExampleISiKMedikationsListe Instance ISiKMedikationsListe.fsh 58 - 71 List-ExampleISiKMedikationsListeParkinson.json ExampleISiKMedikationsListeParkinson Instance ISiKMedikationsListe.fsh 73 - 95 -Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 118 - 125 -Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 127 - 159 -Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 161 - 168 -Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 170 - 208 -Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 210 - 248 -Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 250 - 254 -Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 256 - 289 -Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 291 - 333 -Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 335 - 377 +Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 118 - 126 +Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 128 - 161 +Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 163 - 170 +Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 172 - 210 +Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 212 - 252 +Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 254 - 258 +Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 260 - 294 +Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 296 - 340 +Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 342 - 386 MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 111 - 124 MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 126 - 139 MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json ExampleISiKMedikationsVerabreichung3 Instance ISiKMedikationsVerabreichung.fsh 141 - 164 @@ -51,7 +51,7 @@ StructureDefinition-ISiKMedikationsInformation.json ISiKMed StructureDefinition-ISiKMedikationsListe.json ISiKMedikationsListe Profile ISiKMedikationsListe.fsh 1 - 56 StructureDefinition-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 109 StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 236 -StructureDefinition-MedicationQuantity.json MedicationQuantity Profile dataTypeProfiles.fsh 1 - 10 +StructureDefinition-MedicationQuantity.json MedicationQuantity Profile dataTypeProfiles.fsh 1 - 11 ValueSet-ISiKMedikationsartVS.json ISiKMedikationsartVS ValueSet valueSets.fsh 7 - 11 ValueSet-MedikationsListeListModeVS.json MedikationsListeListModeVS ValueSet valueSets.fsh 13 - 19 ValueSet-SctRouteOfAdministration.json SctRouteOfAdministration ValueSet valueSets.fsh 1 - 5 \ No newline at end of file diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json index 33419456..e012f97b 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json @@ -102,7 +102,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "V03AB23", - "display": "Acetylcystein" + "display": "Acetylcystein", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json index 33223c57..dfaeaa70 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json @@ -102,7 +102,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "V03AB23", - "display": "Acetylcystein" + "display": "Acetylcystein", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json index f34bd954..8b16066f 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementAMTS.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.1", "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "implementationGuide": [ "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" ], @@ -816,7 +816,7 @@ ], "name": "_profile", "definition": "http://hl7.org/fhir/SearchParameter/Resource-profile", - "type": "token" + "type": "uri" }, { "extension": [ @@ -1025,7 +1025,7 @@ ], "name": "_profile", "definition": "http://hl7.org/fhir/SearchParameter/Resource-profile", - "type": "token" + "type": "uri" }, { "extension": [ diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json index 7e63ff29..34218047 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.1", "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "implementationGuide": [ "https://gematik.de/fhir/Medikation/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json index 53784064..cd9817e6 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.1", "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "implementationGuide": [ "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json index bd2c3fb2..7dc34d39 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json @@ -6,7 +6,7 @@ "experimental": false, "version": "4.0.1", "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "implementationGuide": [ "https://gematik.de/fhir/ISiK/ImplementationGuide/ISiK-Medikation" ], diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json index a1bc963c..2f8b0774 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json @@ -20,6 +20,6 @@ ], "experimental": false, "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "count": 2 } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament1.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament1.json index dd59ef10..c421c0f4 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament1.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament1.json @@ -11,7 +11,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "V03AB23", - "display": "Acetylcystein" + "display": "Acetylcystein", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json index 7f06fdc1..1940a841 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json @@ -36,6 +36,7 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "L01DB01", + "version": "2024", "display": "Doxorubicin" } ] diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json index 36ebe76e..0be3ae9a 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json @@ -27,7 +27,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "M02AA13", - "display": "Ibuprofen" + "display": "Ibuprofen", + "version": "2024" } ] }, @@ -53,7 +54,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "N02BE01", - "display": "Paracetamol" + "display": "Paracetamol", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json index 4cb6fa46..fd0b3bd5 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json @@ -26,7 +26,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "N02BE01", - "display": "Paracetamol" + "display": "Paracetamol", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json index d712e02b..a5e46588 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json @@ -27,7 +27,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "L01CD01", - "display": "Paclitaxel" + "display": "Paclitaxel", + "version": "2024" } ] }, @@ -53,7 +54,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "B05BA11", - "display": "Glucose" + "display": "Glucose", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json index e653b873..c99dfd51 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json @@ -27,7 +27,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "L01CD01", - "display": "Paclitaxel" + "display": "Paclitaxel", + "version": "2024" } ] }, @@ -53,7 +54,8 @@ { "system": "http://fhir.de/CodeSystem/bfarm/atc", "code": "B05BA11", - "display": "Glucose" + "display": "Glucose", + "version": "2024" } ] }, diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json index 20ebb07e..7c0350ab 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json @@ -32,9 +32,9 @@ "route": { "coding": [ { - "code": "255560000", - "system": "http://snomed.info/sct", - "display": "Intravenous" + "code": "20045000", + "system": "http://standardterms.edqm.eu", + "display": "Intravenous use" } ] } diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json index 00c3b73c..1c85e8df 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json @@ -40,9 +40,9 @@ "route": { "coding": [ { - "code": "255560000", - "system": "http://snomed.info/sct", - "display": "Intravenous" + "code": "20045000", + "system": "http://standardterms.edqm.eu", + "display": "Intravenous use" } ] } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json index e159662e..1034cbf3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKAcceptedRisk.json @@ -7,7 +7,7 @@ "title": "ISiK Accepted Risk", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur Dokumentation eines im Rahmen der AMTS bewusst eingegangenen Risikos. In diesem Freitext kann die Begründung und ggf. zu treffende besondere Maßnahmen dokumentiert werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json index 723fac63..c4768ea5 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKBehandlungsziel.json @@ -7,7 +7,7 @@ "title": "ISiK Behandlungsziel", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur freitextlichen Angabe des Behandlungsziels.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json index 2a44b2e7..f494b47a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationRequestReplaces.json @@ -7,7 +7,7 @@ "title": "ISiK MedicationRequestReplaces", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur Verlinkung der Medikationsverordnung die ersetzt wurde", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json index c11eb181..250b71f4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedicationStatementReplaces.json @@ -7,7 +7,7 @@ "title": "ISiK MedicationStatementReplaces", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur Verlinkung der Medikationsinformation die ersetzt wurde", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json index d5d9b06c..91b64528 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKMedikationsart.json @@ -7,7 +7,7 @@ "title": "ISiK Medikationsart", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur Dokumentation der Therapieart einer Medikation (Akut- oder Dauermedikation).", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json index 80ee6f39..de8b9f55 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ExtensionISiKSelbstmedikation.json @@ -7,7 +7,7 @@ "title": "ISiK Selbstmedikation", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Extension zur Angabe, ob es sich bei der Medikation um eine Selbstmedikation handelt.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json index 8ba246e7..b07291af 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAMTSBewertung.json @@ -7,7 +7,7 @@ "title": "ISiK AMTS-Bewertung", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Risikobeurteilung im Rahmen der Arzneimitteltherapiesicherheit (AMTS).", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json index 931b6d94..7d04dbfe 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json @@ -6,7 +6,7 @@ "name": "ISiKMedikament", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen Informationen zu Medikamenten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json index 7ecdd9f4..c34f228e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransaction.json @@ -7,7 +7,7 @@ "title": "ISiK Medikation Transactionbundle", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil definiert die Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json index b078c4e8..9eb651cc 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationTransactionResponse.json @@ -7,7 +7,7 @@ "title": "ISiK Medikation TransactionBundle-Response", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil definiert die Server-Antwort auf Transaktions-Bundles im Rahmen von ISiK-Medikations-Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json index e8ff482e..2f33ef93 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsInformation", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Informationen zur Medikation eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json index d12e5f9a..cce44af2 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsListe.json @@ -7,7 +7,7 @@ "title": "ISiK Medikationsliste", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Zusammenführung einzelner MedikationsInformationen eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json index d7180f7d..dcbb7952 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsVerabreichung", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medikamenten für einen Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json index 14996753..7d9f8c83 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json @@ -6,7 +6,7 @@ "name": "ISiKMedikationsVerordnung", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Dieses Profil ermöglicht die Abbildung von Medikationsverordnungen eines Patienten in ISiK Szenarien.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json index 62813772..2ee52fd4 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -7,7 +7,7 @@ "title": "Medication Quantity", "status": "active", "experimental": false, - "date": "2024-10-31", + "date": "2024-11-07", "publisher": "gematik GmbH", "description": "Quantity Datentyp der die Nutzung von UCUM vorgibt. Bei dimensionslosen Einheiten wie 'Tablette' wird ein code von '1' erwartet, 'Tablette' kann als String in Unit hinterlegt werden.", "fhirVersion": "4.0.1", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json index 02a6642b..afeb7e93 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json @@ -8,7 +8,7 @@ "url": "https://gematik.de/fhir/isik/ValueSet/ISiKMedikationsartVS", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json b/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json index 943acdc2..3888ce69 100644 --- a/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json +++ b/Resources/fsh-generated/resources/ValueSet-MedikationsListeListModeVS.json @@ -9,7 +9,7 @@ "url": "https://gematik.de/fhir/isik/ValueSet/MedikationsListeListModeVS", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "compose": { "include": [ { diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json index acd7ef62..244fcbc9 100644 --- a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json +++ b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json @@ -8,7 +8,7 @@ "url": "https://gematik.de/fhir/isik/ValueSet/SctRouteOfAdministration", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-10-31", + "date": "2024-11-07", "compose": { "include": [ { diff --git a/Resources/input/fsh/ISiKCapabilityStatementAMTS.fsh b/Resources/input/fsh/ISiKCapabilityStatementAMTS.fsh index 887248c1..1e371e95 100644 --- a/Resources/input/fsh/ISiKCapabilityStatementAMTS.fsh +++ b/Resources/input/fsh/ISiKCapabilityStatementAMTS.fsh @@ -443,7 +443,7 @@ Usage: #definition * valueCode = #MAY * name = "_profile" * definition = "http://hl7.org/fhir/SearchParameter/Resource-profile" - * type = #token + * type = #uri * searchParam[+] * extension * url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation" @@ -568,7 +568,7 @@ Usage: #definition * valueCode = #MAY * name = "_profile" * definition = "http://hl7.org/fhir/SearchParameter/Resource-profile" - * type = #token + * type = #uri * searchParam[+] * extension * url = "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation" @@ -837,6 +837,7 @@ Usage: #definition * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #SHALL * rest.resource[=].searchParam[=].name = "related" +//// fixme * rest.resource[=].searchParam[=].definition = "http://fhir.de/SearchParameter/Condition-related" * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation diff --git a/Resources/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh index 5b5296b0..e96808fd 100644 --- a/Resources/input/fsh/ISiKMedikament.fsh +++ b/Resources/input/fsh/ISiKMedikament.fsh @@ -122,6 +122,7 @@ Usage: #example * system = $cs-atc-de * code = #V03AB23 * display = "Acetylcystein" + * version = "2024" * status = #active Instance: ExampleISiKMedikament2 @@ -141,6 +142,7 @@ Usage: #example * itemCodeableConcept.coding * system = $cs-atc-de * code = #L01DB01 + * version = "2024" * display = "Doxorubicin" * isActive = true * strength @@ -217,6 +219,7 @@ Usage: #example * system = $cs-atc-de * code = #M02AA13 * display = "Ibuprofen" + * version = "2024" * isActive = true * strength * numerator @@ -234,6 +237,7 @@ Usage: #example * system = $cs-atc-de * code = #N02BE01 * display = "Paracetamol" + * version = "2024" * isActive = true * strength * numerator @@ -263,6 +267,7 @@ Usage: #example * system = $cs-atc-de * code = #N02BE01 * display = "Paracetamol" + * version = "2024" * isActive = true * strength * numerator @@ -302,6 +307,7 @@ Usage: #example * system = $cs-atc-de * code = #L01CD01 * display = "Paclitaxel" + * version = "2024" * isActive = true * strength * numerator @@ -319,6 +325,7 @@ Usage: #example * system = $cs-atc-de * code = #B05BA11 * display = "Glucose" + * version = "2024" * isActive = false * strength * numerator @@ -346,6 +353,7 @@ Usage: #example * system = $cs-atc-de * code = #L01CD01 * display = "Paclitaxel" + * version = "2024" * isActive = true * strength * numerator @@ -363,6 +371,7 @@ Usage: #example * system = $cs-atc-de * code = #B05BA11 * display = "Glucose" + * version = "2024" * isActive = false * strength * numerator diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh index 8326f3f7..61163281 100644 --- a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh @@ -161,7 +161,7 @@ Usage: #example * unit = "mL/h" * system = $cs-ucum * code = $cs-ucum#mL/h - * route = $cs-sct#255560000 "Intravenous" + * route = $cs-edqm#20045000 "Intravenous use" Instance: ExampleISiKMedikationsVerabreichung4 InstanceOf: ISiKMedikationsVerabreichung @@ -192,4 +192,4 @@ Usage: #example * unit = "h" * system = $cs-ucum * code = $cs-ucum#h - * route = $cs-sct#255560000 "Intravenous" + * route = $cs-edqm#20045000 "Intravenous use"