Merge pull request #177 from gematik/TC_3.0.4

Tc 3.0.4
gematik · Nov 20, 2024 · 5a3972a · 5a3972a
2 parents a93ccfb + 5f71b88
commit 5a3972a
Show file tree

Hide file tree

Showing 21 changed files with 223 additions and 65 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
       # Java and .NET are already installed on ubuntu-latest
 
       - name: Firely.Terminal (GitHub Actions)
-        uses: FirelyTeam/[email protected].1
+        uses: FirelyTeam/[email protected].3
         with:
           PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
           #PATH_TO_EXAMPLES: Examples
@@ -46,7 +46,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 3.9.0
+          SUSHI_VERSION: 3.12.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md
@@ -1,9 +1,9 @@
 <img src="https://raw.githubusercontent.com/gematik/spec-ISiK-Vitalparameter-und-Koerpermasze/main-stufe-3/Material/images/Gematik_Logo_Flag.svg" alt="gematik logo" width="400"/>
 
 ----
-Version: 3.0.3
+Version: 3.0.4
 
-Datum: 08.05.2024
+Datum: 20.11.2024
 
 Status: Aktiv
 

diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -36,8 +36,8 @@
     "fshName": "ISiKEkgExample",
     "fshType": "Instance",
     "fshFile": "ISiK-Ekg.fsh",
-    "startLine": 21,
-    "endLine": 45
+    "startLine": 38,
+    "endLine": 62
   },
   {
     "outputFile": "Observation-ISiKGCSExample.json",
@@ -124,8 +124,8 @@
     "fshName": "ISiKEkg",
     "fshType": "Profile",
     "fshFile": "ISiK-Ekg.fsh",
-    "startLine": 1,
-    "endLine": 19
+    "startLine": 17,
+    "endLine": 36
   },
   {
     "outputFile": "StructureDefinition-ISiKGCS.json",
@@ -182,5 +182,13 @@
     "fshFile": "ISiK-Sauerstoffsaettigung.fsh",
     "startLine": 1,
     "endLine": 17
+  },
+  {
+    "outputFile": "ValueSet-EkgAbleitungenVS.json",
+    "fshName": "EkgAbleitungenVS",
+    "fshType": "ValueSet",
+    "fshFile": "ISiK-Ekg.fsh",
+    "startLine": 64,
+    "endLine": 82
   }
 ]
diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -3,7 +3,7 @@ CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json  ISiK-ca
 Device-ExampleDevice.json                                                ExampleDevice                                   Instance  instances.fsh                  14 - 17
 Observation-ISiKAtemfrequenzExample.json                                 ISiKAtemfrequenzExample                         Instance  ISiK-Atemfrequenz.fsh          19 - 30
 Observation-ISiKBlutdruckExample.json                                    ISiKBlutdruckExample                            Instance  ISiK-Blutdruck.fsh             27 - 44
-Observation-ISiKEkgExample.json                                          ISiKEkgExample                                  Instance  ISiK-Ekg.fsh                   21 - 45
+Observation-ISiKEkgExample.json                                          ISiKEkgExample                                  Instance  ISiK-Ekg.fsh                   38 - 62
 Observation-ISiKGCSExample.json                                          ISiKGCSExample                                  Instance  ISiK-GCS.fsh                   25 - 39
 Observation-ISiKHerzfrequenzExample.json                                 ISiKHerzfrequenzExample                         Instance  ISiK-Herzfrequenz.fsh          19 - 30
 Observation-ISiKKoerpergewichtExample.json                               ISiKKoerpergewichtExample                       Instance  ISiK-Koerpergewicht.fsh        19 - 31
@@ -14,11 +14,12 @@ Observation-ISiKSauerstoffsaettigungExample.json                         ISiKSau
 Patient-PatientinMusterfrau.json                                         PatientinMusterfrau                             Instance  instances.fsh                  1 - 12
 StructureDefinition-ISiKAtemfrequenz.json                                ISiKAtemfrequenz                                Profile   ISiK-Atemfrequenz.fsh          1 - 17
 StructureDefinition-ISiKBlutdruck.json                                   ISiKBlutdruck                                   Profile   ISiK-Blutdruck.fsh             1 - 25
-StructureDefinition-ISiKEkg.json                                         ISiKEkg                                         Profile   ISiK-Ekg.fsh                   1 - 19
+StructureDefinition-ISiKEkg.json                                         ISiKEkg                                         Profile   ISiK-Ekg.fsh                   17 - 36
 StructureDefinition-ISiKGCS.json                                         ISiKGCS                                         Profile   ISiK-GCS.fsh                   1 - 23
 StructureDefinition-ISiKHerzfrequenz.json                                ISiKHerzfrequenz                                Profile   ISiK-Herzfrequenz.fsh          1 - 17
 StructureDefinition-ISiKKoerpergewicht.json                              ISiKKoerpergewicht                              Profile   ISiK-Koerpergewicht.fsh        1 - 17
 StructureDefinition-ISiKKoerpergroesse.json                              ISiKKoerpergroesse                              Profile   ISiK-Koerpergroesse.fsh        1 - 17
 StructureDefinition-ISiKKoerpertemperatur.json                           ISiKKoerpertemperatur                           Profile   ISiK-Koerpertemperatur.fsh     1 - 17
 StructureDefinition-ISiKKopfumfang.json                                  ISiKKopfumfang                                  Profile   ISiK-Kopfumfang.fsh            1 - 17
