Skip to content

Commit

Permalink
fix: added 1.. to ISiKMedikament.ingredient.strength.denominator
Browse files Browse the repository at this point in the history
  • Loading branch information
@patrick-werner
patrick-werner committed Jun 26, 2024
1 parent a787d95 commit 91ae2cf
Show file tree
Hide file tree
Showing 8 changed files with 76 additions and 56 deletions.
82 changes: 49 additions & 33 deletions Resources/fsh-generated/fsh-index.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -373,7 +389,7 @@
"fshType": "Profile",
"fshFile": "ISiKMedikationsInformation.fsh",
"startLine": 1,
"endLine": 222
"endLine": 224
},
{
"outputFile": "StructureDefinition-ISiKMedikationsListe.json",
Expand All @@ -389,15 +405,15 @@
"fshType": "Profile",
"fshFile": "ISiKMedikationsVerabreichung.fsh",
"startLine": 1,
"endLine": 94
"endLine": 96
},
{
"outputFile": "StructureDefinition-ISiKMedikationsVerordnung.json",
"fshName": "ISiKMedikationsVerordnung",
"fshType": "Profile",
"fshFile": "ISiKMedikationsVerordnung.fsh",
"startLine": 1,
"endLine": 210
"endLine": 212
},
{
"outputFile": "StructureDefinition-MedicationQuantity.json",
Expand Down
38 changes: 20 additions & 18 deletions Resources/fsh-generated/fsh-index.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion Resources/fsh-generated/resources/CodeSystem-ISiKMedikationsartCS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
{
Expand All @@ -18,7 +19,6 @@
],
"experimental": false,
"publisher": "gematik GmbH",
"version": "4.0.0-rc",
"date": "2024-04-04",
"count": 2
}
1 change: 1 addition & 0 deletions Resources/fsh-generated/resources/StructureDefinition-ISiKMedikament.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,7 @@
{
"id": "Medication.ingredient.strength.denominator",
"path": "Medication.ingredient.strength.denominator",
"min": 1,
"type": [
{
"code": "Quantity",
Expand Down
1 change: 1 addition & 0 deletions Resources/fsh-generated/resources/StructureDefinition-MedicationQuantity.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion Resources/fsh-generated/resources/ValueSet-ISiKMedikationsartVS.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
2 changes: 1 addition & 1 deletion Resources/fsh-generated/resources/ValueSet-SctRouteOfAdministration.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
4 changes: 2 additions & 2 deletions Resources/input/fsh/ISiKMedikament.fsh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 91ae2cf

Please sign in to comment.