From d1dc573306027a745ece139c120d0d1c3116623e Mon Sep 17 00:00:00 2001 From: patrick-werner Date: Fri, 8 Dec 2023 10:47:53 +0100 Subject: [PATCH] =?UTF-8?q?fix:=20MS=20f=C3=BCr=20GCS=20Slices,=20changed?= =?UTF-8?q?=20cardinality=20of=20components=20to=200..1=20(in=20de.basispr?= =?UTF-8?q?ofil.r4)=20closes=20#133?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Observation-ISiKAtemfrequenzExample.json | 2 +- .../resources/Observation-ISiKGCSExample.json | 40 +++--- .../Observation-ISiKHerzfrequenzExample.json | 2 +- ...ervation-ISiKKoerpertemperaturExample.json | 2 +- ...ation-ISiKSauerstoffsaettigungExample.json | 2 +- .../StructureDefinition-ISiKAtemfrequenz.json | 30 +++-- .../StructureDefinition-ISiKBlutdruck.json | 24 +++- .../StructureDefinition-ISiKEkg.json | 33 ++--- .../StructureDefinition-ISiKGCS.json | 123 +++++++++++------- .../StructureDefinition-ISiKHerzfrequenz.json | 30 +++-- ...tructureDefinition-ISiKKoerpergewicht.json | 30 +++-- ...tructureDefinition-ISiKKoerpergroesse.json | 30 +++-- ...ctureDefinition-ISiKKoerpertemperatur.json | 30 +++-- .../StructureDefinition-ISiKKopfumfang.json | 30 +++-- ...reDefinition-ISiKSauerstoffsaettigung.json | 30 +++-- Resources/input/fsh/ISiK-Atemfrequenz.fsh | 2 +- Resources/input/fsh/ISiK-Blutdruck.fsh | 2 +- Resources/input/fsh/ISiK-GCS.fsh | 5 +- Resources/input/fsh/ISiK-Herzfrequenz.fsh | 2 +- Resources/input/fsh/ISiK-Koerpergewicht.fsh | 2 +- Resources/input/fsh/ISiK-Koerpergroesse.fsh | 2 +- .../input/fsh/ISiK-Koerpertemperatur.fsh | 2 +- Resources/input/fsh/ISiK-Kopfumfang.fsh | 2 +- .../input/fsh/ISiK-Sauerstoffsaettigung.fsh | 2 +- Resources/sushi-config.yaml | 2 +- package.json | 20 +-- 26 files changed, 277 insertions(+), 204 deletions(-) diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json index 0f844fc2..aafb1c3e 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json @@ -32,8 +32,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 26, "code": "/min", + "value": 26, "unit": "Atemzüge pro Minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json index f33580cb..d99f33c7 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json @@ -34,51 +34,51 @@ }, "component": [ { - "code": { - "coding": [ - { - "system": "http://loinc.org", - "code": "9267-6" - } - ] - }, "valueQuantity": { "system": "http://unitsofmeasure.org", "value": 4, "code": "1", "unit": "Punktwert" - } - }, - { + }, "code": { "coding": [ { - "system": "http://loinc.org", - "code": "9268-4" + "code": "9267-6", + "system": "http://loinc.org" } ] - }, + } + }, + { "valueQuantity": { "system": "http://unitsofmeasure.org", "value": 4, "code": "1", "unit": "Punktwert" - } - }, - { + }, "code": { "coding": [ { - "system": "http://loinc.org", - "code": "9270-0" + "code": "9268-4", + "system": "http://loinc.org" } ] - }, + } + }, + { "valueQuantity": { "system": "http://unitsofmeasure.org", "value": 3, "code": "1", "unit": "Punktwert" + }, + "code": { + "coding": [ + { + "code": "9270-0", + "system": "http://loinc.org" + } + ] } } ], diff --git a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json index 999c4701..062c554d 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKHerzfrequenzExample.json @@ -30,8 +30,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 63, "code": "/min", + "value": 63, "unit": "per minute" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json index 632a005c..1d3aa725 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKKoerpertemperaturExample.json @@ -30,8 +30,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 36.8, "code": "Cel", + "value": 36.8, "unit": "°C" }, "status": "final", diff --git a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json index 29fa0f54..73b7c75b 100644 --- a/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json +++ b/Resources/fsh-generated/resources/Observation-ISiKSauerstoffsaettigungExample.json @@ -39,8 +39,8 @@ }, "valueQuantity": { "system": "http://unitsofmeasure.org", - "value": 98, "code": "%", + "value": 98, "unit": "%" }, "component": [ diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json index 5c438d85..912c92b6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json index ebf5167a..3346c862 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -116,8 +116,14 @@ "mustSupport": true }, { - "id": "Observation.component:SystolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:SystolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { @@ -142,8 +148,14 @@ "mustSupport": true }, { - "id": "Observation.component:DiastolicBP.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:DiastolicBP.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json index b538000a..97cd9dc8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json @@ -91,43 +91,26 @@ { "id": "Observation.component.value[x]", "path": "Observation.component.value[x]", - "slicing": { - "discriminator": [ - { - "type": "type", - "path": "$this" - } - ], - "ordered": false, - "rules": "open" - }, "mustSupport": true }, { - "id": "Observation.component.valueSampledData", - "path": "Observation.component.valueSampledData", - "min": 1, - "max": "1", + "id": "Observation.component.value[x].origin", + "path": "Observation.component.value[x].origin", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.origin", - "path": "Observation.component.valueSampledData.origin", + "id": "Observation.component.value[x].period", + "path": "Observation.component.value[x].period", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.period", - "path": "Observation.component.valueSampledData.period", + "id": "Observation.component.value[x].dimensions", + "path": "Observation.component.value[x].dimensions", "mustSupport": true }, { - "id": "Observation.component.valueSampledData.dimensions", - "path": "Observation.component.valueSampledData.dimensions", - "mustSupport": true - }, - { - "id": "Observation.component.valueSampledData.data", - "path": "Observation.component.valueSampledData.data", + "id": "Observation.component.value[x].data", + "path": "Observation.component.value[x].data", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json index bbc61e24..ae604c34 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,23 +90,29 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true }, { @@ -125,29 +131,36 @@ "mustSupport": true }, { - "id": "Observation.component.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { "id": "Observation.component:Eye", "path": "Observation.component", - "sliceName": "Eye" + "sliceName": "Eye", + "mustSupport": true }, { "id": "Observation.component:Eye.code", @@ -160,29 +173,36 @@ "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Eye.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Eye.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Eye.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Eye.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Eye.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { "id": "Observation.component:Motor", "path": "Observation.component", - "sliceName": "Motor" + "sliceName": "Motor", + "mustSupport": true }, { "id": "Observation.component:Motor.code", @@ -195,29 +215,36 @@ "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Motor.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Motor.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Motor.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Motor.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Motor.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true }, { "id": "Observation.component:Verbal", "path": "Observation.component", - "sliceName": "Verbal" + "sliceName": "Verbal", + "mustSupport": true }, { "id": "Observation.component:Verbal.code", @@ -230,23 +257,29 @@ "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity", - "path": "Observation.component.valueQuantity", + "id": "Observation.component:Verbal.value[x]:valueQuantity", + "path": "Observation.component.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.unit", - "path": "Observation.component.valueQuantity.unit", + "id": "Observation.component:Verbal.value[x]:valueQuantity.unit", + "path": "Observation.component.value[x].unit", "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.system", - "path": "Observation.component.valueQuantity.system", + "id": "Observation.component:Verbal.value[x]:valueQuantity.system", + "path": "Observation.component.value[x].system", "mustSupport": true }, { - "id": "Observation.component:Verbal.valueQuantity.code", - "path": "Observation.component.valueQuantity.code", + "id": "Observation.component:Verbal.value[x]:valueQuantity.code", + "path": "Observation.component.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json index 57da1b5a..676bb780 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json index 800ac2fa..7552ffb9 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json index e4167537..c1606ba6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json index 14fb23f6..160d6820 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json index e5fd3778..7bf3a305 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json index 505b08aa..492bd064 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json @@ -59,9 +59,9 @@ "mustSupport": true }, { - "id": "Observation.category:vs-cat", + "id": "Observation.category:VSCat", "path": "Observation.category", - "sliceName": "vs-cat", + "sliceName": "VSCat", "mustSupport": true }, { @@ -90,28 +90,34 @@ "mustSupport": true }, { - "id": "Observation.valueQuantity", - "path": "Observation.valueQuantity", + "id": "Observation.value[x]:valueQuantity", + "path": "Observation.value[x]", + "sliceName": "valueQuantity", + "type": [ + { + "code": "Quantity" + } + ], "mustSupport": true }, { - "id": "Observation.valueQuantity.value", - "path": "Observation.valueQuantity.value", + "id": "Observation.value[x]:valueQuantity.value", + "path": "Observation.value[x].value", "mustSupport": true }, { - "id": "Observation.valueQuantity.unit", - "path": "Observation.valueQuantity.unit", + "id": "Observation.value[x]:valueQuantity.unit", + "path": "Observation.value[x].unit", "mustSupport": true }, { - "id": "Observation.valueQuantity.system", - "path": "Observation.valueQuantity.system", + "id": "Observation.value[x]:valueQuantity.system", + "path": "Observation.value[x].system", "mustSupport": true }, { - "id": "Observation.valueQuantity.code", - "path": "Observation.valueQuantity.code", + "id": "Observation.value[x]:valueQuantity.code", + "path": "Observation.value[x].code", "mustSupport": true } ] diff --git a/Resources/input/fsh/ISiK-Atemfrequenz.fsh b/Resources/input/fsh/ISiK-Atemfrequenz.fsh index 4af0a2fa..cc2bf7f9 100644 --- a/Resources/input/fsh/ISiK-Atemfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Atemfrequenz.fsh @@ -4,7 +4,7 @@ Id: ISiKAtemfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Blutdruck.fsh b/Resources/input/fsh/ISiK-Blutdruck.fsh index f3821b24..138794b0 100644 --- a/Resources/input/fsh/ISiK-Blutdruck.fsh +++ b/Resources/input/fsh/ISiK-Blutdruck.fsh @@ -4,7 +4,7 @@ Id: ISiKBlutdruck * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * code.coding MS * subject MS diff --git a/Resources/input/fsh/ISiK-GCS.fsh b/Resources/input/fsh/ISiK-GCS.fsh index 89a23c9e..b67956fe 100644 --- a/Resources/input/fsh/ISiK-GCS.fsh +++ b/Resources/input/fsh/ISiK-GCS.fsh @@ -4,7 +4,7 @@ Id: ISiKGCS * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS @@ -21,6 +21,9 @@ Id: ISiKGCS * component.valueQuantity.system MS * component.valueQuantity.code MS * component.valueQuantity.unit MS +* component[Eye] MS +* component[Motor] MS +* component[Verbal] MS Instance: ISiKGCSExample InstanceOf: ISiKGCS diff --git a/Resources/input/fsh/ISiK-Herzfrequenz.fsh b/Resources/input/fsh/ISiK-Herzfrequenz.fsh index 328e17b0..10bf486e 100644 --- a/Resources/input/fsh/ISiK-Herzfrequenz.fsh +++ b/Resources/input/fsh/ISiK-Herzfrequenz.fsh @@ -4,7 +4,7 @@ Id: ISiKHerzfrequenz * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Koerpergewicht.fsh b/Resources/input/fsh/ISiK-Koerpergewicht.fsh index d058da47..e2dbceaa 100644 --- a/Resources/input/fsh/ISiK-Koerpergewicht.fsh +++ b/Resources/input/fsh/ISiK-Koerpergewicht.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpergewicht * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Koerpergroesse.fsh b/Resources/input/fsh/ISiK-Koerpergroesse.fsh index 00a065f0..1e8636f3 100644 --- a/Resources/input/fsh/ISiK-Koerpergroesse.fsh +++ b/Resources/input/fsh/ISiK-Koerpergroesse.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpergroesse * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh index d125f404..2e29fd67 100644 --- a/Resources/input/fsh/ISiK-Koerpertemperatur.fsh +++ b/Resources/input/fsh/ISiK-Koerpertemperatur.fsh @@ -4,7 +4,7 @@ Id: ISiKKoerpertemperatur * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Kopfumfang.fsh b/Resources/input/fsh/ISiK-Kopfumfang.fsh index 9a7d44e5..8af8a478 100644 --- a/Resources/input/fsh/ISiK-Kopfumfang.fsh +++ b/Resources/input/fsh/ISiK-Kopfumfang.fsh @@ -4,7 +4,7 @@ Id: ISiKKopfumfang * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh index c965fb7d..ffeed4f3 100644 --- a/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh +++ b/Resources/input/fsh/ISiK-Sauerstoffsaettigung.fsh @@ -4,7 +4,7 @@ Id: ISiKSauerstoffsaettigung * insert Meta * status MS * category MS -* category[vs-cat] MS +* category[VSCat] MS * code MS * subject MS * encounter MS diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 10bd316a..d382660b 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -11,5 +11,5 @@ publisher: url: https://www.gematik.de/ email: ISiK@gematik.de dependencies: - de.basisprofil.r4: 1.4.0 + de.basisprofil.r4: 1.5.0-alpha2 de.gematik.isik-basismodul: 3.0.0 diff --git a/package.json b/package.json index f6680d5e..97c02676 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,12 @@ { - "name": "de.gematik.isik-vitalparameter", - "version": "3.0.0", - "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", - "fhirVersions": [ - "4.0.1" - ], - "dependencies": { - "de.basisprofil.r4": "1.4.0", - "de.gematik.isik-basismodul": "3.0.0" - } + "name": "de.gematik.isik-vitalparameter", + "version": "3.0.0", + "description": "Package Release des ISiK Modul Vitalparameter und Körpermaße", + "fhirVersions": [ + "4.0.1" + ], + "dependencies": { + "de.basisprofil.r4": "1.5.0-alpha2", + "de.gematik.isik-basismodul": "3.0.0" + } }