From bbd3173745625c523fae40103fdb6b65999e3903 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 13 Jun 2024 17:19:46 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20=C3=84nderungen=20aus=20den=20KBV=20Kom?= =?UTF-8?q?mentaren=20eingepflegt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ImplementationGuide/markdown/ReleaseNotes.md | 3 +- Resources/fsh-generated/fsh-index.json | 104 +++++++++--------- Resources/fsh-generated/fsh-index.txt | 56 +++++----- .../CodeSystem-ISiKMedikationsartCS.json | 2 +- .../StructureDefinition-ISiKMedikament.json | 69 ++++++------ ...Definition-ISiKMedikationsInformation.json | 22 ++++ ...finition-ISiKMedikationsVerabreichung.json | 19 ++++ ...eDefinition-ISiKMedikationsVerordnung.json | 19 ++++ ...tructureDefinition-MedicationQuantity.json | 1 + .../ValueSet-ISiKMedikationsartVS.json | 2 +- .../ValueSet-SctRouteOfAdministration.json | 2 +- .../ValueSet-UcumUndSctDoseFormVS.json | 2 +- Resources/input/fsh/ISiKMedikament.fsh | 15 +-- .../input/fsh/ISiKMedikationsInformation.fsh | 8 +- .../fsh/ISiKMedikationsVerabreichung.fsh | 5 +- .../input/fsh/ISiKMedikationsVerordnung.fsh | 5 +- 16 files changed, 202 insertions(+), 132 deletions(-) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index cf87d39..73d38ee 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -10,7 +10,8 @@ Version: 4.0.0-rc3 Datum: tbd. -- Entfernen von MS von .id der Ressourcen https://github.com/gematik/spec-ISiK-Medikation/pull/122 +* Entfernen von MS von .id der Ressourcen https://github.com/gematik/spec-ISiK-Medikation/pull/122 +* Entfernen der WG14 Kodierung, Hinzufügen eines SimpleQuantity Profiles welches ein VS bindet bestehend aus UCUM & SCT Unit of presentation um bspw. 500mg/Tablette maschinenlesbar kodieren zu können, hinzufügen eines SnomedCT Slices zur Kodierung der Medikationsressourcen, Update der Abhängigkeit auf IPS 1.1.0 --- **Release Candidate zur Kommentierung** diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 7f88198..3e66548 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -84,192 +84,192 @@ "fshName": "ExampleISiKMedikament1", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 99, - "endLine": 106 + "startLine": 96, + "endLine": 103 }, { "outputFile": "Medication-ExampleISiKMedikament2.json", "fshName": "ExampleISiKMedikament2", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 108, - "endLine": 140 + "startLine": 105, + "endLine": 137 }, { "outputFile": "Medication-ExampleISiKMedikament3.json", "fshName": "ExampleISiKMedikament3", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 142, - "endLine": 149 + "startLine": 139, + "endLine": 146 }, { "outputFile": "Medication-ExampleISiKMedikament4.json", "fshName": "ExampleISiKMedikament4", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 151, - "endLine": 189 + "startLine": 148, + "endLine": 186 }, { "outputFile": "Medication-ExampleISiKMedikament5.json", "fshName": "ExampleISiKMedikament5", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 191, - "endLine": 229 + "startLine": 188, + "endLine": 226 }, { "outputFile": "Medication-ExampleISiKMedikament6.json", "fshName": "ExampleISiKMedikament6", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 231, - "endLine": 235 + "startLine": 228, + "endLine": 232 }, { "outputFile": "Medication-ExampleISiKMedikament7.json", "fshName": "ExampleISiKMedikament7", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 237, - "endLine": 270 + "startLine": 234, + "endLine": 267 }, { "outputFile": "Medication-ExampleISiKMedikament8.json", "fshName": "ExampleISiKMedikament8", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 272, - "endLine": 314 + "startLine": 269, + "endLine": 311 }, { "outputFile": "Medication-ExampleISiKMedikament9.json", "fshName": "ExampleISiKMedikament9", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 316, - "endLine": 358 + "startLine": 313, + "endLine": 355 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung.json", "fshName": "ExampleISiKMedikationsVerabreichung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 93, - "endLine": 106 + "startLine": 96, + "endLine": 109 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json", "fshName": "ExampleISiKMedikationsVerabreichung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 108, - "endLine": 121 + "startLine": 111, + "endLine": 124 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung.json", "fshName": "ExampleISiKMedikationsVerordnung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 209, - "endLine": 232 + "startLine": 212, + "endLine": 235 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung2.json", "fshName": "ExampleISiKMedikationsVerordnung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 234, - "endLine": 257 + "startLine": 237, + "endLine": 260 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation1.json", "fshName": "ExampleISiKMedikationsInformation1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 220, - "endLine": 243 + "startLine": 224, + "endLine": 247 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation2.json", "fshName": "ExampleISiKMedikationsInformation2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 245, - "endLine": 265 + "startLine": 249, + "endLine": 269 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation3.json", "fshName": "ExampleISiKMedikationsInformation3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 267, - "endLine": 290 + "startLine": 271, + "endLine": 294 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation4.json", "fshName": "ExampleISiKMedikationsInformation4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 293, - "endLine": 312 + "startLine": 297, + "endLine": 316 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation5.json", "fshName": "ExampleISiKMedikationsInformation5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 315, - "endLine": 337 + "startLine": 319, + "endLine": 341 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation6.json", "fshName": "ExampleISiKMedikationsInformation6", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 340, - "endLine": 356 + "startLine": 344, + "endLine": 360 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json", "fshName": "ExampleISiKMedikationsInformationParkinson1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 359, - "endLine": 381 + "startLine": 363, + "endLine": 385 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json", "fshName": "ExampleISiKMedikationsInformationParkinson2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 384, - "endLine": 404 + "startLine": 388, + "endLine": 408 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json", "fshName": "ExampleISiKMedikationsInformationParkinson3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 407, - "endLine": 436 + "startLine": 411, + "endLine": 440 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json", "fshName": "ExampleISiKMedikationsInformationParkinson4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 439, - "endLine": 459 + "startLine": 443, + "endLine": 463 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json", "fshName": "ExampleISiKMedikationsInformationParkinson5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 462, - "endLine": 481 + "startLine": 466, + "endLine": 485 }, { "outputFile": "Patient-PatientinMusterfrau.json", @@ -349,7 +349,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikament.fsh", "startLine": 1, - "endLine": 92 + "endLine": 89 }, { "outputFile": "StructureDefinition-ISiKMedikationTransaction.json", @@ -373,7 +373,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsInformation.fsh", "startLine": 1, - "endLine": 218 + "endLine": 222 }, { "outputFile": "StructureDefinition-ISiKMedikationsListe.json", @@ -389,7 +389,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerabreichung.fsh", "startLine": 1, - "endLine": 91 + "endLine": 94 }, { "outputFile": "StructureDefinition-ISiKMedikationsVerordnung.json", @@ -397,7 +397,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerordnung.fsh", "startLine": 1, - "endLine": 207 + "endLine": 210 }, { "outputFile": "StructureDefinition-MedicationQuantity.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index 6b8e79b..20a8812 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -9,30 +9,30 @@ CodeSystem-ISiKMedikationsartCS.json ISiKMed Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance referencedExamples.fsh 53 - 87 List-ExampleISiKMedikationsListe.json ExampleISiKMedikationsListe Instance ISiKMedikationsListe.fsh 45 - 58 List-ExampleISiKMedikationsListeParkinson.json ExampleISiKMedikationsListeParkinson Instance ISiKMedikationsListe.fsh 60 - 82 -Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 99 - 106 -Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 108 - 140 -Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 142 - 149 -Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 151 - 189 -Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 191 - 229 -Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 231 - 235 -Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 237 - 270 -Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 272 - 314 -Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 316 - 358 -MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 93 - 106 -MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 108 - 121 -MedicationRequest-ExampleISiKMedikationsVerordnung.json ExampleISiKMedikationsVerordnung Instance ISiKMedikationsVerordnung.fsh 209 - 232 -MedicationRequest-ExampleISiKMedikationsVerordnung2.json ExampleISiKMedikationsVerordnung2 Instance ISiKMedikationsVerordnung.fsh 234 - 257 -MedicationStatement-ExampleISiKMedikationsInformation1.json ExampleISiKMedikationsInformation1 Instance ISiKMedikationsInformation.fsh 220 - 243 -MedicationStatement-ExampleISiKMedikationsInformation2.json ExampleISiKMedikationsInformation2 Instance ISiKMedikationsInformation.fsh 245 - 265 -MedicationStatement-ExampleISiKMedikationsInformation3.json ExampleISiKMedikationsInformation3 Instance ISiKMedikationsInformation.fsh 267 - 290 -MedicationStatement-ExampleISiKMedikationsInformation4.json ExampleISiKMedikationsInformation4 Instance ISiKMedikationsInformation.fsh 293 - 312 -MedicationStatement-ExampleISiKMedikationsInformation5.json ExampleISiKMedikationsInformation5 Instance ISiKMedikationsInformation.fsh 315 - 337 -MedicationStatement-ExampleISiKMedikationsInformation6.json ExampleISiKMedikationsInformation6 Instance ISiKMedikationsInformation.fsh 340 - 356 -MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json ExampleISiKMedikationsInformationParkinson1 Instance ISiKMedikationsInformation.fsh 359 - 381 -MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json ExampleISiKMedikationsInformationParkinson2 Instance ISiKMedikationsInformation.fsh 384 - 404 -MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json ExampleISiKMedikationsInformationParkinson3 Instance ISiKMedikationsInformation.fsh 407 - 436 -MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json ExampleISiKMedikationsInformationParkinson4 Instance ISiKMedikationsInformation.fsh 439 - 459 -MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json ExampleISiKMedikationsInformationParkinson5 Instance ISiKMedikationsInformation.fsh 462 - 481 +Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 96 - 103 +Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 105 - 137 +Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 139 - 146 +Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 148 - 186 +Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 188 - 226 +Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 228 - 232 +Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 234 - 267 +Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 269 - 311 +Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 313 - 355 +MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 96 - 109 +MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 111 - 124 +MedicationRequest-ExampleISiKMedikationsVerordnung.json ExampleISiKMedikationsVerordnung Instance ISiKMedikationsVerordnung.fsh 212 - 235 +MedicationRequest-ExampleISiKMedikationsVerordnung2.json ExampleISiKMedikationsVerordnung2 Instance ISiKMedikationsVerordnung.fsh 237 - 260 +MedicationStatement-ExampleISiKMedikationsInformation1.json ExampleISiKMedikationsInformation1 Instance ISiKMedikationsInformation.fsh 224 - 247 +MedicationStatement-ExampleISiKMedikationsInformation2.json ExampleISiKMedikationsInformation2 Instance ISiKMedikationsInformation.fsh 249 - 269 +MedicationStatement-ExampleISiKMedikationsInformation3.json ExampleISiKMedikationsInformation3 Instance ISiKMedikationsInformation.fsh 271 - 294 +MedicationStatement-ExampleISiKMedikationsInformation4.json ExampleISiKMedikationsInformation4 Instance ISiKMedikationsInformation.fsh 297 - 316 +MedicationStatement-ExampleISiKMedikationsInformation5.json ExampleISiKMedikationsInformation5 Instance ISiKMedikationsInformation.fsh 319 - 341 +MedicationStatement-ExampleISiKMedikationsInformation6.json ExampleISiKMedikationsInformation6 Instance ISiKMedikationsInformation.fsh 344 - 360 +MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json ExampleISiKMedikationsInformationParkinson1 Instance ISiKMedikationsInformation.fsh 363 - 385 +MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json ExampleISiKMedikationsInformationParkinson2 Instance ISiKMedikationsInformation.fsh 388 - 408 +MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json ExampleISiKMedikationsInformationParkinson3 Instance ISiKMedikationsInformation.fsh 411 - 440 +MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json ExampleISiKMedikationsInformationParkinson4 Instance ISiKMedikationsInformation.fsh 443 - 463 +MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json ExampleISiKMedikationsInformationParkinson5 Instance ISiKMedikationsInformation.fsh 466 - 485 Patient-PatientinMusterfrau.json PatientinMusterfrau Instance referencedExamples.fsh 1 - 51 RiskAssessment-ExampleISiKAMTSBewertung1.json ExampleISiKAMTSBewertung1 Instance ISiKAMTSBewertung.fsh 67 - 84 StructureDefinition-ExtensionISiKAcceptedRisk.json ExtensionISiKAcceptedRisk Extension ExtensionISiKAcceptedRisk.fsh 1 - 14 @@ -42,13 +42,13 @@ StructureDefinition-ExtensionISiKMedicationStatementReplaces.json Extensi StructureDefinition-ExtensionISiKMedikationsart.json ExtensionISiKMedikationsart Extension ExtensionISiKMedikationsart.fsh 1 - 15 StructureDefinition-ExtensionISiKSelbstmedikation.json ExtensionISiKSelbstmedikation Extension ExtensionISiKSelbstmedikation.fsh 1 - 10 StructureDefinition-ISiKAMTSBewertung.json ISiKAMTSBewertung Profile ISiKAMTSBewertung.fsh 1 - 64 -StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 92 +StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 89 StructureDefinition-ISiKMedikationTransaction.json ISiKMedikationTransaction Profile ISiKMedikationTransaction.fsh 1 - 25 StructureDefinition-ISiKMedikationTransactionResponse.json ISiKMedikationTransactionResponse Profile ISiKMedikationTransactionResponse.fsh 1 - 27 -StructureDefinition-ISiKMedikationsInformation.json ISiKMedikationsInformation Profile ISiKMedikationsInformation.fsh 1 - 218 +StructureDefinition-ISiKMedikationsInformation.json ISiKMedikationsInformation Profile ISiKMedikationsInformation.fsh 1 - 222 StructureDefinition-ISiKMedikationsListe.json ISiKMedikationsListe Profile ISiKMedikationsListe.fsh 1 - 43 -StructureDefinition-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 91 -StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 207 +StructureDefinition-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 94 +StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 210 StructureDefinition-MedicationQuantity.json MedicationQuantity Profile dataTypeProfiles.fsh 1 - 10 ValueSet-ISiKMedikationsartVS.json ISiKMedikationsart ValueSet valueSets.fsh 7 - 11 ValueSet-SctRouteOfAdministration.json SctRouteOfAdministration ValueSet valueSets.fsh 1 - 5 diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json index c96e808..0f7234b 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json @@ -5,6 +5,7 @@ "name": "ISiKMedikationsart", "id": "ISiKMedikationsartCS", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKMedikationsartCS", "concept": [ { @@ -18,7 +19,6 @@ ], "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "count": 2 } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json index 84e7255..6787d3c 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json @@ -56,56 +56,38 @@ "sliceName": "PZN", "min": 0, "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKPZNCoding" + ] + } + ], "patternCoding": { "system": "http://fhir.de/CodeSystem/ifa/pzn" }, "mustSupport": true }, - { - "id": "Medication.code.coding:PZN.system", - "path": "Medication.code.coding.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:PZN.code", - "path": "Medication.code.coding.code", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:PZN.display", - "path": "Medication.code.coding.display", - "mustSupport": true - }, { "id": "Medication.code.coding:ATC-DE", "path": "Medication.code.coding", "sliceName": "ATC-DE", "min": 0, "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKATCCoding" + ] + } + ], "patternCoding": { "system": "http://fhir.de/CodeSystem/bfarm/atc" }, "mustSupport": true }, - { - "id": "Medication.code.coding:ATC-DE.system", - "path": "Medication.code.coding.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:ATC-DE.code", - "path": "Medication.code.coding.code", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:ATC-DE.display", - "path": "Medication.code.coding.display", - "mustSupport": true - }, { "id": "Medication.code.coding:SCT", "path": "Medication.code.coding", @@ -351,6 +333,25 @@ }, "mustSupport": true }, + { + "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:SCT", + "path": "Medication.ingredient.item[x].coding", + "sliceName": "SCT", + "min": 0, + "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKSnomedCTCoding" + ] + } + ], + "patternCoding": { + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "Medication.ingredient.item[x]:itemCodeableConcept.text", "path": "Medication.ingredient.item[x].text", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json index 37611c3..5982b34 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json @@ -241,6 +241,28 @@ ] } ], + "patternCoding": { + "system": "http://fhir.de/CodeSystem/bfarm/atc" + }, + "mustSupport": true + }, + { + "id": "MedicationStatement.medication[x]:medicationCodeableConcept.coding:SCT", + "path": "MedicationStatement.medication[x].coding", + "sliceName": "SCT", + "min": 0, + "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKSnomedCTCoding" + ] + } + ], + "patternCoding": { + "system": "http://snomed.info/sct" + }, "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json index e4459cb..f189ecf 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json @@ -104,6 +104,25 @@ }, "mustSupport": true }, + { + "id": "MedicationAdministration.medication[x]:medicationCodeableConcept.coding:SCT", + "path": "MedicationAdministration.medication[x].coding", + "sliceName": "SCT", + "min": 0, + "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKSnomedCTCoding" + ] + } + ], + "patternCoding": { + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "MedicationAdministration.medication[x]:medicationReference", "path": "MedicationAdministration.medication[x]", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json index 04755f0..84a1b0b 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json @@ -228,6 +228,25 @@ }, "mustSupport": true }, + { + "id": "MedicationRequest.medication[x]:medicationCodeableConcept.coding:SCT", + "path": "MedicationRequest.medication[x].coding", + "sliceName": "SCT", + "min": 0, + "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKSnomedCTCoding" + ] + } + ], + "patternCoding": { + "system": "http://snomed.info/sct" + }, + "mustSupport": true + }, { "id": "MedicationRequest.medication[x]:medicationCodeableConcept.text", "path": "MedicationRequest.medication[x].text", diff --git a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json index df118ea..5f5b02f 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "MedicationQuantity", "url": "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity", + "version": "4.0.0-rc", "name": "MedicationQuantity", "title": "Medication Quantity", "status": "draft", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json index 2cac043..c653221 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json @@ -4,10 +4,10 @@ "name": "ISiKMedikationsart", "id": "ISiKMedikationsartVS", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/ISiKMedikationsartVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json index d8616b8..bbb0aa6 100644 --- a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json +++ b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json @@ -4,10 +4,10 @@ "name": "SctRouteOfAdministration", "id": "SctRouteOfAdministration", "description": "Enthaelt alle SNOMED CT Administrationsarten", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/SctRouteOfAdministration", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ diff --git a/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json b/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json index 4567ce3..042922f 100644 --- a/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json +++ b/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json @@ -5,10 +5,10 @@ "id": "UcumUndSctDoseFormVS", "title": "Ucum und SnomedCT Basic Dose Form ValueSet", "description": "ValueSet zur Abbildung von kodierten Dosierinformationen. Bestehend aus UCUM Codes & SnomedCT Unit of presentation", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/UcumUndSctDoseFormVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ diff --git a/Resources/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh index 088f632..657b5b1 100644 --- a/Resources/input/fsh/ISiKMedikament.fsh +++ b/Resources/input/fsh/ISiKMedikament.fsh @@ -14,16 +14,10 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen PZN 0..1 MS and ATC-DE 0..1 MS and SCT 0..1 MS - * coding[PZN] + * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn - * system 1..1 MS - * code 1..1 MS - * display MS - * coding[ATC-DE] + * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de - * system 1..1 MS - * code 1..1 MS - * display MS * coding[SCT] only ISiKSnomedCTCoding * ^patternCoding.system = $cs-sct * text MS @@ -65,13 +59,16 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen * coding contains ASK 0..1 MS and ATC-DE 0..1 MS and - PZN 0..1 MS + PZN 0..1 MS and + SCT 0..1 MS * coding[ASK] only ISiKASKCoding * ^patternCoding.system = $cs-ask * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn + * coding[SCT] only ISiKSnomedCTCoding + * ^patternCoding.system = $cs-sct * text MS * itemReference MS * reference 1..1 MS diff --git a/Resources/input/fsh/ISiKMedikationsInformation.fsh b/Resources/input/fsh/ISiKMedikationsInformation.fsh index edd8e65..af1afdc 100644 --- a/Resources/input/fsh/ISiKMedikationsInformation.fsh +++ b/Resources/input/fsh/ISiKMedikationsInformation.fsh @@ -47,11 +47,15 @@ Description: "Dieses Profil ermöglicht die Abbildung von Informationen zur Medi * ^slicing.discriminator.path = "$this" * ^slicing.rules = #open * coding contains - PZN 0..1 MS and - ATC-DE 0..1 MS + PZN 0..1 MS and + ATC-DE 0..1 MS and + SCT 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding + * ^patternCoding.system = $cs-atc-de + * coding[SCT] only ISiKSnomedCTCoding + * ^patternCoding.system = $cs-sct * text MS * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)" diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh index 640d24e..a10bf47 100644 --- a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh @@ -14,11 +14,14 @@ Description: "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medi * ^slicing.rules = #open * coding contains PZN 0..1 MS and - ATC-DE 0..1 MS + ATC-DE 0..1 MS and + SCT 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de + * coding[SCT] only ISiKSnomedCTCoding + * ^patternCoding.system = $cs-sct * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)" * ^comment = "wird verwendet, wenn detaillierte Informationen zum Medikament vorliegen" diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh index 7b0304d..2e04574 100644 --- a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh @@ -44,11 +44,14 @@ Description: "Dieses Profil ermöglicht die Abbildung von Medikationsverordnunge * ^slicing.rules = #open * coding contains PZN 0..1 MS and - ATC-DE 0..1 MS + ATC-DE 0..1 MS and + SCT 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de + * coding[SCT] only ISiKSnomedCTCoding + * ^patternCoding.system = $cs-sct * text MS * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)"