From 89f8e6f72331743a70f8691ded15e9576d096476 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Thu, 13 Jun 2024 12:52:37 +0200 Subject: [PATCH] applied changes from KBV Kommentierung --- Resources/fsh-generated/fsh-index.json | 194 ++++----- Resources/fsh-generated/fsh-index.txt | 78 ++-- ...ndle-ExampleISiKMedikationTransaction.json | 46 +- ...mpleISiKMedikationTransactionResponse.json | 46 +- .../CodeSystem-ISiKMedikationsartCS.json | 2 +- .../Medication-ExampleISiKMedikament2.json | 30 +- .../Medication-ExampleISiKMedikament4.json | 58 +-- .../Medication-ExampleISiKMedikament5.json | 58 +-- .../Medication-ExampleISiKMedikament7.json | 50 +-- .../Medication-ExampleISiKMedikament8.json | 70 +-- .../Medication-ExampleISiKMedikament9.json | 70 +-- ...n-ExampleISiKMedikationsVerabreichung.json | 18 +- ...-ExampleISiKMedikationsVerabreichung2.json | 18 +- ...uest-ExampleISiKMedikationsVerordnung.json | 46 +- ...est-ExampleISiKMedikationsVerordnung2.json | 50 +-- ...nt-ExampleISiKMedikationsInformation1.json | 46 +- ...nt-ExampleISiKMedikationsInformation2.json | 46 +- ...nt-ExampleISiKMedikationsInformation3.json | 50 +-- ...nt-ExampleISiKMedikationsInformation4.json | 46 +- ...nt-ExampleISiKMedikationsInformation5.json | 52 +-- ...eISiKMedikationsInformationParkinson1.json | 42 +- ...eISiKMedikationsInformationParkinson2.json | 42 +- ...eISiKMedikationsInformationParkinson3.json | 42 +- ...eISiKMedikationsInformationParkinson4.json | 42 +- ...eISiKMedikationsInformationParkinson5.json | 42 +- .../StructureDefinition-ISiKMedikament.json | 186 ++------ ...Definition-ISiKMedikationsInformation.json | 382 ++++------------ ...finition-ISiKMedikationsVerabreichung.json | 152 ++----- ...eDefinition-ISiKMedikationsVerordnung.json | 411 ++++-------------- ...tructureDefinition-MedicationQuantity.json | 47 ++ .../ValueSet-ISiKMedikationsartVS.json | 2 +- .../ValueSet-SctRouteOfAdministration.json | 2 +- .../ValueSet-UcumUndSctDoseFormVS.json | 30 ++ Resources/input/fsh/ISiKMedikament.fsh | 74 ++-- .../input/fsh/ISiKMedikationsInformation.fsh | 76 +--- .../fsh/ISiKMedikationsVerabreichung.fsh | 46 +- .../input/fsh/ISiKMedikationsVerordnung.fsh | 89 +--- Resources/input/fsh/aliases.fsh | 1 - Resources/input/fsh/dataTypeProfiles.fsh | 10 + Resources/input/fsh/valueSets.fsh | 8 + Resources/sushi-config.yaml | 1 + package.json | 2 +- 42 files changed, 1012 insertions(+), 1791 deletions(-) create mode 100644 Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json create mode 100644 Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json create mode 100644 Resources/input/fsh/dataTypeProfiles.fsh diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 70bc44c..7f88198 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -68,208 +68,208 @@ "fshName": "ExampleISiKMedikationsListe", "fshType": "Instance", "fshFile": "ISiKMedikationsListe.fsh", - "startLine": 47, - "endLine": 60 + "startLine": 45, + "endLine": 58 }, { "outputFile": "List-ExampleISiKMedikationsListeParkinson.json", "fshName": "ExampleISiKMedikationsListeParkinson", "fshType": "Instance", "fshFile": "ISiKMedikationsListe.fsh", - "startLine": 62, - "endLine": 84 + "startLine": 60, + "endLine": 82 }, { "outputFile": "Medication-ExampleISiKMedikament1.json", "fshName": "ExampleISiKMedikament1", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 123, - "endLine": 130 + "startLine": 99, + "endLine": 106 }, { "outputFile": "Medication-ExampleISiKMedikament2.json", "fshName": "ExampleISiKMedikament2", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 132, - "endLine": 164 + "startLine": 108, + "endLine": 140 }, { "outputFile": "Medication-ExampleISiKMedikament3.json", "fshName": "ExampleISiKMedikament3", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 166, - "endLine": 173 + "startLine": 142, + "endLine": 149 }, { "outputFile": "Medication-ExampleISiKMedikament4.json", "fshName": "ExampleISiKMedikament4", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 175, - "endLine": 211 + "startLine": 151, + "endLine": 189 }, { "outputFile": "Medication-ExampleISiKMedikament5.json", "fshName": "ExampleISiKMedikament5", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 213, - "endLine": 251 + "startLine": 191, + "endLine": 229 }, { "outputFile": "Medication-ExampleISiKMedikament6.json", "fshName": "ExampleISiKMedikament6", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 253, - "endLine": 257 + "startLine": 231, + "endLine": 235 }, { "outputFile": "Medication-ExampleISiKMedikament7.json", "fshName": "ExampleISiKMedikament7", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 259, - "endLine": 292 + "startLine": 237, + "endLine": 270 }, { "outputFile": "Medication-ExampleISiKMedikament8.json", "fshName": "ExampleISiKMedikament8", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 294, - "endLine": 336 + "startLine": 272, + "endLine": 314 }, { "outputFile": "Medication-ExampleISiKMedikament9.json", "fshName": "ExampleISiKMedikament9", "fshType": "Instance", "fshFile": "ISiKMedikament.fsh", - "startLine": 338, - "endLine": 380 + "startLine": 316, + "endLine": 358 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung.json", "fshName": "ExampleISiKMedikationsVerabreichung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 115, - "endLine": 128 + "startLine": 93, + "endLine": 106 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json", "fshName": "ExampleISiKMedikationsVerabreichung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 130, - "endLine": 143 + "startLine": 108, + "endLine": 121 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung.json", "fshName": "ExampleISiKMedikationsVerordnung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 262, - "endLine": 285 + "startLine": 209, + "endLine": 232 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung2.json", "fshName": "ExampleISiKMedikationsVerordnung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 287, - "endLine": 310 + "startLine": 234, + "endLine": 257 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation1.json", "fshName": "ExampleISiKMedikationsInformation1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 270, - "endLine": 293 + "startLine": 220, + "endLine": 243 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation2.json", "fshName": "ExampleISiKMedikationsInformation2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 295, - "endLine": 315 + "startLine": 245, + "endLine": 265 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation3.json", "fshName": "ExampleISiKMedikationsInformation3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 317, - "endLine": 340 + "startLine": 267, + "endLine": 290 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation4.json", "fshName": "ExampleISiKMedikationsInformation4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 343, - "endLine": 362 + "startLine": 293, + "endLine": 312 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation5.json", "fshName": "ExampleISiKMedikationsInformation5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 365, - "endLine": 387 + "startLine": 315, + "endLine": 337 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation6.json", "fshName": "ExampleISiKMedikationsInformation6", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 390, - "endLine": 406 + "startLine": 340, + "endLine": 356 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json", "fshName": "ExampleISiKMedikationsInformationParkinson1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 409, - "endLine": 431 + "startLine": 359, + "endLine": 381 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json", "fshName": "ExampleISiKMedikationsInformationParkinson2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 434, - "endLine": 454 + "startLine": 384, + "endLine": 404 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json", "fshName": "ExampleISiKMedikationsInformationParkinson3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 457, - "endLine": 486 + "startLine": 407, + "endLine": 436 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json", "fshName": "ExampleISiKMedikationsInformationParkinson4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 489, - "endLine": 509 + "startLine": 439, + "endLine": 459 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json", "fshName": "ExampleISiKMedikationsInformationParkinson5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 512, - "endLine": 531 + "startLine": 462, + "endLine": 481 }, { "outputFile": "Patient-PatientinMusterfrau.json", @@ -284,8 +284,8 @@ "fshName": "ExampleISiKAMTSBewertung1", "fshType": "Instance", "fshFile": "ISiKAMTSBewertung.fsh", - "startLine": 69, - "endLine": 86 + "startLine": 67, + "endLine": 84 }, { "outputFile": "StructureDefinition-ExtensionISiKAcceptedRisk.json", @@ -341,47 +341,7 @@ "fshType": "Profile", "fshFile": "ISiKAMTSBewertung.fsh", "startLine": 1, - "endLine": 66 - }, - { - "outputFile": "StructureDefinition-ISiKASKCoding.json", - "fshName": "ISiKASKCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 50, - "endLine": 57 - }, - { - "outputFile": "StructureDefinition-ISiKATCCoding.json", - "fshName": "ISiKATCCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 59, - "endLine": 66 - }, - { - "outputFile": "StructureDefinition-ISiKCoding.json", - "fshName": "ISiKCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 4, - "endLine": 11 - }, - { - "outputFile": "StructureDefinition-ISiKICD10GMCoding.json", - "fshName": "ISiKICD10GMCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 40, - "endLine": 48 - }, - { - "outputFile": "StructureDefinition-ISiKLoincCoding.json", - "fshName": "ISiKLoincCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 21, - "endLine": 27 + "endLine": 64 }, { "outputFile": "StructureDefinition-ISiKMedikament.json", @@ -389,7 +349,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikament.fsh", "startLine": 1, - "endLine": 116 + "endLine": 92 }, { "outputFile": "StructureDefinition-ISiKMedikationTransaction.json", @@ -413,7 +373,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsInformation.fsh", "startLine": 1, - "endLine": 268 + "endLine": 218 }, { "outputFile": "StructureDefinition-ISiKMedikationsListe.json", @@ -421,7 +381,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsListe.fsh", "startLine": 1, - "endLine": 45 + "endLine": 43 }, { "outputFile": "StructureDefinition-ISiKMedikationsVerabreichung.json", @@ -429,7 +389,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerabreichung.fsh", "startLine": 1, - "endLine": 113 + "endLine": 91 }, { "outputFile": "StructureDefinition-ISiKMedikationsVerordnung.json", @@ -437,31 +397,15 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerordnung.fsh", "startLine": 1, - "endLine": 260 - }, - { - "outputFile": "StructureDefinition-ISiKPZNCoding.json", - "fshName": "ISiKPZNCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 68, - "endLine": 75 - }, - { - "outputFile": "StructureDefinition-ISiKSnomedCTCoding.json", - "fshName": "ISiKSnomedCTCoding", - "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 13, - "endLine": 19 + "endLine": 207 }, { - "outputFile": "StructureDefinition-ISiKWG14Coding.json", - "fshName": "ISiKWG14Coding", + "outputFile": "StructureDefinition-MedicationQuantity.json", + "fshName": "MedicationQuantity", "fshType": "Profile", - "fshFile": "ISiKDataTypeProfiles.fsh", - "startLine": 29, - "endLine": 34 + "fshFile": "dataTypeProfiles.fsh", + "startLine": 1, + "endLine": 10 }, { "outputFile": "ValueSet-ISiKMedikationsartVS.json", @@ -478,5 +422,13 @@ "fshFile": "valueSets.fsh", "startLine": 1, "endLine": 5 + }, + { + "outputFile": "ValueSet-UcumUndSctDoseFormVS.json", + "fshName": "UcumUndSctDoseFormVS", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 13, + "endLine": 19 } ] diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index a22f881..6b8e79b 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -7,55 +7,49 @@ CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json ISiKCap CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json ISiKCapabilityStatementMedikationVerordnung Instance ISiKCapabilityStatementMedikationVerordnung.fsh 1 - 425 CodeSystem-ISiKMedikationsartCS.json ISiKMedikationsart CodeSystem codeSystems.fsh 1 - 6 Encounter-Fachabteilungskontakt.json Fachabteilungskontakt Instance referencedExamples.fsh 53 - 87 -List-ExampleISiKMedikationsListe.json ExampleISiKMedikationsListe Instance ISiKMedikationsListe.fsh 47 - 60 -List-ExampleISiKMedikationsListeParkinson.json ExampleISiKMedikationsListeParkinson Instance ISiKMedikationsListe.fsh 62 - 84 -Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 123 - 130 -Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 132 - 164 -Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 166 - 173 -Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 175 - 211 -Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 213 - 251 -Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 253 - 257 -Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 259 - 292 -Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 294 - 336 -Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 338 - 380 -MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 115 - 128 -MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 130 - 143 -MedicationRequest-ExampleISiKMedikationsVerordnung.json ExampleISiKMedikationsVerordnung Instance ISiKMedikationsVerordnung.fsh 262 - 285 -MedicationRequest-ExampleISiKMedikationsVerordnung2.json ExampleISiKMedikationsVerordnung2 Instance ISiKMedikationsVerordnung.fsh 287 - 310 -MedicationStatement-ExampleISiKMedikationsInformation1.json ExampleISiKMedikationsInformation1 Instance ISiKMedikationsInformation.fsh 270 - 293 -MedicationStatement-ExampleISiKMedikationsInformation2.json ExampleISiKMedikationsInformation2 Instance ISiKMedikationsInformation.fsh 295 - 315 -MedicationStatement-ExampleISiKMedikationsInformation3.json ExampleISiKMedikationsInformation3 Instance ISiKMedikationsInformation.fsh 317 - 340 -MedicationStatement-ExampleISiKMedikationsInformation4.json ExampleISiKMedikationsInformation4 Instance ISiKMedikationsInformation.fsh 343 - 362 -MedicationStatement-ExampleISiKMedikationsInformation5.json ExampleISiKMedikationsInformation5 Instance ISiKMedikationsInformation.fsh 365 - 387 -MedicationStatement-ExampleISiKMedikationsInformation6.json ExampleISiKMedikationsInformation6 Instance ISiKMedikationsInformation.fsh 390 - 406 -MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json ExampleISiKMedikationsInformationParkinson1 Instance ISiKMedikationsInformation.fsh 409 - 431 -MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json ExampleISiKMedikationsInformationParkinson2 Instance ISiKMedikationsInformation.fsh 434 - 454 -MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json ExampleISiKMedikationsInformationParkinson3 Instance ISiKMedikationsInformation.fsh 457 - 486 -MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json ExampleISiKMedikationsInformationParkinson4 Instance ISiKMedikationsInformation.fsh 489 - 509 -MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json ExampleISiKMedikationsInformationParkinson5 Instance ISiKMedikationsInformation.fsh 512 - 531 +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 Patient-PatientinMusterfrau.json PatientinMusterfrau Instance referencedExamples.fsh 1 - 51 -RiskAssessment-ExampleISiKAMTSBewertung1.json ExampleISiKAMTSBewertung1 Instance ISiKAMTSBewertung.fsh 69 - 86 +RiskAssessment-ExampleISiKAMTSBewertung1.json ExampleISiKAMTSBewertung1 Instance ISiKAMTSBewertung.fsh 67 - 84 StructureDefinition-ExtensionISiKAcceptedRisk.json ExtensionISiKAcceptedRisk Extension ExtensionISiKAcceptedRisk.fsh 1 - 14 StructureDefinition-ExtensionISiKBehandlungsziel.json ExtensionISiKBehandlungsziel Extension ExtensionISiKBehandlungsziel.fsh 1 - 12 StructureDefinition-ExtensionISiKMedicationRequestReplaces.json ExtensionISiKMedicationRequestReplaces Extension ExtensionISiKMedicationRequestReplaces.fsh 1 - 12 StructureDefinition-ExtensionISiKMedicationStatementReplaces.json ExtensionISiKMedicationStatementReplaces Extension ExtensionISiKMedicationStatementReplaces.fsh 1 - 12 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 - 66 -StructureDefinition-ISiKASKCoding.json ISiKASKCoding Profile ISiKDataTypeProfiles.fsh 50 - 57 -StructureDefinition-ISiKATCCoding.json ISiKATCCoding Profile ISiKDataTypeProfiles.fsh 59 - 66 -StructureDefinition-ISiKCoding.json ISiKCoding Profile ISiKDataTypeProfiles.fsh 4 - 11 -StructureDefinition-ISiKICD10GMCoding.json ISiKICD10GMCoding Profile ISiKDataTypeProfiles.fsh 40 - 48 -StructureDefinition-ISiKLoincCoding.json ISiKLoincCoding Profile ISiKDataTypeProfiles.fsh 21 - 27 -StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 116 +StructureDefinition-ISiKAMTSBewertung.json ISiKAMTSBewertung Profile ISiKAMTSBewertung.fsh 1 - 64 +StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 92 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 - 268 -StructureDefinition-ISiKMedikationsListe.json ISiKMedikationsListe Profile ISiKMedikationsListe.fsh 1 - 45 -StructureDefinition-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 113 -StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 260 -StructureDefinition-ISiKPZNCoding.json ISiKPZNCoding Profile ISiKDataTypeProfiles.fsh 68 - 75 -StructureDefinition-ISiKSnomedCTCoding.json ISiKSnomedCTCoding Profile ISiKDataTypeProfiles.fsh 13 - 19 -StructureDefinition-ISiKWG14Coding.json ISiKWG14Coding Profile ISiKDataTypeProfiles.fsh 29 - 34 +StructureDefinition-ISiKMedikationsInformation.json ISiKMedikationsInformation Profile ISiKMedikationsInformation.fsh 1 - 218 +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-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 \ No newline at end of file +ValueSet-SctRouteOfAdministration.json SctRouteOfAdministration ValueSet valueSets.fsh 1 - 5 +ValueSet-UcumUndSctDoseFormVS.json UcumUndSctDoseFormVS ValueSet valueSets.fsh 13 - 19 \ 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 3341945..82dde09 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json @@ -39,29 +39,6 @@ "valueString": "Schmerztherapie postoperativ" } ], - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Brausetablette", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "when": [ - "MORN", - "NOON", - "EVE" - ] - } - } - } - ], "status": "active", "medicationReference": { "reference": "Medication/ExampleISiKMedikament1" @@ -80,6 +57,29 @@ { "reference": "Condition/BehandlungsDiagnoseFreitext" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "when": [ + "MORN", + "NOON", + "EVE" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Brausetablette", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] }, "request": { diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json index 33223c5..6a068f3 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json @@ -39,29 +39,6 @@ "valueString": "Schmerztherapie postoperativ" } ], - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Brausetablette", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "when": [ - "MORN", - "NOON", - "EVE" - ] - } - } - } - ], "status": "active", "medicationReference": { "reference": "Medication/ExampleISiKMedikament1" @@ -80,6 +57,29 @@ { "reference": "Condition/BehandlungsDiagnoseFreitext" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "when": [ + "MORN", + "NOON", + "EVE" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Brausetablette", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] }, "response": { 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/Medication-ExampleISiKMedikament2.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json index 7f06fdc..f24ec0c 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json @@ -8,20 +8,6 @@ }, "ingredient": [ { - "strength": { - "numerator": { - "system": "http://unitsofmeasure.org", - "value": 85, - "unit": "mg", - "code": "mg" - }, - "denominator": { - "system": "http://unitsofmeasure.org", - "value": 250, - "unit": "Milliliter", - "code": "mL" - } - }, "extension": [ { "url": "http://fhir.de/StructureDefinition/WirkstofftypEX", @@ -40,7 +26,21 @@ } ] }, - "isActive": true + "isActive": true, + "strength": { + "numerator": { + "value": 85, + "unit": "mg", + "system": "http://unitsofmeasure.org", + "code": "mg" + }, + "denominator": { + "value": 250, + "unit": "Milliliter", + "system": "http://unitsofmeasure.org", + "code": "mL" + } + } }, { "itemReference": { diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json index 20e8bad..fec7123 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json @@ -6,21 +6,12 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, + "status": "active", + "form": { + "text": "Tabletten" + }, "ingredient": [ { - "strength": { - "numerator": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "St.", - "code": "1" - }, - "denominator": { - "system": "http://unitsofmeasure.org", - "value": 1, - "code": "1" - } - }, "itemCodeableConcept": { "coding": [ { @@ -30,22 +21,23 @@ } ] }, - "isActive": true - }, - { + "isActive": true, "strength": { "numerator": { + "value": 400, + "unit": "mg", "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "St.", - "code": "1" + "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", + "unit": "Tablette", "value": 1, - "code": "1" + "system": "http://snomed.info/sct", + "code": "732936001" } - }, + } + }, + { "itemCodeableConcept": { "coding": [ { @@ -55,11 +47,21 @@ } ] }, - "isActive": true + "isActive": true, + "strength": { + "numerator": { + "value": 500, + "unit": "mg", + "system": "http://unitsofmeasure.org", + "code": "mg" + }, + "denominator": { + "unit": "Tablette", + "value": 1, + "system": "http://snomed.info/sct", + "code": "732936001" + } + } } - ], - "status": "active", - "form": { - "text": "Tabletten" - } + ] } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json index 9740b59..3f5f51a 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json @@ -6,22 +6,12 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, + "status": "active", + "form": { + "text": "Tabletten" + }, "ingredient": [ { - "strength": { - "numerator": { - "system": "http://unitsofmeasure.org", - "value": 400, - "unit": "mg", - "code": "mg" - }, - "denominator": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "St.", - "code": "1" - } - }, "itemCodeableConcept": { "coding": [ { @@ -31,23 +21,23 @@ } ] }, - "isActive": true - }, - { + "isActive": true, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", - "value": 500, + "value": 400, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", + "unit": "Tablette", "value": 1, - "unit": "St.", - "code": "1" + "system": "http://snomed.info/sct", + "code": "732936001" } - }, + } + }, + { "itemCodeableConcept": { "coding": [ { @@ -57,11 +47,21 @@ } ] }, - "isActive": true + "isActive": true, + "strength": { + "numerator": { + "value": 500, + "unit": "mg", + "system": "http://unitsofmeasure.org", + "code": "mg" + }, + "denominator": { + "unit": "Tablette", + "value": 1, + "system": "http://snomed.info/sct", + "code": "732936001" + } + } } - ], - "status": "active", - "form": { - "text": "Tabletten" - } + ] } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json index 4cb6fa4..7cd8c80 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json @@ -6,54 +6,54 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, + "code": { + "text": "Paracetamol gelöst in Wasser" + }, + "status": "active", "ingredient": [ { + "itemCodeableConcept": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/bfarm/atc", + "code": "N02BE01", + "display": "Paracetamol" + } + ] + }, + "isActive": true, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 500, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 1, + "system": "http://unitsofmeasure.org", "code": "1" } - }, - "itemCodeableConcept": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "N02BE01", - "display": "Paracetamol" - } - ] - }, - "isActive": true + } }, { + "itemCodeableConcept": { + "text": "Wasser" + }, + "isActive": false, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 1, "unit": "Esslöffel", + "system": "http://unitsofmeasure.org", "code": "1" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 1, + "system": "http://unitsofmeasure.org", "code": "1" } - }, - "itemCodeableConcept": { - "text": "Wasser" - }, - "isActive": false + } } - ], - "code": { - "text": "Paracetamol gelöst in Wasser" - }, - "status": "active" + ] } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json index d712e02..714dedd 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament8.json @@ -6,71 +6,71 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, + "code": { + "text": "Infusion bestehend aus 80 mg/m² KOF Paclitaxel aufgelöst zur Verabreichung in 5-%iger (50 mg/ml) Glucose-Infusionslösung" + }, + "status": "active", + "form": { + "coding": [ + { + "system": "http://standardterms.edqm.eu", + "code": "11210000", + "display": "Solution for infusion" + } + ] + }, "ingredient": [ { + "itemCodeableConcept": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/bfarm/atc", + "code": "L01CD01", + "display": "Paclitaxel" + } + ] + }, + "isActive": true, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 80, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 1, "unit": "m² KOF", + "system": "http://unitsofmeasure.org", "code": "m2" } - }, + } + }, + { "itemCodeableConcept": { "coding": [ { "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "L01CD01", - "display": "Paclitaxel" + "code": "B05BA11", + "display": "Glucose" } ] }, - "isActive": true - }, - { + "isActive": false, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 50, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 1, "unit": "Milliliter", + "system": "http://unitsofmeasure.org", "code": "mL" } - }, - "itemCodeableConcept": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "B05BA11", - "display": "Glucose" - } - ] - }, - "isActive": false - } - ], - "code": { - "text": "Infusion bestehend aus 80 mg/m² KOF Paclitaxel aufgelöst zur Verabreichung in 5-%iger (50 mg/ml) Glucose-Infusionslösung" - }, - "status": "active", - "form": { - "coding": [ - { - "system": "http://standardterms.edqm.eu", - "code": "11210000", - "display": "Solution for infusion" } - ] - } + } + ] } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json index e653b87..f89de7b 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament9.json @@ -6,71 +6,71 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, + "code": { + "text": "Infusion bestehend aus 142 mg Paclitaxel aufgelöst zur Verabreichung in 500 ml 5-%iger (50 mg/ml) Glucose-Infusionslösung" + }, + "status": "active", + "form": { + "coding": [ + { + "system": "http://standardterms.edqm.eu", + "code": "11210000", + "display": "Solution for infusion" + } + ] + }, "ingredient": [ { + "itemCodeableConcept": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/bfarm/atc", + "code": "L01CD01", + "display": "Paclitaxel" + } + ] + }, + "isActive": true, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 142, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 500, "unit": "Milliliter", + "system": "http://unitsofmeasure.org", "code": "mL" } - }, + } + }, + { "itemCodeableConcept": { "coding": [ { "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "L01CD01", - "display": "Paclitaxel" + "code": "B05BA11", + "display": "Glucose" } ] }, - "isActive": true - }, - { + "isActive": false, "strength": { "numerator": { - "system": "http://unitsofmeasure.org", "value": 50, "unit": "mg", + "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { - "system": "http://unitsofmeasure.org", "value": 1, "unit": "Milliliter", + "system": "http://unitsofmeasure.org", "code": "mL" } - }, - "itemCodeableConcept": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "B05BA11", - "display": "Glucose" - } - ] - }, - "isActive": false - } - ], - "code": { - "text": "Infusion bestehend aus 142 mg Paclitaxel aufgelöst zur Verabreichung in 500 ml 5-%iger (50 mg/ml) Glucose-Infusionslösung" - }, - "status": "active", - "form": { - "coding": [ - { - "system": "http://standardterms.edqm.eu", - "code": "11210000", - "display": "Solution for infusion" } - ] - } + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json index 15efa3d..369b753 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json @@ -6,14 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsVerabreichung" ] }, - "dosage": { - "dose": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Brausetablette", - "code": "1" - } - }, "status": "completed", "medicationReference": { "reference": "Medication/ExampleISiKMedikament1" @@ -24,5 +16,13 @@ "context": { "reference": "Encounter/Fachabteilungskontakt" }, - "effectiveDateTime": "2021-07-01" + "effectiveDateTime": "2021-07-01", + "dosage": { + "dose": { + "value": 1, + "unit": "Tablette", + "system": "http://snomed.info/sct", + "code": "732936001" + } + } } diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json index 600df1a..c118638 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json @@ -6,14 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsVerabreichung" ] }, - "dosage": { - "dose": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Infusionsbeutel", - "code": "1" - } - }, "status": "completed", "medicationReference": { "reference": "Medication/ExampleISiKMedikament9" @@ -24,5 +16,13 @@ "context": { "reference": "Encounter/Fachabteilungskontakt" }, - "effectiveDateTime": "2024-01-22" + "effectiveDateTime": "2024-01-22", + "dosage": { + "dose": { + "value": 1, + "unit": "Beutel", + "system": "http://snomed.info/sct", + "code": "733013000" + } + } } diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json index 96efbca..e03f0ad 100644 --- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json @@ -23,29 +23,6 @@ "valueString": "Schmerztherapie postoperativ" } ], - "dosageInstruction": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Brausetablette", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "when": [ - "MORN", - "NOON", - "EVE" - ] - } - } - } - ], "status": "active", "intent": "order", "medicationReference": { @@ -65,5 +42,28 @@ { "reference": "Condition/BehandlungsDiagnoseFreitext" } + ], + "dosageInstruction": [ + { + "timing": { + "repeat": { + "when": [ + "MORN", + "NOON", + "EVE" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Brausetablette", + "system": "http://snomed.info/sct", + "code": "732936001" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json index 273d7d4..e4ffdc5 100644 --- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json +++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json @@ -14,30 +14,6 @@ } } ], - "dosageInstruction": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 500, - "unit": "ml Infusionslösung", - "code": "mL" - } - } - ], - "timing": { - "repeat": { - "count": 6, - "frequency": 1, - "duration": 6, - "durationUnit": "wk", - "period": 1, - "periodUnit": "wk" - } - } - } - ], "status": "active", "intent": "order", "medicationReference": { @@ -52,5 +28,29 @@ "authoredOn": "2024-01-17", "requester": { "reference": "Practitioner/PractitionerWalterArzt" - } + }, + "dosageInstruction": [ + { + "timing": { + "repeat": { + "count": 6, + "frequency": 1, + "duration": 6, + "durationUnit": "wk", + "period": 1, + "periodUnit": "wk" + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 500, + "unit": "ml Infusionslösung", + "system": "http://unitsofmeasure.org", + "code": "mL" + } + } + ] + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json index 2a1f86b..1c64e37 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json @@ -27,29 +27,6 @@ "valueString": "Schmerztherapie postoperativ" } ], - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Brausetablette", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "when": [ - "MORN", - "NOON", - "EVE" - ] - } - } - } - ], "status": "active", "medicationReference": { "reference": "Medication/ExampleISiKMedikament1" @@ -68,5 +45,28 @@ { "reference": "Condition/BehandlungsDiagnoseFreitext" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "when": [ + "MORN", + "NOON", + "EVE" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Brausetablette", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json index a4c267f..e6559b3 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json @@ -14,28 +14,6 @@ } } ], - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 100, - "unit": "mg", - "code": "mg" - } - } - ], - "timing": { - "repeat": { - "count": 6, - "frequency": 1, - "period": 3, - "periodUnit": "wk" - } - } - } - ], "status": "active", "medicationReference": { "reference": "Medication/ExampleISiKMedikament2" @@ -49,5 +27,27 @@ "effectivePeriod": { "start": "2021-07-04" }, - "dateAsserted": "2021-07-03" + "dateAsserted": "2021-07-03", + "dosage": [ + { + "timing": { + "repeat": { + "count": 6, + "frequency": 1, + "period": 3, + "periodUnit": "wk" + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 100, + "unit": "mg", + "system": "http://unitsofmeasure.org", + "code": "mg" + } + } + ] + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json index 4c60567..01d6385 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json @@ -6,30 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 500, - "unit": "ml Infusionslösung", - "code": "mL" - } - } - ], - "timing": { - "repeat": { - "count": 6, - "frequency": 1, - "duration": 6, - "durationUnit": "wk", - "period": 1, - "periodUnit": "wk" - } - } - } - ], "status": "active", "medicationReference": { "reference": "Medication/ExampleISiKMedikament8" @@ -44,5 +20,29 @@ "start": "2024-01-22", "end": "2024-02-26" }, - "dateAsserted": "2024-01-17" + "dateAsserted": "2024-01-17", + "dosage": [ + { + "timing": { + "repeat": { + "count": 6, + "frequency": 1, + "duration": 6, + "durationUnit": "wk", + "period": 1, + "periodUnit": "wk" + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 500, + "unit": "ml Infusionslösung", + "system": "http://unitsofmeasure.org", + "code": "mL" + } + } + ] + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json index e3c6efa..ae04d1d 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json @@ -6,28 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tabl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "when": [ - "C" - ] - } - }, - "patientInstruction": "auch zu Zwischenmahlzeiten" - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -47,5 +25,27 @@ "effectivePeriod": { "start": "2024-01-22" }, - "dateAsserted": "2024-02-16" + "dateAsserted": "2024-02-16", + "dosage": [ + { + "timing": { + "repeat": { + "when": [ + "C" + ] + } + }, + "patientInstruction": "auch zu Zwischenmahlzeiten", + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tabl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json index 13fce6d..2bf540b 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json @@ -6,31 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tabl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "frequency": 1, - "period": 3, - "periodUnit": "mo", - "dayOfWeek": [ - "tue" - ] - } - }, - "patientInstruction": "alle 3 Monate am 1. Dienstag" - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -50,5 +25,30 @@ "effectivePeriod": { "start": "2024-02-06" }, - "dateAsserted": "2024-01-31" + "dateAsserted": "2024-01-31", + "dosage": [ + { + "timing": { + "repeat": { + "frequency": 1, + "period": 3, + "periodUnit": "mo", + "dayOfWeek": [ + "tue" + ] + } + }, + "patientInstruction": "alle 3 Monate am 1. Dienstag", + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tabl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } + ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json index c4d53e4..e875441 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json @@ -6,27 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tbl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "timeOfDay": [ - "18:00:00" - ] - } - } - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -51,5 +30,26 @@ { "reference": "Condition/DiagnoseParkinson" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "timeOfDay": [ + "18:00:00" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tbl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json index 91235d3..8088e38 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json @@ -6,27 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tbl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "timeOfDay": [ - "22:00:00" - ] - } - } - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -51,5 +30,26 @@ { "reference": "Condition/DiagnoseParkinson" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "timeOfDay": [ + "22:00:00" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tbl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json index e7d2560..dca3223 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json @@ -6,27 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "FTbl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "timeOfDay": [ - "18:00:00" - ] - } - } - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -51,5 +30,26 @@ { "reference": "Condition/DiagnoseParkinson" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "timeOfDay": [ + "18:00:00" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "FTbl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json index b44c8aa..c733adb 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json @@ -6,27 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tbl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "timeOfDay": [ - "22:00:00" - ] - } - } - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -51,5 +30,26 @@ { "reference": "Condition/DiagnoseParkinson" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "timeOfDay": [ + "22:00:00" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tbl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json index c371693..c427ab6 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json @@ -6,27 +6,6 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsInformation" ] }, - "dosage": [ - { - "doseAndRate": [ - { - "doseQuantity": { - "system": "http://unitsofmeasure.org", - "value": 1, - "unit": "Tbl.", - "code": "1" - } - } - ], - "timing": { - "repeat": { - "timeOfDay": [ - "22:00:00" - ] - } - } - } - ], "status": "active", "medicationCodeableConcept": { "coding": [ @@ -51,5 +30,26 @@ { "reference": "Condition/DiagnoseParkinson" } + ], + "dosage": [ + { + "timing": { + "repeat": { + "timeOfDay": [ + "22:00:00" + ] + } + }, + "doseAndRate": [ + { + "doseQuantity": { + "value": 1, + "unit": "Tbl.", + "system": "http://unitsofmeasure.org", + "code": "1" + } + } + ] + } ] } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json index aa326fd..84e7255 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json @@ -107,33 +107,24 @@ "mustSupport": true }, { - "id": "Medication.code.coding:WG14", + "id": "Medication.code.coding:SCT", "path": "Medication.code.coding", - "sliceName": "WG14", + "sliceName": "SCT", "min": 0, "max": "1", + "type": [ + { + "code": "Coding", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/ISiKSnomedCTCoding" + ] + } + ], "patternCoding": { - "system": "http://fhir.de/CodeSystem/abdata/wg14" + "system": "http://snomed.info/sct" }, "mustSupport": true }, - { - "id": "Medication.code.coding:WG14.system", - "path": "Medication.code.coding.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:WG14.code", - "path": "Medication.code.coding.code", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.code.coding:WG14.display", - "path": "Medication.code.coding.display", - "mustSupport": true - }, { "id": "Medication.code.text", "path": "Medication.code.text", @@ -209,63 +200,27 @@ "id": "Medication.amount.numerator", "path": "Medication.amount.numerator", "min": 1, - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "Medication.amount.numerator.value", - "path": "Medication.amount.numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.amount.numerator.unit", - "path": "Medication.amount.numerator.unit", - "mustSupport": true - }, - { - "id": "Medication.amount.numerator.system", - "path": "Medication.amount.numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.amount.numerator.code", - "path": "Medication.amount.numerator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "Medication.amount.denominator", "path": "Medication.amount.denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "Medication.amount.denominator.value", - "path": "Medication.amount.denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.amount.denominator.unit", - "path": "Medication.amount.denominator.unit", - "mustSupport": true - }, - { - "id": "Medication.amount.denominator.system", - "path": "Medication.amount.denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.amount.denominator.code", - "path": "Medication.amount.denominator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -396,25 +351,6 @@ }, "mustSupport": true }, - { - "id": "Medication.ingredient.item[x]:itemCodeableConcept.coding:WG14", - "path": "Medication.ingredient.item[x].coding", - "sliceName": "WG14", - "min": 0, - "max": "1", - "type": [ - { - "code": "Coding", - "profile": [ - "https://gematik.de/fhir/isik/StructureDefinition/ISiKWG14Coding" - ] - } - ], - "patternCoding": { - "system": "http://fhir.de/CodeSystem/abdata/wg14" - }, - "mustSupport": true - }, { "id": "Medication.ingredient.item[x]:itemCodeableConcept.text", "path": "Medication.ingredient.item[x].text", @@ -460,63 +396,27 @@ "id": "Medication.ingredient.strength.numerator", "path": "Medication.ingredient.strength.numerator", "min": 1, - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.numerator.value", - "path": "Medication.ingredient.strength.numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.numerator.unit", - "path": "Medication.ingredient.strength.numerator.unit", - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.numerator.system", - "path": "Medication.ingredient.strength.numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.numerator.code", - "path": "Medication.ingredient.strength.numerator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "Medication.ingredient.strength.denominator", "path": "Medication.ingredient.strength.denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.denominator.value", - "path": "Medication.ingredient.strength.denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.denominator.unit", - "path": "Medication.ingredient.strength.denominator.unit", - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.denominator.system", - "path": "Medication.ingredient.strength.denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "Medication.ingredient.strength.denominator.code", - "path": "Medication.ingredient.strength.denominator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json index 088156f..37611c3 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsInformation.json @@ -241,28 +241,6 @@ ] } ], - "patternCoding": { - "system": "http://fhir.de/CodeSystem/bfarm/atc" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.medication[x]:medicationCodeableConcept.coding:WG14", - "path": "MedicationStatement.medication[x].coding", - "sliceName": "WG14", - "min": 0, - "max": "1", - "type": [ - { - "code": "Coding", - "profile": [ - "https://gematik.de/fhir/isik/StructureDefinition/ISiKWG14Coding" - ] - } - ], - "patternCoding": { - "system": "http://fhir.de/CodeSystem/abdata/wg14" - }, "mustSupport": true }, { @@ -897,63 +875,27 @@ { "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.low", "path": "MedicationStatement.dosage.doseAndRate.dose[x].low", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.low.value", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].low.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.low.unit", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].low.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.low.system", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].low.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.low.code", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].low.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.high", "path": "MedicationStatement.dosage.doseAndRate.dose[x].high", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.high.value", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].high.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.high.unit", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].high.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.high.system", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].high.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseRange.high.code", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].high.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -967,36 +909,10 @@ { "code": "Quantity", "profile": [ - "http://hl7.org/fhir/StructureDefinition/SimpleQuantity" + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" ] } ], - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseQuantity.value", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseQuantity.unit", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseQuantity.system", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.dose[x]:doseQuantity.code", - "path": "MedicationStatement.dosage.doseAndRate.dose[x].code", - "min": 1, "mustSupport": true }, { @@ -1030,63 +946,29 @@ { "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.numerator", "path": "MedicationStatement.dosage.doseAndRate.rate[x].numerator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.numerator.value", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.numerator.unit", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].numerator.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.numerator.system", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.numerator.code", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].numerator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.denominator", "path": "MedicationStatement.dosage.doseAndRate.rate[x].denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.denominator.value", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.denominator.unit", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].denominator.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.denominator.system", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRatio.denominator.code", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].denominator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -1106,63 +988,27 @@ { "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.low", "path": "MedicationStatement.dosage.doseAndRate.rate[x].low", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.low.value", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].low.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.low.unit", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].low.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.low.system", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].low.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.low.code", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].low.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.high", "path": "MedicationStatement.dosage.doseAndRate.rate[x].high", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.high.value", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].high.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.high.unit", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].high.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.high.system", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].high.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateRange.high.code", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].high.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -1176,36 +1022,10 @@ { "code": "Quantity", "profile": [ - "http://hl7.org/fhir/StructureDefinition/SimpleQuantity" + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" ] } ], - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateQuantity.value", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateQuantity.unit", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateQuantity.system", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.doseAndRate.rate[x]:rateQuantity.code", - "path": "MedicationStatement.dosage.doseAndRate.rate[x].code", - "min": 1, "mustSupport": true }, { @@ -1217,95 +1037,41 @@ { "id": "MedicationStatement.dosage.maxDosePerPeriod.numerator", "path": "MedicationStatement.dosage.maxDosePerPeriod.numerator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.numerator.value", - "path": "MedicationStatement.dosage.maxDosePerPeriod.numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.numerator.unit", - "path": "MedicationStatement.dosage.maxDosePerPeriod.numerator.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.numerator.system", - "path": "MedicationStatement.dosage.maxDosePerPeriod.numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.numerator.code", - "path": "MedicationStatement.dosage.maxDosePerPeriod.numerator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationStatement.dosage.maxDosePerPeriod.denominator", "path": "MedicationStatement.dosage.maxDosePerPeriod.denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.denominator.value", - "path": "MedicationStatement.dosage.maxDosePerPeriod.denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.denominator.unit", - "path": "MedicationStatement.dosage.maxDosePerPeriod.denominator.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.denominator.system", - "path": "MedicationStatement.dosage.maxDosePerPeriod.denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerPeriod.denominator.code", - "path": "MedicationStatement.dosage.maxDosePerPeriod.denominator.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationStatement.dosage.maxDosePerAdministration", "path": "MedicationStatement.dosage.maxDosePerAdministration", "short": "Maximaldosis pro Verabreichung", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerAdministration.value", - "path": "MedicationStatement.dosage.maxDosePerAdministration.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerAdministration.unit", - "path": "MedicationStatement.dosage.maxDosePerAdministration.unit", - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerAdministration.system", - "path": "MedicationStatement.dosage.maxDosePerAdministration.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationStatement.dosage.maxDosePerAdministration.code", - "path": "MedicationStatement.dosage.maxDosePerAdministration.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json index 0792a7b..e4459cb 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerabreichung.json @@ -104,30 +104,6 @@ }, "mustSupport": true }, - { - "id": "MedicationAdministration.medication[x]:medicationCodeableConcept.coding:WG14", - "path": "MedicationAdministration.medication[x].coding", - "sliceName": "WG14", - "min": 0, - "max": "1", - "type": [ - { - "code": "Coding", - "profile": [ - "https://gematik.de/fhir/isik/StructureDefinition/ISiKWG14Coding" - ] - } - ], - "patternCoding": { - "system": "http://fhir.de/CodeSystem/abdata/wg14" - }, - "mustSupport": true - }, - { - "id": "MedicationAdministration.medication[x]:medicationCodeableConcept.text", - "path": "MedicationAdministration.medication[x].text", - "mustSupport": true - }, { "id": "MedicationAdministration.medication[x]:medicationReference", "path": "MedicationAdministration.medication[x]", @@ -407,32 +383,14 @@ "id": "MedicationAdministration.dosage.dose", "path": "MedicationAdministration.dosage.dose", "short": "verabreichte Dosis", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.dose.value", - "path": "MedicationAdministration.dosage.dose.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.dose.unit", - "path": "MedicationAdministration.dosage.dose.unit", - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.dose.system", - "path": "MedicationAdministration.dosage.dose.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.dose.code", - "path": "MedicationAdministration.dosage.dose.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -466,63 +424,29 @@ { "id": "MedicationAdministration.dosage.rate[x]:rateRatio.numerator", "path": "MedicationAdministration.dosage.rate[x].numerator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.numerator.value", - "path": "MedicationAdministration.dosage.rate[x].numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.numerator.unit", - "path": "MedicationAdministration.dosage.rate[x].numerator.unit", - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.numerator.system", - "path": "MedicationAdministration.dosage.rate[x].numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.numerator.code", - "path": "MedicationAdministration.dosage.rate[x].numerator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationAdministration.dosage.rate[x]:rateRatio.denominator", "path": "MedicationAdministration.dosage.rate[x].denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.denominator.value", - "path": "MedicationAdministration.dosage.rate[x].denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.denominator.unit", - "path": "MedicationAdministration.dosage.rate[x].denominator.unit", - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.denominator.system", - "path": "MedicationAdministration.dosage.rate[x].denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateRatio.denominator.code", - "path": "MedicationAdministration.dosage.rate[x].denominator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -536,36 +460,10 @@ { "code": "Quantity", "profile": [ - "http://hl7.org/fhir/StructureDefinition/SimpleQuantity" + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" ] } ], - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateQuantity.value", - "path": "MedicationAdministration.dosage.rate[x].value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateQuantity.unit", - "path": "MedicationAdministration.dosage.rate[x].unit", - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateQuantity.system", - "path": "MedicationAdministration.dosage.rate[x].system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationAdministration.dosage.rate[x]:rateQuantity.code", - "path": "MedicationAdministration.dosage.rate[x].code", - "min": 1, "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json index d4fe278..04755f0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikationsVerordnung.json @@ -228,25 +228,6 @@ }, "mustSupport": true }, - { - "id": "MedicationRequest.medication[x]:medicationCodeableConcept.coding:WG14", - "path": "MedicationRequest.medication[x].coding", - "sliceName": "WG14", - "min": 0, - "max": "1", - "type": [ - { - "code": "Coding", - "profile": [ - "https://gematik.de/fhir/isik/StructureDefinition/ISiKWG14Coding" - ] - } - ], - "patternCoding": { - "system": "http://fhir.de/CodeSystem/abdata/wg14" - }, - "mustSupport": true - }, { "id": "MedicationRequest.medication[x]:medicationCodeableConcept.text", "path": "MedicationRequest.medication[x].text", @@ -791,63 +772,27 @@ { "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.low", "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].low", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.low.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].low.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.low.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].low.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.low.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].low.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.low.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].low.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.high", "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].high", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.high.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].high.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.high.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].high.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.high.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].high.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseRange.high.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].high.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -861,36 +806,10 @@ { "code": "Quantity", "profile": [ - "http://hl7.org/fhir/StructureDefinition/SimpleQuantity" + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" ] } ], - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseQuantity.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseQuantity.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseQuantity.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.dose[x]:doseQuantity.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.dose[x].code", - "min": 1, "mustSupport": true }, { @@ -924,63 +843,29 @@ { "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.numerator", "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].numerator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.numerator.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.numerator.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].numerator.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.numerator.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.numerator.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].numerator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.denominator", "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.denominator.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.denominator.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].denominator.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.denominator.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRatio.denominator.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].denominator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -1000,63 +885,27 @@ { "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.low", "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].low", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.low.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].low.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.low.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].low.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.low.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].low.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.low.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].low.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.high", "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].high", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.high.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].high.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.high.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].high.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.high.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].high.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateRange.high.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].high.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -1070,36 +919,10 @@ { "code": "Quantity", "profile": [ - "http://hl7.org/fhir/StructureDefinition/SimpleQuantity" + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" ] } ], - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateQuantity.value", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateQuantity.unit", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateQuantity.system", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.doseAndRate.rate[x]:rateQuantity.code", - "path": "MedicationRequest.dosageInstruction.doseAndRate.rate[x].code", - "min": 1, "mustSupport": true }, { @@ -1111,95 +934,43 @@ { "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator", "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.value", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.unit", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.system", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.code", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.numerator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator", "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.value", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.unit", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.system", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.code", - "path": "MedicationRequest.dosageInstruction.maxDosePerPeriod.denominator.code", "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { "id": "MedicationRequest.dosageInstruction.maxDosePerAdministration", "path": "MedicationRequest.dosageInstruction.maxDosePerAdministration", "short": "Maximaldosis pro Verabreichung", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerAdministration.value", - "path": "MedicationRequest.dosageInstruction.maxDosePerAdministration.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerAdministration.unit", - "path": "MedicationRequest.dosageInstruction.maxDosePerAdministration.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerAdministration.system", - "path": "MedicationRequest.dosageInstruction.maxDosePerAdministration.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dosageInstruction.maxDosePerAdministration.code", - "path": "MedicationRequest.dosageInstruction.maxDosePerAdministration.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { @@ -1211,32 +982,14 @@ "id": "MedicationRequest.dispenseRequest.quantity", "path": "MedicationRequest.dispenseRequest.quantity", "short": "angeforderte Abgabemenge", - "patternQuantity": { - "system": "http://unitsofmeasure.org" - }, - "mustSupport": true - }, - { - "id": "MedicationRequest.dispenseRequest.quantity.value", - "path": "MedicationRequest.dispenseRequest.quantity.value", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dispenseRequest.quantity.unit", - "path": "MedicationRequest.dispenseRequest.quantity.unit", - "mustSupport": true - }, - { - "id": "MedicationRequest.dispenseRequest.quantity.system", - "path": "MedicationRequest.dispenseRequest.quantity.system", - "min": 1, - "mustSupport": true - }, - { - "id": "MedicationRequest.dispenseRequest.quantity.code", - "path": "MedicationRequest.dispenseRequest.quantity.code", - "min": 1, + "type": [ + { + "code": "Quantity", + "profile": [ + "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity" + ] + } + ], "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json new file mode 100644 index 0000000..5f5b02f --- /dev/null +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -0,0 +1,47 @@ +{ + "resourceType": "StructureDefinition", + "id": "MedicationQuantity", + "url": "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity", + "version": "4.0.0-rc", + "name": "MedicationQuantity", + "title": "Medication Quantity", + "status": "draft", + "description": "Quantity Datentyp der UcumUndSctDoseFormVS vorgibt. Bei Dimensionslosen Einheiten wie 'Tablette' SOLL statt eines UCUM Code '1' der passende SnomedCT Unit of presentation Code angegeben werden.", + "fhirVersion": "4.0.1", + "kind": "complex-type", + "abstract": false, + "type": "Quantity", + "baseDefinition": "http://hl7.org/fhir/StructureDefinition/SimpleQuantity", + "derivation": "constraint", + "differential": { + "element": [ + { + "id": "Quantity.value", + "path": "Quantity.value", + "min": 1, + "mustSupport": true + }, + { + "id": "Quantity.unit", + "path": "Quantity.unit", + "mustSupport": true + }, + { + "id": "Quantity.system", + "path": "Quantity.system", + "min": 1, + "mustSupport": true + }, + { + "id": "Quantity.code", + "path": "Quantity.code", + "min": 1, + "mustSupport": true, + "binding": { + "strength": "required", + "valueSet": "https://gematik.de/fhir/isik/ValueSet/UcumUndSctDoseFormVS" + } + } + ] + } +} 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 new file mode 100644 index 0000000..042922f --- /dev/null +++ b/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json @@ -0,0 +1,30 @@ +{ + "resourceType": "ValueSet", + "status": "draft", + "name": "UcumUndSctDoseFormVS", + "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", + "date": "2024-04-04", + "compose": { + "include": [ + { + "system": "http://snomed.info/sct", + "filter": [ + { + "property": "concept", + "op": "is-a", + "value": "732935002" + } + ] + }, + { + "system": "http://unitsofmeasure.org" + } + ] + } +} diff --git a/Resources/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh index 4166609..088f632 100644 --- a/Resources/input/fsh/ISiKMedikament.fsh +++ b/Resources/input/fsh/ISiKMedikament.fsh @@ -13,7 +13,7 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen * coding contains PZN 0..1 MS and ATC-DE 0..1 MS and - WG14 0..1 MS + SCT 0..1 MS * coding[PZN] * ^patternCoding.system = $cs-pzn * system 1..1 MS @@ -24,11 +24,8 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen * system 1..1 MS * code 1..1 MS * display MS - * coding[WG14] - * ^patternCoding.system = $cs-wg14 - * system 1..1 MS - * code 1..1 MS - * display MS + * coding[SCT] only ISiKSnomedCTCoding + * ^patternCoding.system = $cs-sct * text MS * status 1..1 MS * ^short = "Status der Medikamenteninformation" @@ -50,17 +47,9 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen * amount MS * ^short = "Menge" * numerator 1..1 MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator only MedicationQuantity * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * denominator only MedicationQuantity * ingredient MS * ^short = "Informationen zu Bestandteilen (Rezeptur)" * extension MS @@ -76,36 +65,25 @@ 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 and - WG14 0..1 MS + PZN 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[WG14] only ISiKWG14Coding - * ^patternCoding.system = $cs-wg14 * text MS * itemReference MS - * ^short = "Bestandteil (Referenz auf ein anderes Medikament)" * reference 1..1 MS + * ^short = "Bestandteil (Referenz auf ein anderes Medikament)" * isActive MS * ^short = "handelt es sich um einen aktiven Bestandteil?" * strength MS * ^short = "Stärke" * numerator 1..1 MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator only MedicationQuantity * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * denominator only MedicationQuantity * batch MS * ^short = "Angaben zur Charge" * ^comment = "Bitte beachten Sie gegebenenfalls die Regelungen der zwischen GKV-SV und DAV: https://www.gkv-datenaustausch.de/leistungserbringer/apotheken/apotheken.jsp . Insbesondere den Technischen Anhang 7 (TA7) zur Arzneimittelabrechnungsvereinbarung gemäß § 300 Absatz 3 SGB V in der aktuellsten Fassung." @@ -183,14 +161,15 @@ Usage: #example * isActive = true * strength * numerator - * value = 1 - * unit = "St." + * value = 400 + * unit = "mg" * system = $cs-ucum - * code = #1 + * code = #mg * denominator + * unit = "Tablette" * value = 1 - * system = $cs-ucum - * code = #1 + * system = $cs-sct + * code = #732936001 * ingredient[1] * itemCodeableConcept.coding * system = $cs-pzn @@ -199,14 +178,15 @@ Usage: #example * isActive = true * strength * numerator - * value = 1 - * unit = "St." + * value = 500 + * unit = "mg" * system = $cs-ucum - * code = #1 + * code = #mg * denominator + * unit = "Tablette" * value = 1 - * system = $cs-ucum - * code = #1 + * system = $cs-sct + * code = #732936001 Instance: ExampleISiKMedikament5 InstanceOf: ISiKMedikament @@ -226,10 +206,10 @@ Usage: #example * system = $cs-ucum * code = #mg * denominator + * unit = "Tablette" * value = 1 - * unit = "St." - * system = $cs-ucum - * code = #1 + * system = $cs-sct + * code = #732936001 * ingredient[1] * itemCodeableConcept.coding * system = $cs-atc-de @@ -243,10 +223,10 @@ Usage: #example * system = $cs-ucum * code = #mg * denominator + * unit = "Tablette" * value = 1 - * unit = "St." - * system = $cs-ucum - * code = #1 + * system = $cs-sct + * code = #732936001 Instance: ExampleISiKMedikament6 InstanceOf: ISiKMedikament diff --git a/Resources/input/fsh/ISiKMedikationsInformation.fsh b/Resources/input/fsh/ISiKMedikationsInformation.fsh index 43bc8a3..edd8e65 100644 --- a/Resources/input/fsh/ISiKMedikationsInformation.fsh +++ b/Resources/input/fsh/ISiKMedikationsInformation.fsh @@ -48,14 +48,10 @@ Description: "Dieses Profil ermöglicht die Abbildung von Informationen zur Medi * ^slicing.rules = #open * coding contains PZN 0..1 MS and - ATC-DE 0..1 MS and - WG14 0..1 MS + ATC-DE 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding - * ^patternCoding.system = $cs-atc-de - * coding[WG14] only ISiKWG14Coding - * ^patternCoding.system = $cs-wg14 * text MS * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)" @@ -190,80 +186,36 @@ Description: "Dieses Profil ermöglicht die Abbildung von Informationen zur Medi * doseRange MS * ^short = "Dosisbereich" * low MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * low only MedicationQuantity * high MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * high only MedicationQuantity * doseQuantity MS + * doseQuantity only MedicationQuantity * ^short = "Dosis" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * rateRatio MS * ^short = "Raten-Verhältnis" - * numerator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS - * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator 1.. MS + * numerator only MedicationQuantity + * denominator 1.. MS + * denominator only MedicationQuantity * rateRange MS * ^short = "Raten-Bereich" * low MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * low only MedicationQuantity * high MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * high only MedicationQuantity * rateQuantity MS + * rateQuantity only MedicationQuantity * ^short = "Rate" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * maxDosePerPeriod MS * ^short = "Maximaldosis (Zähler) pro Zeitraum (Nenner)" * numerator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator only MedicationQuantity * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * denominator only MedicationQuantity * maxDosePerAdministration MS + * maxDosePerAdministration only MedicationQuantity * ^short = "Maximaldosis pro Verabreichung" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS Instance: ExampleISiKMedikationsInformation1 InstanceOf: ISiKMedikationsInformation diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh index dec0554..640d24e 100644 --- a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh @@ -14,15 +14,11 @@ 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 and - WG14 0..1 MS + ATC-DE 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de - * coding[WG14] only ISiKWG14Coding - * ^patternCoding.system = $cs-wg14 - * text MS * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)" * ^comment = "wird verwendet, wenn detaillierte Informationen zum Medikament vorliegen" @@ -82,33 +78,17 @@ Description: "Dieses Profil ermöglicht die Abbildung der Verabreichung von Medi * ^patternCoding.system = $cs-sct * text MS * dose MS + * dose only MedicationQuantity * ^short = "verabreichte Dosis" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * rateRatio MS * ^short = "Verabreichungs-Rate (Verhältnis)" - * numerator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS - * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator 1.. MS + * numerator only MedicationQuantity + * denominator 1.. MS + * denominator only MedicationQuantity * rateQuantity MS + * rateQuantity only MedicationQuantity * ^short = "Verabreichungs-Rate" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS Instance: ExampleISiKMedikationsVerabreichung InstanceOf: ISiKMedikationsVerabreichung @@ -121,9 +101,9 @@ Usage: #example * dosage * dose * value = 1 - * unit = "Brausetablette" - * system = $cs-ucum - * code = #1 + * unit = "Tablette" + * system = $cs-sct + * code = #732936001 Instance: ExampleISiKMedikationsVerabreichung2 InstanceOf: ISiKMedikationsVerabreichung @@ -136,6 +116,6 @@ Usage: #example * dosage * dose * value = 1 - * unit = "Infusionsbeutel" - * system = $cs-ucum - * code = #1 + * unit = "Beutel" + * system = $cs-sct + * code = #733013000 diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh index 0092033..7b0304d 100644 --- a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh @@ -44,14 +44,11 @@ Description: "Dieses Profil ermöglicht die Abbildung von Medikationsverordnunge * ^slicing.rules = #open * coding contains PZN 0..1 MS and - ATC-DE 0..1 MS and - WG14 0..1 MS + ATC-DE 0..1 MS * coding[PZN] only ISiKPZNCoding * ^patternCoding.system = $cs-pzn * coding[ATC-DE] only ISiKATCCoding * ^patternCoding.system = $cs-atc-de - * coding[WG14] only ISiKWG14Coding - * ^patternCoding.system = $cs-wg14 * text MS * medicationReference MS * ^short = "Referenz auf das Medikament (Medication-Ressource)" @@ -171,88 +168,40 @@ Description: "Dieses Profil ermöglicht die Abbildung von Medikationsverordnunge * doseRange MS * ^short = "Dosisbereich" * low MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * low only MedicationQuantity * high MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * high only MedicationQuantity * doseQuantity MS + * doseQuantity only MedicationQuantity * ^short = "Dosis" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * rateRatio MS * ^short = "Raten-Verhältnis" - * numerator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS - * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator 1.. MS + * numerator only MedicationQuantity + * denominator 1.. MS + * denominator only MedicationQuantity * rateRange MS * ^short = "Raten-Bereich" * low MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * low only MedicationQuantity * high MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * high only MedicationQuantity * rateQuantity MS + * rateQuantity only MedicationQuantity * ^short = "Rate" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * maxDosePerPeriod MS * ^short = "Maximaldosis (Zähler) pro Zeitraum (Nenner)" - * numerator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS - * denominator MS - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS + * numerator 1.. MS + * numerator only MedicationQuantity + * denominator 1.. MS + * denominator only MedicationQuantity * maxDosePerAdministration MS + * maxDosePerAdministration only MedicationQuantity * ^short = "Maximaldosis pro Verabreichung" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * dispenseRequest MS * quantity MS + * quantity only MedicationQuantity * ^short = "angeforderte Abgabemenge" - * ^patternQuantity.system = $cs-ucum - * value 1..1 MS - * unit MS - * system 1..1 MS - * code 1..1 MS * substitution MS * ^short = "Ersatz zulässig" * allowedBoolean MS @@ -279,8 +228,8 @@ Usage: #example * doseAndRate.doseQuantity * value = 1 * unit = "Brausetablette" - * system = $cs-ucum - * code = #1 + * system = $cs-sct + * code = #732936001 Instance: ExampleISiKMedikationsVerordnung2 InstanceOf: ISiKMedikationsVerordnung diff --git a/Resources/input/fsh/aliases.fsh b/Resources/input/fsh/aliases.fsh index c7960da..65a4f81 100644 --- a/Resources/input/fsh/aliases.fsh +++ b/Resources/input/fsh/aliases.fsh @@ -7,7 +7,6 @@ Alias: $cs-risk-probability = http://terminology.hl7.org/CodeSystem/risk-probabi Alias: $cs-sct = http://snomed.info/sct Alias: $cs-ucum = http://unitsofmeasure.org Alias: $cs-v3-event-timing = http://terminology.hl7.org/CodeSystem/v3-TimingEvent -Alias: $cs-wg14 = http://fhir.de/CodeSystem/abdata/wg14 Alias: $vs-edqm-doseform = http://hl7.org/fhir/uv/ips/ValueSet/medicine-doseform Alias: $vs-edqm-route = http://hl7.org/fhir/uv/ips/ValueSet/medicine-route-of-administration Alias: $vs-risk-probability = http://hl7.org/fhir/ValueSet/risk-probability diff --git a/Resources/input/fsh/dataTypeProfiles.fsh b/Resources/input/fsh/dataTypeProfiles.fsh new file mode 100644 index 0000000..1de3808 --- /dev/null +++ b/Resources/input/fsh/dataTypeProfiles.fsh @@ -0,0 +1,10 @@ +Profile: MedicationQuantity +Parent: SimpleQuantity +Id: MedicationQuantity +Title: "Medication Quantity" +Description: "Quantity Datentyp der UcumUndSctDoseFormVS vorgibt. Bei Dimensionslosen Einheiten wie 'Tablette' SOLL statt eines UCUM Code '1' der passende SnomedCT Unit of presentation Code angegeben werden." +* value 1..1 MS +* unit MS +* system 1..1 MS +* code 1..1 MS +* code from UcumUndSctDoseFormVS \ No newline at end of file diff --git a/Resources/input/fsh/valueSets.fsh b/Resources/input/fsh/valueSets.fsh index fedd432..8d2c64e 100644 --- a/Resources/input/fsh/valueSets.fsh +++ b/Resources/input/fsh/valueSets.fsh @@ -9,3 +9,11 @@ Id: ISiKMedikationsartVS Description: "ISiK Therapiearten für Medikation" * insert Meta * include codes from system ISiKMedikationsart + +ValueSet: UcumUndSctDoseFormVS +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" +* insert Meta +* include codes from system $cs-sct where concept is-a #732935002 // Unit of presentation +* include codes from system $cs-ucum \ No newline at end of file diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 4061da7..510e01f 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -7,3 +7,4 @@ dependencies: hl7.fhir.r4.core: 4.0.1 de.basisprofil.r4: 1.5.0-ballot2 de.gematik.isik-basismodul: 4.0.0-rc2 + hl7.fhir.uv.ips: 1.1.0 \ No newline at end of file diff --git a/package.json b/package.json index 46c6b76..087488e 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ ], "dependencies": { "hl7.fhir.r4.core": "4.0.1", - "hl7.fhir.uv.ips": "1.0.0", + "hl7.fhir.uv.ips": "1.1.0", "de.basisprofil.r4": "1.5.0-ballot2", "de.gematik.isik-basismodul": "4.0.0-rc2" }