-StructureDefinition-ISiKSauerstoffsaettigung.json                        ISiKSauerstoffsaettigung                        Profile   ISiK-Sauerstoffsaettigung.fsh  1 - 17
+StructureDefinition-ISiKSauerstoffsaettigung.json                        ISiKSauerstoffsaettigung                        Profile   ISiK-Sauerstoffsaettigung.fsh  1 - 17
+ValueSet-EkgAbleitungenVS.json                                           EkgAbleitungenVS                                ValueSet  ISiK-Ekg.fsh                   64 - 82
diff --git a/...nerated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json b/...nerated/resources/CapabilityStatement-ISiK-capabilityStatement-vitalparameter-server.json
@@ -4,11 +4,11 @@
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/CapabilityStatement/vitalparameter-server",
   "status": "active",
   "experimental": false,
-  "version": "3.0.3",
+  "version": "3.0.4",
   "publisher": "gematik GmbH",
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.3"
+    "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ImplementationGuide|3.0.4"
   ],
   "name": "ISiKCapabilityStatementVitalparameterServer",
   "title": "ISiK CapabilityStatement Vitalparameter Server",

diff --git a/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json b/Resources/fsh-generated/resources/Observation-ISiKEkgExample.json
@@ -10,9 +10,9 @@
   "code": {
     "coding": [
       {
-        "system": "http://loinc.org",
         "code": "LP6244-0",
-        "display": "Electrocardiogram (EKG)"
+        "system": "http://loinc.org",
+        "display": "EKG study"
       }
     ]
   },
@@ -39,8 +39,8 @@
       "code": {
         "coding": [
           {
-            "code": "LP7386-8",
-            "system": "http://loinc.org",
+            "code": "272729005",
+            "system": "http://snomed.info/sct",
             "display": "Lead I"
           }
         ]
@@ -58,8 +58,8 @@
       "code": {
         "coding": [
           {
-            "code": "LP7386-6",
-            "system": "http://loinc.org",
+            "code": "272730000",
+            "system": "http://snomed.info/sct",
             "display": "Lead II"
           }
         ]
@@ -77,8 +77,8 @@
       "code": {
         "coding": [
           {
-            "code": "LP7386-4",
-            "system": "http://loinc.org",
+            "code": "272731001",
+            "system": "http://snomed.info/sct",
             "display": "Lead III"
           }
         ]

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKAtemfrequenz.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKAtemfrequenz",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKAtemfrequenz",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKAtemfrequenz",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKBlutdruck.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBlutdruck",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKBlutdruck",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKBlutdruck",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKEkg.json
@@ -2,17 +2,17 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKEkg",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKEkg",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKEkg",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",
   "abstract": false,
   "type": "Observation",
-  "baseDefinition": "http://fhir.de/StructureDefinition/observation-de-ekg",
+  "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Observation",
   "derivation": "constraint",
   "differential": {
     "element": [
@@ -24,16 +24,34 @@
       {
         "id": "Observation.category",
         "path": "Observation.category",
+        "min": 1,
         "mustSupport": true
       },
+      {
+        "id": "Observation.category.coding",
+        "path": "Observation.category.coding",
+        "patternCoding": {
+          "code": "procedure",
+          "system": "http://terminology.hl7.org/CodeSystem/observation-category"
+        }
+      },
       {
         "id": "Observation.code",
         "path": "Observation.code",
+        "patternCodeableConcept": {
+          "coding": [
+            {
+              "code": "11524-6",
+              "system": "http://loinc.org"
+            }
+          ]
+        },
         "mustSupport": true
       },
       {
         "id": "Observation.subject",
         "path": "Observation.subject",
+        "min": 1,
         "mustSupport": true
       },
       {
@@ -44,26 +62,50 @@
       {
         "id": "Observation.effective[x]",
         "path": "Observation.effective[x]",
+        "min": 1,
         "mustSupport": true
       },
+      {
+        "id": "Observation.value[x]",
+        "path": "Observation.value[x]",
+        "max": "0"
+      },
       {
         "id": "Observation.device",
         "path": "Observation.device",
+        "min": 1,
         "mustSupport": true
       },
       {
         "id": "Observation.component",
         "path": "Observation.component",
+        "min": 1,
         "mustSupport": true
       },
       {
         "id": "Observation.component.code",
         "path": "Observation.component.code",
-        "mustSupport": true
+        "mustSupport": true,
+        "binding": {
+          "strength": "extensible",
+          "valueSet": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/ValueSet/EkgAbleitungenVS",
+          "description": "Codes identifying the EKG lead"
+        }
+      },
+      {
+        "id": "Observation.component.code.coding",
+        "path": "Observation.component.code.coding",
+        "min": 1
       },
       {
         "id": "Observation.component.value[x]",
         "path": "Observation.component.value[x]",
+        "min": 1,
+        "type": [
+          {
+            "code": "SampledData"
+          }
+        ],
         "mustSupport": true
       },
       {
@@ -84,6 +126,7 @@
       {
         "id": "Observation.component.value[x].data",
         "path": "Observation.component.value[x].data",
+        "min": 1,
         "mustSupport": true
       }
     ]

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKGCS.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKGCS",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKGCS",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKGCS",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKHerzfrequenz.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKHerzfrequenz",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKHerzfrequenz",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKHerzfrequenz",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergewicht.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKoerpergewicht",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpergewicht",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKKoerpergewicht",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpergroesse.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKoerpergroesse",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpergroesse",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKKoerpergroesse",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKoerpertemperatur.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKoerpertemperatur",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKoerpertemperatur",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKKoerpertemperatur",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKopfumfang.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKopfumfang",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKKopfumfang",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKKopfumfang",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKSauerstoffsaettigung.json
@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKSauerstoffsaettigung",
   "url": "https://gematik.de/fhir/isik/v3/VitalparameterUndKoerpermasze/StructureDefinition/ISiKSauerstoffsaettigung",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "name": "ISiKSauerstoffsaettigung",
   "status": "active",
   "experimental": false,
-  "date": "2024-05-08",
+  "date": "2024-11-20",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "kind": "resource",