diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index cb71740..468d2b5 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -11,7 +11,7 @@ Version: 4.0.0-rc3 Datum: tbd. * Entfernen von MS von .id der Ressourcen https://github.com/gematik/spec-ISiK-Medikation/pull/122 -* Entfernen der WG14 Kodierung, Hinzufügen eines SimpleQuantity Profiles welches ein VS bindet bestehend aus UCUM & SCT Unit of presentation um bspw. 500mg/Tablette maschinenlesbar kodieren zu können, hinzufügen eines SnomedCT Slices zur Kodierung der Medikationsressourcen, Update der Abhängigkeit auf IPS 1.1.0 https://github.com/gematik/spec-ISiK-Medikation/pull/123 +* Entfernen der WG14 Kodierung, Hinzufügen eines SimpleQuantity Profiles, Update der Abhängigkeit auf IPS 1.1.0, Hinzufügen eines SCT Slices zu Medikationsoprofilen https://github.com/gematik/spec-ISiK-Medikation/pull/123 --- **Release Candidate zur Kommentierung** diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json new file mode 100644 index 0000000..3e66548 --- /dev/null +++ b/Resources/fsh-generated/fsh-index.json @@ -0,0 +1,434 @@ +[ + { + "outputFile": "Bundle-ExampleISiKMedikationTransaction.json", + "fshName": "ExampleISiKMedikationTransaction", + "fshType": "Instance", + "fshFile": "ISiKMedikationTransaction.fsh", + "startLine": 27, + "endLine": 42 + }, + { + "outputFile": "Bundle-ExampleISiKMedikationTransactionResponse.json", + "fshName": "ExampleISiKMedikationTransactionResponse", + "fshType": "Instance", + "fshFile": "ISiKMedikationTransactionResponse.fsh", + "startLine": 29, + "endLine": 44 + }, + { + "outputFile": "CapabilityStatement-ISiKCapabilityStatementAMTS.json", + "fshName": "ISiKCapabilityStatementAMTS", + "fshType": "Instance", + "fshFile": "ISiKCapabilityStatementAMTS.fsh", + "startLine": 1, + "endLine": 858 + }, + { + "outputFile": "CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json", + "fshName": "ISiKCapabilityStatementMedikationInformation", + "fshType": "Instance", + "fshFile": "ISiKCapabilityStatementMedikationInformation.fsh", + "startLine": 1, + "endLine": 494 + }, + { + "outputFile": "CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json", + "fshName": "ISiKCapabilityStatementMedikationVerabreichung", + "fshType": "Instance", + "fshFile": "ISiKCapabilityStatementMedikationVerabreichung.fsh", + "startLine": 1, + "endLine": 411 + }, + { + "outputFile": "CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json", + "fshName": "ISiKCapabilityStatementMedikationVerordnung", + "fshType": "Instance", + "fshFile": "ISiKCapabilityStatementMedikationVerordnung.fsh", + "startLine": 1, + "endLine": 425 + }, + { + "outputFile": "CodeSystem-ISiKMedikationsartCS.json", + "fshName": "ISiKMedikationsart", + "fshType": "CodeSystem", + "fshFile": "codeSystems.fsh", + "startLine": 1, + "endLine": 6 + }, + { + "outputFile": "Encounter-Fachabteilungskontakt.json", + "fshName": "Fachabteilungskontakt", + "fshType": "Instance", + "fshFile": "referencedExamples.fsh", + "startLine": 53, + "endLine": 87 + }, + { + "outputFile": "List-ExampleISiKMedikationsListe.json", + "fshName": "ExampleISiKMedikationsListe", + "fshType": "Instance", + "fshFile": "ISiKMedikationsListe.fsh", + "startLine": 45, + "endLine": 58 + }, + { + "outputFile": "List-ExampleISiKMedikationsListeParkinson.json", + "fshName": "ExampleISiKMedikationsListeParkinson", + "fshType": "Instance", + "fshFile": "ISiKMedikationsListe.fsh", + "startLine": 60, + "endLine": 82 + }, + { + "outputFile": "Medication-ExampleISiKMedikament1.json", + "fshName": "ExampleISiKMedikament1", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 96, + "endLine": 103 + }, + { + "outputFile": "Medication-ExampleISiKMedikament2.json", + "fshName": "ExampleISiKMedikament2", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 105, + "endLine": 137 + }, + { + "outputFile": "Medication-ExampleISiKMedikament3.json", + "fshName": "ExampleISiKMedikament3", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 139, + "endLine": 146 + }, + { + "outputFile": "Medication-ExampleISiKMedikament4.json", + "fshName": "ExampleISiKMedikament4", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 148, + "endLine": 186 + }, + { + "outputFile": "Medication-ExampleISiKMedikament5.json", + "fshName": "ExampleISiKMedikament5", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 188, + "endLine": 226 + }, + { + "outputFile": "Medication-ExampleISiKMedikament6.json", + "fshName": "ExampleISiKMedikament6", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 228, + "endLine": 232 + }, + { + "outputFile": "Medication-ExampleISiKMedikament7.json", + "fshName": "ExampleISiKMedikament7", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 234, + "endLine": 267 + }, + { + "outputFile": "Medication-ExampleISiKMedikament8.json", + "fshName": "ExampleISiKMedikament8", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 269, + "endLine": 311 + }, + { + "outputFile": "Medication-ExampleISiKMedikament9.json", + "fshName": "ExampleISiKMedikament9", + "fshType": "Instance", + "fshFile": "ISiKMedikament.fsh", + "startLine": 313, + "endLine": 355 + }, + { + "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung.json", + "fshName": "ExampleISiKMedikationsVerabreichung", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerabreichung.fsh", + "startLine": 96, + "endLine": 109 + }, + { + "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json", + "fshName": "ExampleISiKMedikationsVerabreichung2", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerabreichung.fsh", + "startLine": 111, + "endLine": 124 + }, + { + "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung.json", + "fshName": "ExampleISiKMedikationsVerordnung", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerordnung.fsh", + "startLine": 212, + "endLine": 235 + }, + { + "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung2.json", + "fshName": "ExampleISiKMedikationsVerordnung2", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerordnung.fsh", + "startLine": 237, + "endLine": 260 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation1.json", + "fshName": "ExampleISiKMedikationsInformation1", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 224, + "endLine": 247 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation2.json", + "fshName": "ExampleISiKMedikationsInformation2", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 249, + "endLine": 269 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation3.json", + "fshName": "ExampleISiKMedikationsInformation3", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 271, + "endLine": 294 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation4.json", + "fshName": "ExampleISiKMedikationsInformation4", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 297, + "endLine": 316 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation5.json", + "fshName": "ExampleISiKMedikationsInformation5", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 319, + "endLine": 341 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation6.json", + "fshName": "ExampleISiKMedikationsInformation6", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 344, + "endLine": 360 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json", + "fshName": "ExampleISiKMedikationsInformationParkinson1", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 363, + "endLine": 385 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json", + "fshName": "ExampleISiKMedikationsInformationParkinson2", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 388, + "endLine": 408 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json", + "fshName": "ExampleISiKMedikationsInformationParkinson3", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 411, + "endLine": 440 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json", + "fshName": "ExampleISiKMedikationsInformationParkinson4", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 443, + "endLine": 463 + }, + { + "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json", + "fshName": "ExampleISiKMedikationsInformationParkinson5", + "fshType": "Instance", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 466, + "endLine": 485 + }, + { + "outputFile": "Patient-PatientinMusterfrau.json", + "fshName": "PatientinMusterfrau", + "fshType": "Instance", + "fshFile": "referencedExamples.fsh", + "startLine": 1, + "endLine": 51 + }, + { + "outputFile": "RiskAssessment-ExampleISiKAMTSBewertung1.json", + "fshName": "ExampleISiKAMTSBewertung1", + "fshType": "Instance", + "fshFile": "ISiKAMTSBewertung.fsh", + "startLine": 67, + "endLine": 84 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKAcceptedRisk.json", + "fshName": "ExtensionISiKAcceptedRisk", + "fshType": "Extension", + "fshFile": "ExtensionISiKAcceptedRisk.fsh", + "startLine": 1, + "endLine": 14 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKBehandlungsziel.json", + "fshName": "ExtensionISiKBehandlungsziel", + "fshType": "Extension", + "fshFile": "ExtensionISiKBehandlungsziel.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKMedicationRequestReplaces.json", + "fshName": "ExtensionISiKMedicationRequestReplaces", + "fshType": "Extension", + "fshFile": "ExtensionISiKMedicationRequestReplaces.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKMedicationStatementReplaces.json", + "fshName": "ExtensionISiKMedicationStatementReplaces", + "fshType": "Extension", + "fshFile": "ExtensionISiKMedicationStatementReplaces.fsh", + "startLine": 1, + "endLine": 12 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKMedikationsart.json", + "fshName": "ExtensionISiKMedikationsart", + "fshType": "Extension", + "fshFile": "ExtensionISiKMedikationsart.fsh", + "startLine": 1, + "endLine": 15 + }, + { + "outputFile": "StructureDefinition-ExtensionISiKSelbstmedikation.json", + "fshName": "ExtensionISiKSelbstmedikation", + "fshType": "Extension", + "fshFile": "ExtensionISiKSelbstmedikation.fsh", + "startLine": 1, + "endLine": 10 + }, + { + "outputFile": "StructureDefinition-ISiKAMTSBewertung.json", + "fshName": "ISiKAMTSBewertung", + "fshType": "Profile", + "fshFile": "ISiKAMTSBewertung.fsh", + "startLine": 1, + "endLine": 64 + }, + { + "outputFile": "StructureDefinition-ISiKMedikament.json", + "fshName": "ISiKMedikament", + "fshType": "Profile", + "fshFile": "ISiKMedikament.fsh", + "startLine": 1, + "endLine": 89 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationTransaction.json", + "fshName": "ISiKMedikationTransaction", + "fshType": "Profile", + "fshFile": "ISiKMedikationTransaction.fsh", + "startLine": 1, + "endLine": 25 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationTransactionResponse.json", + "fshName": "ISiKMedikationTransactionResponse", + "fshType": "Profile", + "fshFile": "ISiKMedikationTransactionResponse.fsh", + "startLine": 1, + "endLine": 27 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationsInformation.json", + "fshName": "ISiKMedikationsInformation", + "fshType": "Profile", + "fshFile": "ISiKMedikationsInformation.fsh", + "startLine": 1, + "endLine": 222 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationsListe.json", + "fshName": "ISiKMedikationsListe", + "fshType": "Profile", + "fshFile": "ISiKMedikationsListe.fsh", + "startLine": 1, + "endLine": 43 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationsVerabreichung.json", + "fshName": "ISiKMedikationsVerabreichung", + "fshType": "Profile", + "fshFile": "ISiKMedikationsVerabreichung.fsh", + "startLine": 1, + "endLine": 94 + }, + { + "outputFile": "StructureDefinition-ISiKMedikationsVerordnung.json", + "fshName": "ISiKMedikationsVerordnung", + "fshType": "Profile", + "fshFile": "ISiKMedikationsVerordnung.fsh", + "startLine": 1, + "endLine": 210 + }, + { + "outputFile": "StructureDefinition-MedicationQuantity.json", + "fshName": "MedicationQuantity", + "fshType": "Profile", + "fshFile": "dataTypeProfiles.fsh", + "startLine": 1, + "endLine": 10 + }, + { + "outputFile": "ValueSet-ISiKMedikationsartVS.json", + "fshName": "ISiKMedikationsart", + "fshType": "ValueSet", + "fshFile": "valueSets.fsh", + "startLine": 7, + "endLine": 11 + }, + { + "outputFile": "ValueSet-SctRouteOfAdministration.json", + "fshName": "SctRouteOfAdministration", + "fshType": "ValueSet", + "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 new file mode 100644 index 0000000..20a8812 --- /dev/null +++ b/Resources/fsh-generated/fsh-index.txt @@ -0,0 +1,55 @@ +Output File Name Type FSH File Lines +Bundle-ExampleISiKMedikationTransaction.json ExampleISiKMedikationTransaction Instance ISiKMedikationTransaction.fsh 27 - 42 +Bundle-ExampleISiKMedikationTransactionResponse.json ExampleISiKMedikationTransactionResponse Instance ISiKMedikationTransactionResponse.fsh 29 - 44 +CapabilityStatement-ISiKCapabilityStatementAMTS.json ISiKCapabilityStatementAMTS Instance ISiKCapabilityStatementAMTS.fsh 1 - 858 +CapabilityStatement-ISiKCapabilityStatementMedikationInformation.json ISiKCapabilityStatementMedikationInformation Instance ISiKCapabilityStatementMedikationInformation.fsh 1 - 494 +CapabilityStatement-ISiKCapabilityStatementMedikationVerabreichung.json ISiKCapabilityStatementMedikationVerabreichung Instance ISiKCapabilityStatementMedikationVerabreichung.fsh 1 - 411 +CapabilityStatement-ISiKCapabilityStatementMedikationVerordnung.json ISiKCapabilityStatementMedikationVerordnung Instance ISiKCapabilityStatementMedikationVerordnung.fsh 1 - 425 +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 45 - 58 +List-ExampleISiKMedikationsListeParkinson.json ExampleISiKMedikationsListeParkinson Instance ISiKMedikationsListe.fsh 60 - 82 +Medication-ExampleISiKMedikament1.json ExampleISiKMedikament1 Instance ISiKMedikament.fsh 96 - 103 +Medication-ExampleISiKMedikament2.json ExampleISiKMedikament2 Instance ISiKMedikament.fsh 105 - 137 +Medication-ExampleISiKMedikament3.json ExampleISiKMedikament3 Instance ISiKMedikament.fsh 139 - 146 +Medication-ExampleISiKMedikament4.json ExampleISiKMedikament4 Instance ISiKMedikament.fsh 148 - 186 +Medication-ExampleISiKMedikament5.json ExampleISiKMedikament5 Instance ISiKMedikament.fsh 188 - 226 +Medication-ExampleISiKMedikament6.json ExampleISiKMedikament6 Instance ISiKMedikament.fsh 228 - 232 +Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 234 - 267 +Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 269 - 311 +Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 313 - 355 +MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 96 - 109 +MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 111 - 124 +MedicationRequest-ExampleISiKMedikationsVerordnung.json ExampleISiKMedikationsVerordnung Instance ISiKMedikationsVerordnung.fsh 212 - 235 +MedicationRequest-ExampleISiKMedikationsVerordnung2.json ExampleISiKMedikationsVerordnung2 Instance ISiKMedikationsVerordnung.fsh 237 - 260 +MedicationStatement-ExampleISiKMedikationsInformation1.json ExampleISiKMedikationsInformation1 Instance ISiKMedikationsInformation.fsh 224 - 247 +MedicationStatement-ExampleISiKMedikationsInformation2.json ExampleISiKMedikationsInformation2 Instance ISiKMedikationsInformation.fsh 249 - 269 +MedicationStatement-ExampleISiKMedikationsInformation3.json ExampleISiKMedikationsInformation3 Instance ISiKMedikationsInformation.fsh 271 - 294 +MedicationStatement-ExampleISiKMedikationsInformation4.json ExampleISiKMedikationsInformation4 Instance ISiKMedikationsInformation.fsh 297 - 316 +MedicationStatement-ExampleISiKMedikationsInformation5.json ExampleISiKMedikationsInformation5 Instance ISiKMedikationsInformation.fsh 319 - 341 +MedicationStatement-ExampleISiKMedikationsInformation6.json ExampleISiKMedikationsInformation6 Instance ISiKMedikationsInformation.fsh 344 - 360 +MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json ExampleISiKMedikationsInformationParkinson1 Instance ISiKMedikationsInformation.fsh 363 - 385 +MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json ExampleISiKMedikationsInformationParkinson2 Instance ISiKMedikationsInformation.fsh 388 - 408 +MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json ExampleISiKMedikationsInformationParkinson3 Instance ISiKMedikationsInformation.fsh 411 - 440 +MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json ExampleISiKMedikationsInformationParkinson4 Instance ISiKMedikationsInformation.fsh 443 - 463 +MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json ExampleISiKMedikationsInformationParkinson5 Instance ISiKMedikationsInformation.fsh 466 - 485 +Patient-PatientinMusterfrau.json PatientinMusterfrau Instance referencedExamples.fsh 1 - 51 +RiskAssessment-ExampleISiKAMTSBewertung1.json ExampleISiKAMTSBewertung1 Instance ISiKAMTSBewertung.fsh 67 - 84 +StructureDefinition-ExtensionISiKAcceptedRisk.json ExtensionISiKAcceptedRisk Extension ExtensionISiKAcceptedRisk.fsh 1 - 14 +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 - 64 +StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 89 +StructureDefinition-ISiKMedikationTransaction.json ISiKMedikationTransaction Profile ISiKMedikationTransaction.fsh 1 - 25 +StructureDefinition-ISiKMedikationTransactionResponse.json ISiKMedikationTransactionResponse Profile ISiKMedikationTransactionResponse.fsh 1 - 27 +StructureDefinition-ISiKMedikationsInformation.json ISiKMedikationsInformation Profile ISiKMedikationsInformation.fsh 1 - 222 +StructureDefinition-ISiKMedikationsListe.json ISiKMedikationsListe Profile ISiKMedikationsListe.fsh 1 - 43 +StructureDefinition-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 94 +StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 210 +StructureDefinition-MedicationQuantity.json MedicationQuantity Profile dataTypeProfiles.fsh 1 - 10 +ValueSet-ISiKMedikationsartVS.json ISiKMedikationsart ValueSet valueSets.fsh 7 - 11 +ValueSet-SctRouteOfAdministration.json SctRouteOfAdministration ValueSet valueSets.fsh 1 - 5 +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 82dde09..3341945 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json @@ -39,6 +39,29 @@ "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" @@ -57,29 +80,6 @@ { "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 6a068f3..33223c5 100644 --- a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json +++ b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json @@ -39,6 +39,29 @@ "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" @@ -57,29 +80,6 @@ { "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 f24ec0c..7f06fdc 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament2.json @@ -8,6 +8,20 @@ }, "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", @@ -26,21 +40,7 @@ } ] }, - "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" - } - } + "isActive": true }, { "itemReference": { diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json index fec7123..ff1f234 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament4.json @@ -6,62 +6,62 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, - "status": "active", - "form": { - "text": "Tabletten" - }, "ingredient": [ { - "itemCodeableConcept": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/ifa/pzn", - "code": "00266040", - "display": "IBU-ratiopharm® 400 mg akut Schmerztabletten 20 St." - } - ] - }, - "isActive": true, "strength": { "numerator": { + "system": "http://unitsofmeasure.org", "value": 400, "unit": "mg", - "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { + "system": "http://unitsofmeasure.org", "unit": "Tablette", "value": 1, - "system": "http://snomed.info/sct", - "code": "732936001" + "code": "1" } - } - }, - { + }, "itemCodeableConcept": { "coding": [ { "system": "http://fhir.de/CodeSystem/ifa/pzn", - "code": "01126111", - "display": "Paracetamol-ratiopharm® 500 mg 20 St." + "code": "00266040", + "display": "IBU-ratiopharm® 400 mg akut Schmerztabletten 20 St." } ] }, - "isActive": true, + "isActive": true + }, + { "strength": { "numerator": { + "system": "http://unitsofmeasure.org", "value": 500, "unit": "mg", - "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { + "system": "http://unitsofmeasure.org", "unit": "Tablette", "value": 1, - "system": "http://snomed.info/sct", - "code": "732936001" + "code": "1" } - } + }, + "itemCodeableConcept": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/ifa/pzn", + "code": "01126111", + "display": "Paracetamol-ratiopharm® 500 mg 20 St." + } + ] + }, + "isActive": true } - ] + ], + "status": "active", + "form": { + "text": "Tabletten" + } } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json index 3f5f51a..36ebe76 100644 --- a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json +++ b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament5.json @@ -6,62 +6,62 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikament" ] }, - "status": "active", - "form": { - "text": "Tabletten" - }, "ingredient": [ { - "itemCodeableConcept": { - "coding": [ - { - "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "M02AA13", - "display": "Ibuprofen" - } - ] - }, - "isActive": true, "strength": { "numerator": { + "system": "http://unitsofmeasure.org", "value": 400, "unit": "mg", - "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { + "system": "http://unitsofmeasure.org", "unit": "Tablette", "value": 1, - "system": "http://snomed.info/sct", - "code": "732936001" + "code": "1" } - } - }, - { + }, "itemCodeableConcept": { "coding": [ { "system": "http://fhir.de/CodeSystem/bfarm/atc", - "code": "N02BE01", - "display": "Paracetamol" + "code": "M02AA13", + "display": "Ibuprofen" } ] }, - "isActive": true, + "isActive": true + }, + { "strength": { "numerator": { + "system": "http://unitsofmeasure.org", "value": 500, "unit": "mg", - "system": "http://unitsofmeasure.org", "code": "mg" }, "denominator": { + "system": "http://unitsofmeasure.org", "unit": "Tablette", "value": 1, - "system": "http://snomed.info/sct", - "code": "732936001" + "code": "1" } - } + }, + "itemCodeableConcept": { + "coding": [ + { + "system": "http://fhir.de/CodeSystem/bfarm/atc", + "code": "N02BE01", + "display": "Paracetamol" + } + ] + }, + "isActive": true } - ] + ], + "status": "active", + "form": { + "text": "Tabletten" + } } diff --git a/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json b/Resources/fsh-generated/resources/Medication-ExampleISiKMedikament7.json index 7cd8c80..4cb6fa4 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": { - "value": 1, "system": "http://unitsofmeasure.org", + "value": 1, "code": "1" } - } - }, - { + }, "itemCodeableConcept": { - "text": "Wasser" + "coding": [ + { + "system": "http://fhir.de/CodeSystem/bfarm/atc", + "code": "N02BE01", + "display": "Paracetamol" + } + ] }, - "isActive": false, + "isActive": true + }, + { "strength": { "numerator": { + "system": "http://unitsofmeasure.org", "value": 1, "unit": "Esslöffel", - "system": "http://unitsofmeasure.org", "code": "1" }, "denominator": { - "value": 1, "system": "http://unitsofmeasure.org", + "value": 1, "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 714dedd..d712e02 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": "B05BA11", - "display": "Glucose" + "code": "L01CD01", + "display": "Paclitaxel" } ] }, - "isActive": false, + "isActive": true + }, + { "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 f89de7b..e653b87 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": "B05BA11", - "display": "Glucose" + "code": "L01CD01", + "display": "Paclitaxel" } ] }, - "isActive": false, + "isActive": true + }, + { "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 369b753..4ce241b 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json @@ -6,6 +6,14 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsVerabreichung" ] }, + "dosage": { + "dose": { + "system": "http://unitsofmeasure.org", + "value": 1, + "unit": "Tablette", + "code": "1" + } + }, "status": "completed", "medicationReference": { "reference": "Medication/ExampleISiKMedikament1" @@ -16,13 +24,5 @@ "context": { "reference": "Encounter/Fachabteilungskontakt" }, - "effectiveDateTime": "2021-07-01", - "dosage": { - "dose": { - "value": 1, - "unit": "Tablette", - "system": "http://snomed.info/sct", - "code": "732936001" - } - } + "effectiveDateTime": "2021-07-01" } diff --git a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json index c118638..c0f9d57 100644 --- a/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json +++ b/Resources/fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json @@ -6,6 +6,14 @@ "https://gematik.de/fhir/isik/StructureDefinition/ISiKMedikationsVerabreichung" ] }, + "dosage": { + "dose": { + "system": "http://unitsofmeasure.org", + "value": 1, + "unit": "Beutel", + "code": "1" + } + }, "status": "completed", "medicationReference": { "reference": "Medication/ExampleISiKMedikament9" @@ -16,13 +24,5 @@ "context": { "reference": "Encounter/Fachabteilungskontakt" }, - "effectiveDateTime": "2024-01-22", - "dosage": { - "dose": { - "value": 1, - "unit": "Beutel", - "system": "http://snomed.info/sct", - "code": "733013000" - } - } + "effectiveDateTime": "2024-01-22" } diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json index e03f0ad..96efbca 100644 --- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json +++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json @@ -23,6 +23,29 @@ "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": { @@ -42,28 +65,5 @@ { "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 e4ffdc5..273d7d4 100644 --- a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json +++ b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json @@ -14,6 +14,30 @@ } } ], + "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": { @@ -28,29 +52,5 @@ "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 1c64e37..2a1f86b 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json @@ -27,6 +27,29 @@ "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" @@ -45,28 +68,5 @@ { "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 e6559b3..a4c267f 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json @@ -14,6 +14,28 @@ } } ], + "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" @@ -27,27 +49,5 @@ "effectivePeriod": { "start": "2021-07-04" }, - "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" - } - } - ] - } - ] + "dateAsserted": "2021-07-03" } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json index 01d6385..4c60567 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json @@ -6,6 +6,30 @@ "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" @@ -20,29 +44,5 @@ "start": "2024-01-22", "end": "2024-02-26" }, - "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" - } - } - ] - } - ] + "dateAsserted": "2024-01-17" } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json index ae04d1d..e3c6efa 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation4.json @@ -6,6 +6,28 @@ "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": [ @@ -25,27 +47,5 @@ "effectivePeriod": { "start": "2024-01-22" }, - "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" - } - } - ] - } - ] + "dateAsserted": "2024-02-16" } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json index 2bf540b..13fce6d 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation5.json @@ -6,6 +6,31 @@ "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": [ @@ -25,30 +50,5 @@ "effectivePeriod": { "start": "2024-02-06" }, - "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" - } - } - ] - } - ] + "dateAsserted": "2024-01-31" } diff --git a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json index e875441..c4d53e4 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json @@ -6,6 +6,27 @@ "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": [ @@ -30,26 +51,5 @@ { "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 8088e38..91235d3 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json @@ -6,6 +6,27 @@ "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": [ @@ -30,26 +51,5 @@ { "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 dca3223..e7d2560 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json @@ -6,6 +6,27 @@ "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": [ @@ -30,26 +51,5 @@ { "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 c733adb..b44c8aa 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json @@ -6,6 +6,27 @@ "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": [ @@ -30,26 +51,5 @@ { "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 c427ab6..c371693 100644 --- a/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json +++ b/Resources/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json @@ -6,6 +6,27 @@ "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": [ @@ -30,26 +51,5 @@ { "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-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json index df118ea..86ec9c0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "MedicationQuantity", "url": "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity", + "version": "4.0.0-rc", "name": "MedicationQuantity", "title": "Medication Quantity", "status": "draft", @@ -29,17 +30,14 @@ "id": "Quantity.system", "path": "Quantity.system", "min": 1, + "patternUri": "http://unitsofmeasure.org", "mustSupport": true }, { "id": "Quantity.code", "path": "Quantity.code", "min": 1, - "mustSupport": true, - "binding": { - "strength": "required", - "valueSet": "https://gematik.de/fhir/isik/ValueSet/UcumUndSctDoseFormVS" - } + "mustSupport": true } ] } diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json index 2cac043..c653221 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json @@ -4,10 +4,10 @@ "name": "ISiKMedikationsart", "id": "ISiKMedikationsartVS", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/ISiKMedikationsartVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ diff --git a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json index d8616b8..bbb0aa6 100644 --- a/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json +++ b/Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json @@ -4,10 +4,10 @@ "name": "SctRouteOfAdministration", "id": "SctRouteOfAdministration", "description": "Enthaelt alle SNOMED CT Administrationsarten", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/SctRouteOfAdministration", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ diff --git a/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json b/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json index 4567ce3..5caecce 100644 --- a/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json +++ b/Resources/fsh-generated/resources/ValueSet-UcumUndSctDoseFormVS.json @@ -4,11 +4,11 @@ "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", + "description": "ValueSet zur Abbildung von kodierten Dosierinformationen. Bestehend aus UCUM Codes & SnomedCT Unit Dose Concepten", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/ValueSet/UcumUndSctDoseFormVS", "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "compose": { "include": [ @@ -18,7 +18,7 @@ { "property": "concept", "op": "is-a", - "value": "732935002" + "value": "408102007" } ] }, diff --git a/Resources/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh index 657b5b1..c22dd9c 100644 --- a/Resources/input/fsh/ISiKMedikament.fsh +++ b/Resources/input/fsh/ISiKMedikament.fsh @@ -165,8 +165,8 @@ Usage: #example * denominator * unit = "Tablette" * value = 1 - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 * ingredient[1] * itemCodeableConcept.coding * system = $cs-pzn @@ -182,8 +182,8 @@ Usage: #example * denominator * unit = "Tablette" * value = 1 - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 Instance: ExampleISiKMedikament5 InstanceOf: ISiKMedikament @@ -205,8 +205,8 @@ Usage: #example * denominator * unit = "Tablette" * value = 1 - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 * ingredient[1] * itemCodeableConcept.coding * system = $cs-atc-de @@ -222,8 +222,8 @@ Usage: #example * denominator * unit = "Tablette" * value = 1 - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 Instance: ExampleISiKMedikament6 InstanceOf: ISiKMedikament diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh index a10bf47..c278860 100644 --- a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh @@ -105,8 +105,8 @@ Usage: #example * dose * value = 1 * unit = "Tablette" - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 Instance: ExampleISiKMedikationsVerabreichung2 InstanceOf: ISiKMedikationsVerabreichung @@ -120,5 +120,5 @@ Usage: #example * dose * value = 1 * unit = "Beutel" - * system = $cs-sct - * code = #733013000 + * system = $cs-ucum + * code = #1 diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh index 2e04574..d7660b4 100644 --- a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh +++ b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh @@ -231,8 +231,8 @@ Usage: #example * doseAndRate.doseQuantity * value = 1 * unit = "Brausetablette" - * system = $cs-sct - * code = #732936001 + * system = $cs-ucum + * code = #1 Instance: ExampleISiKMedikationsVerordnung2 InstanceOf: ISiKMedikationsVerordnung diff --git a/Resources/input/fsh/dataTypeProfiles.fsh b/Resources/input/fsh/dataTypeProfiles.fsh index 1de3808..d007b6e 100644 --- a/Resources/input/fsh/dataTypeProfiles.fsh +++ b/Resources/input/fsh/dataTypeProfiles.fsh @@ -6,5 +6,5 @@ Description: "Quantity Datentyp der UcumUndSctDoseFormVS vorgibt. Bei Dimensions * value 1..1 MS * unit MS * system 1..1 MS +* system = $cs-ucum * code 1..1 MS -* code from UcumUndSctDoseFormVS \ No newline at end of file