From 91ae2cf4f5f377753235bf294e3db6fadbc6e107 Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Wed, 26 Jun 2024 13:06:01 +0200 Subject: [PATCH] fix: added 1.. to ISiKMedikament.ingredient.strength.denominator --- Resources/fsh-generated/fsh-index.json | 82 +++++++++++-------- Resources/fsh-generated/fsh-index.txt | 38 +++++---- .../CodeSystem-ISiKMedikationsartCS.json | 2 +- .../StructureDefinition-ISiKMedikament.json | 1 + ...tructureDefinition-MedicationQuantity.json | 1 + .../ValueSet-ISiKMedikationsartVS.json | 2 +- .../ValueSet-SctRouteOfAdministration.json | 2 +- Resources/input/fsh/ISiKMedikament.fsh | 4 +- 8 files changed, 76 insertions(+), 56 deletions(-) diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json index 4d46f806..cf026ccc 100644 --- a/Resources/fsh-generated/fsh-index.json +++ b/Resources/fsh-generated/fsh-index.json @@ -156,120 +156,136 @@ "fshName": "ExampleISiKMedikationsVerabreichung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 96, - "endLine": 109 + "startLine": 98, + "endLine": 111 }, { "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json", "fshName": "ExampleISiKMedikationsVerabreichung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerabreichung.fsh", - "startLine": 111, - "endLine": 124 + "startLine": 113, + "endLine": 126 + }, + { + "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json", + "fshName": "ExampleISiKMedikationsVerabreichung3", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerabreichung.fsh", + "startLine": 128, + "endLine": 151 + }, + { + "outputFile": "MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json", + "fshName": "ExampleISiKMedikationsVerabreichung4", + "fshType": "Instance", + "fshFile": "ISiKMedikationsVerabreichung.fsh", + "startLine": 153, + "endLine": 182 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung.json", "fshName": "ExampleISiKMedikationsVerordnung", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 212, - "endLine": 235 + "startLine": 214, + "endLine": 237 }, { "outputFile": "MedicationRequest-ExampleISiKMedikationsVerordnung2.json", "fshName": "ExampleISiKMedikationsVerordnung2", "fshType": "Instance", "fshFile": "ISiKMedikationsVerordnung.fsh", - "startLine": 237, - "endLine": 260 + "startLine": 239, + "endLine": 262 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation1.json", "fshName": "ExampleISiKMedikationsInformation1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 224, - "endLine": 247 + "startLine": 226, + "endLine": 249 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation2.json", "fshName": "ExampleISiKMedikationsInformation2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 249, - "endLine": 269 + "startLine": 251, + "endLine": 271 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation3.json", "fshName": "ExampleISiKMedikationsInformation3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 271, - "endLine": 294 + "startLine": 273, + "endLine": 296 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation4.json", "fshName": "ExampleISiKMedikationsInformation4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 297, - "endLine": 316 + "startLine": 299, + "endLine": 318 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation5.json", "fshName": "ExampleISiKMedikationsInformation5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 319, - "endLine": 341 + "startLine": 321, + "endLine": 343 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformation6.json", "fshName": "ExampleISiKMedikationsInformation6", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 344, - "endLine": 360 + "startLine": 346, + "endLine": 362 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json", "fshName": "ExampleISiKMedikationsInformationParkinson1", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 363, - "endLine": 385 + "startLine": 365, + "endLine": 387 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json", "fshName": "ExampleISiKMedikationsInformationParkinson2", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 388, - "endLine": 408 + "startLine": 390, + "endLine": 410 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json", "fshName": "ExampleISiKMedikationsInformationParkinson3", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 411, - "endLine": 440 + "startLine": 413, + "endLine": 442 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json", "fshName": "ExampleISiKMedikationsInformationParkinson4", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 443, - "endLine": 463 + "startLine": 445, + "endLine": 465 }, { "outputFile": "MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json", "fshName": "ExampleISiKMedikationsInformationParkinson5", "fshType": "Instance", "fshFile": "ISiKMedikationsInformation.fsh", - "startLine": 466, - "endLine": 485 + "startLine": 468, + "endLine": 487 }, { "outputFile": "Patient-PatientinMusterfrau.json", @@ -373,7 +389,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsInformation.fsh", "startLine": 1, - "endLine": 222 + "endLine": 224 }, { "outputFile": "StructureDefinition-ISiKMedikationsListe.json", @@ -389,7 +405,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerabreichung.fsh", "startLine": 1, - "endLine": 94 + "endLine": 96 }, { "outputFile": "StructureDefinition-ISiKMedikationsVerordnung.json", @@ -397,7 +413,7 @@ "fshType": "Profile", "fshFile": "ISiKMedikationsVerordnung.fsh", "startLine": 1, - "endLine": 210 + "endLine": 212 }, { "outputFile": "StructureDefinition-MedicationQuantity.json", diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt index a26ce6d1..44bf7706 100644 --- a/Resources/fsh-generated/fsh-index.txt +++ b/Resources/fsh-generated/fsh-index.txt @@ -18,21 +18,23 @@ Medication-ExampleISiKMedikament6.json Example Medication-ExampleISiKMedikament7.json ExampleISiKMedikament7 Instance ISiKMedikament.fsh 240 - 273 Medication-ExampleISiKMedikament8.json ExampleISiKMedikament8 Instance ISiKMedikament.fsh 275 - 317 Medication-ExampleISiKMedikament9.json ExampleISiKMedikament9 Instance ISiKMedikament.fsh 319 - 361 -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 +MedicationAdministration-ExampleISiKMedikationsVerabreichung.json ExampleISiKMedikationsVerabreichung Instance ISiKMedikationsVerabreichung.fsh 98 - 111 +MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json ExampleISiKMedikationsVerabreichung2 Instance ISiKMedikationsVerabreichung.fsh 113 - 126 +MedicationAdministration-ExampleISiKMedikationsVerabreichung3.json ExampleISiKMedikationsVerabreichung3 Instance ISiKMedikationsVerabreichung.fsh 128 - 151 +MedicationAdministration-ExampleISiKMedikationsVerabreichung4.json ExampleISiKMedikationsVerabreichung4 Instance ISiKMedikationsVerabreichung.fsh 153 - 182 +MedicationRequest-ExampleISiKMedikationsVerordnung.json ExampleISiKMedikationsVerordnung Instance ISiKMedikationsVerordnung.fsh 214 - 237 +MedicationRequest-ExampleISiKMedikationsVerordnung2.json ExampleISiKMedikationsVerordnung2 Instance ISiKMedikationsVerordnung.fsh 239 - 262 +MedicationStatement-ExampleISiKMedikationsInformation1.json ExampleISiKMedikationsInformation1 Instance ISiKMedikationsInformation.fsh 226 - 249 +MedicationStatement-ExampleISiKMedikationsInformation2.json ExampleISiKMedikationsInformation2 Instance ISiKMedikationsInformation.fsh 251 - 271 +MedicationStatement-ExampleISiKMedikationsInformation3.json ExampleISiKMedikationsInformation3 Instance ISiKMedikationsInformation.fsh 273 - 296 +MedicationStatement-ExampleISiKMedikationsInformation4.json ExampleISiKMedikationsInformation4 Instance ISiKMedikationsInformation.fsh 299 - 318 +MedicationStatement-ExampleISiKMedikationsInformation5.json ExampleISiKMedikationsInformation5 Instance ISiKMedikationsInformation.fsh 321 - 343 +MedicationStatement-ExampleISiKMedikationsInformation6.json ExampleISiKMedikationsInformation6 Instance ISiKMedikationsInformation.fsh 346 - 362 +MedicationStatement-ExampleISiKMedikationsInformationParkinson1.json ExampleISiKMedikationsInformationParkinson1 Instance ISiKMedikationsInformation.fsh 365 - 387 +MedicationStatement-ExampleISiKMedikationsInformationParkinson2.json ExampleISiKMedikationsInformationParkinson2 Instance ISiKMedikationsInformation.fsh 390 - 410 +MedicationStatement-ExampleISiKMedikationsInformationParkinson3.json ExampleISiKMedikationsInformationParkinson3 Instance ISiKMedikationsInformation.fsh 413 - 442 +MedicationStatement-ExampleISiKMedikationsInformationParkinson4.json ExampleISiKMedikationsInformationParkinson4 Instance ISiKMedikationsInformation.fsh 445 - 465 +MedicationStatement-ExampleISiKMedikationsInformationParkinson5.json ExampleISiKMedikationsInformationParkinson5 Instance ISiKMedikationsInformation.fsh 468 - 487 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 @@ -45,10 +47,10 @@ StructureDefinition-ISiKAMTSBewertung.json ISiKAMT StructureDefinition-ISiKMedikament.json ISiKMedikament Profile ISiKMedikament.fsh 1 - 95 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-ISiKMedikationsInformation.json ISiKMedikationsInformation Profile ISiKMedikationsInformation.fsh 1 - 224 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-ISiKMedikationsVerabreichung.json ISiKMedikationsVerabreichung Profile ISiKMedikationsVerabreichung.fsh 1 - 96 +StructureDefinition-ISiKMedikationsVerordnung.json ISiKMedikationsVerordnung Profile ISiKMedikationsVerordnung.fsh 1 - 212 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 diff --git a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json index c96e8087..0f7234bf 100644 --- a/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json +++ b/Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json @@ -5,6 +5,7 @@ "name": "ISiKMedikationsart", "id": "ISiKMedikationsartCS", "description": "ISiK Therapiearten für Medikation", + "version": "4.0.0-rc", "url": "https://gematik.de/fhir/isik/CodeSystem/ISiKMedikationsartCS", "concept": [ { @@ -18,7 +19,6 @@ ], "experimental": false, "publisher": "gematik GmbH", - "version": "4.0.0-rc", "date": "2024-04-04", "count": 2 } diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json index ed200468..e397b477 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json @@ -417,6 +417,7 @@ { "id": "Medication.ingredient.strength.denominator", "path": "Medication.ingredient.strength.denominator", + "min": 1, "type": [ { "code": "Quantity", diff --git a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json index 21dbbb46..86ec9c02 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json +++ b/Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json @@ -2,6 +2,7 @@ "resourceType": "StructureDefinition", "id": "MedicationQuantity", "url": "https://gematik.de/fhir/isik/StructureDefinition/MedicationQuantity", + "version": "4.0.0-rc", "name": "MedicationQuantity", "title": "Medication Quantity", "status": "draft", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json b/Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json index 2cac043c..c6532214 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 d8616b8d..bbb0aa62 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/input/fsh/ISiKMedikament.fsh b/Resources/input/fsh/ISiKMedikament.fsh index e5c68dab..f72e617c 100644 --- a/Resources/input/fsh/ISiKMedikament.fsh +++ b/Resources/input/fsh/ISiKMedikament.fsh @@ -83,9 +83,9 @@ Description: "Dieses Profil ermöglicht die Abbildung von patientenunabhängigen * ^short = "handelt es sich um einen aktiven Bestandteil?" * strength MS * ^short = "Stärke" - * numerator 1..1 MS + * numerator 1.. MS * numerator only MedicationQuantity - * denominator MS + * denominator 1.. MS * denominator only MedicationQuantity * batch MS * ^short = "Angaben zur Charge"