fix: MS für GCS Slices, changed cardinality of components to 0..1 (in…

… de.basisprofil.r4) closes #133
gematik · Dec 8, 2023 · d1dc573 · d1dc573
1 parent 2011c4c
commit d1dc573
Show file tree

Hide file tree

Showing 26 changed files with 277 additions and 204 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
       }
     ]