Commit from GitHub Actions (CI (FHIR Validation))

gematik · Nov 25, 2023 · 1b863a6 · 1b863a6
1 parent ce6dfad
commit 1b863a6
Show file tree

Hide file tree

Showing 16 changed files with 148 additions and 215 deletions.
diff --git a/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json b/Resources/fsh-generated/resources/Observation-ISiKAtemfrequenzExample.json
@@ -31,8 +31,8 @@
   },
   "valueQuantity": {
     "system": "http://unitsofmeasure.org",
-    "code": "/min",
     "value": 26,
+    "code": "/min",
     "unit": "Atemzüge pro Minute"
   },
   "status": "final",

diff --git a/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json b/Resources/fsh-generated/resources/Observation-ISiKBlutdruckExample.json
@@ -40,8 +40,8 @@
       },
       "valueQuantity": {
         "system": "http://unitsofmeasure.org",
-        "code": "mm[Hg]",
         "value": 107,
+        "code": "mm[Hg]",
         "unit": "mmHg"
       }
     },
@@ -56,8 +56,8 @@
       },
       "valueQuantity": {
         "system": "http://unitsofmeasure.org",
-        "code": "mm[Hg]",
         "value": 60,
+        "code": "mm[Hg]",
         "unit": "mmHg"
       }
     }

diff --git a/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json b/Resources/fsh-generated/resources/Observation-ISiKGCSExample.json
@@ -44,8 +44,8 @@
       },
       "valueQuantity": {
         "system": "http://unitsofmeasure.org",
-        "code": "1",
         "value": 4,
+        "code": "1",
         "unit": "Punktwert"
       }
     },
@@ -60,8 +60,8 @@
       },
       "valueQuantity": {
         "system": "http://unitsofmeasure.org",
-        "code": "1",
         "value": 4,
+        "code": "1",
         "unit": "Punktwert"
       }
     },
@@ -76,8 +76,8 @@
       },
       "valueQuantity": {
         "system": "http://unitsofmeasure.org",
-        "code": "1",
         "value": 3,
+        "code": "1",
         "unit": "Punktwert"
       }
     }

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",
-    "code": "/min",
     "value": 63,
+    "code": "/min",
     "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",
-    "code": "Cel",
     "value": 36.8,
+    "code": "Cel",
     "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",
-    "code": "%",
     "value": 98,
+    "code": "%",
     "unit": "%"
   },
   "component": [

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json
@@ -90,34 +90,28 @@
         "mustSupport": true
       },
       {
-        "id": "Observation.value[x]:valueQuantity",
-        "path": "Observation.value[x]",
-        "sliceName": "valueQuantity",
-        "type": [
-          {
-            "code": "Quantity"
-          }
-        ],
+        "id": "Observation.valueQuantity",
+        "path": "Observation.valueQuantity",
         "mustSupport": true
       },
       {
-        "id": "Observation.value[x]:valueQuantity.value",
-        "path": "Observation.value[x].value",
+        "id": "Observation.valueQuantity.value",
+        "path": "Observation.valueQuantity.value",
         "mustSupport": true
       },
       {
-        "id": "Observation.value[x]:valueQuantity.unit",
-        "path": "Observation.value[x].unit",
+        "id": "Observation.valueQuantity.unit",
+        "path": "Observation.valueQuantity.unit",
         "mustSupport": true
       },
       {
-        "id": "Observation.value[x]:valueQuantity.system",
-        "path": "Observation.value[x].system",
+        "id": "Observation.valueQuantity.system",
+        "path": "Observation.valueQuantity.system",
         "mustSupport": true
       },
       {
-        "id": "Observation.value[x]:valueQuantity.code",
-        "path": "Observation.value[x].code",
+        "id": "Observation.valueQuantity.code",
+        "path": "Observation.valueQuantity.code",
         "mustSupport": true
       }
     ]

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json
@@ -116,14 +116,8 @@
         "mustSupport": true
       },
       {
-        "id": "Observation.component:SystolicBP.value[x]:valueQuantity",
-        "path": "Observation.component.value[x]",
-        "sliceName": "valueQuantity",
-        "type": [
-          {
-            "code": "Quantity"
-          }
-        ],
+        "id": "Observation.component:SystolicBP.valueQuantity",
+        "path": "Observation.component.valueQuantity",
         "mustSupport": true
       },
       {
@@ -148,14 +142,8 @@
         "mustSupport": true
       },
       {
-        "id": "Observation.component:DiastolicBP.value[x]:valueQuantity",
-        "path": "Observation.component.value[x]",
-        "sliceName": "valueQuantity",
-        "type": [
-          {
-            "code": "Quantity"
-          }
-        ],
+        "id": "Observation.component:DiastolicBP.valueQuantity",
+        "path": "Observation.component.valueQuantity",
         "mustSupport": true
       }
     ]

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json
@@ -91,26 +91,43 @@
       {
         "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.value[x].origin",
-        "path": "Observation.component.value[x].origin",
+        "id": "Observation.component.valueSampledData",
+        "path": "Observation.component.valueSampledData",
+        "min": 1,
+        "max": "1",
         "mustSupport": true
       },
       {
-        "id": "Observation.component.value[x].period",
-        "path": "Observation.component.value[x].period",
+        "id": "Observation.component.valueSampledData.origin",
+        "path": "Observation.component.valueSampledData.origin",
         "mustSupport": true
       },
       {
-        "id": "Observation.component.value[x].dimensions",
-        "path": "Observation.component.value[x].dimensions",
+        "id": "Observation.component.valueSampledData.period",
+        "path": "Observation.component.valueSampledData.period",
         "mustSupport": true
       },
       {
-        "id": "Observation.component.value[x].data",
-        "path": "Observation.component.value[x].data",
+        "id": "Observation.component.valueSampledData.dimensions",
+        "path": "Observation.component.valueSampledData.dimensions",
+        "mustSupport": true
+      },
+      {
+        "id": "Observation.component.valueSampledData.data",
+        "path": "Observation.component.valueSampledData.data",
         "mustSupport": true
       }
     ]