updated to latest sushi version

fixed all build warnings
reworked version, status, etc. via RuleSets

.github/workflows/main.yml

@@ -42,7 +42,7 @@ jobs:
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
           SUSHI_OPTIONS: Resources/
-          SUSHI_VERSION: 2.10.2
+          SUSHI_VERSION: 3.5.0
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 
       - name: Add & Commit

Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementBasisServer.json

@@ -2,9 +2,9 @@
   "resourceType": "CapabilityStatement",
   "id": "ISiKCapabilityStatementBasisServer",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/CapabilityStatement/basis-server",
+  "version": "2.0.6",
   "status": "active",
   "experimental": false,
-  "version": "2.0.5",
   "publisher": "gematik GmbH",
   "date": "2023-03-24",
   "implementationGuide": [

Resources/fsh-generated/resources/Encounter-Fachabteilungskontakt.json

@@ -10,16 +10,16 @@
     {
       "coding": [
         {
-          "code": "operation",
-          "system": "http://fhir.de/CodeSystem/kontaktart-de"
+          "code": "abteilungskontakt",
+          "system": "http://fhir.de/CodeSystem/Kontaktebene"
         }
       ]
     },
     {
       "coding": [
         {
-          "code": "abteilungskontakt",
-          "system": "http://fhir.de/CodeSystem/Kontaktebene"
+          "system": "http://fhir.de/CodeSystem/kontaktart-de",
+          "code": "operation"
         }
       ]
     }

Resources/fsh-generated/resources/Patient-PatientinMusterfrau.json

@@ -32,6 +32,7 @@
       "value": "A123456789"
     },
     {
+      "use": "secondary",
       "type": {
         "coding": [
           {
@@ -40,7 +41,6 @@
           }
         ]
       },
-      "use": "secondary",
       "value": "1234567890",
       "assigner": {
         "display": "Test PKV AG"

Resources/fsh-generated/resources/StructureDefinition-ISiKAbrechnungsfall.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKAbrechnungsfall",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAbrechnungsfall",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKAbrechnungsfall",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die Gruppierung von medizinischen Leistungen in ISiK-Szenarien",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKAngehoeriger.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKAngehoeriger",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKAngehoeriger",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKAngehoeriger",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von Angehörigen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtBundle.json

@@ -2,12 +2,12 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBerichtBundle",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtBundle",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBerichtBundle",
   "title": "ISiKBerichtBundle",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "A document style representation of the receipt (complete, self-contained, signed)",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKBerichtSubSysteme.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBerichtSubSysteme",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBerichtSubSysteme",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBerichtSubSysteme",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Krankenhaus-interne Übermittlung eines Berichtes in Form eines Dokumentes, die in ISiK Szenarien von Subsystemen an Primärsysteme gesendet werden.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKBinary.json

@@ -2,12 +2,12 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKBinary",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKBinary",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKBinary",
   "title": "ISiKBinary",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Die Binary-Ressource erlaubt den Umgang mit FHIR-fremden Formaten (z.B. PDFs, Bilder, CDA) innerhalb des FHIR-Frameworks.\r\nDazu werden die Daten base64-codiert in der Binary-Ressource (in XML oder JSON) transportiert oder \r\nüber die REST-API am Binary-Endpunkt in ihrem nativen Format bereitgestellt. \r\nBinary-Ressourcen werden von Attachment-Elementen in DocumentReference-Ressourcen verlinkt und damit in den Kontext anderer FHIR-Ressourcen\r\n(z.B. Patient und Encounter) gestellt.  ",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKCodeSystem.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKCodeSystem",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKCodeSystem",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKCodeSystem",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die maschinenlesbare Repräsentation von system-sepzifischen Kodierungen in ISiK-Szenarien",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKDiagnose.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKDiagnose",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKDiagnose",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKDiagnose",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von Diagnosen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",
@@ -275,8 +275,9 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod",
-        "path": "Condition.onsetPeriod",
+        "id": "Condition.onset[x]:onsetPeriod",
+        "path": "Condition.onset[x]",
+        "sliceName": "onsetPeriod",
         "min": 0,
         "max": "1",
         "type": [
@@ -286,8 +287,8 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod.start.extension:Lebensphase-Start",
-        "path": "Condition.onsetPeriod.start.extension",
+        "id": "Condition.onset[x]:onsetPeriod.start.extension:Lebensphase-Start",
+        "path": "Condition.onset[x].start.extension",
         "sliceName": "Lebensphase-Start",
         "min": 0,
         "max": "1",
@@ -301,8 +302,8 @@
         ]
       },
       {
-        "id": "Condition.onsetPeriod.end.extension:Lebensphase-Ende",
-        "path": "Condition.onsetPeriod.end.extension",
+        "id": "Condition.onset[x]:onsetPeriod.end.extension:Lebensphase-Ende",
+        "path": "Condition.onset[x].end.extension",
         "sliceName": "Lebensphase-Ende",
         "min": 0,
         "max": "1",
@@ -316,8 +317,9 @@
         ]
       },
       {
-        "id": "Condition.onsetDateTime",
-        "path": "Condition.onsetDateTime",
+        "id": "Condition.onset[x]:onsetDateTime",
+        "path": "Condition.onset[x]",
+        "sliceName": "onsetDateTime",
         "min": 0,
         "max": "1",
         "type": [

Resources/fsh-generated/resources/StructureDefinition-ISiKKontaktGesundheitseinrichtung.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKKontaktGesundheitseinrichtung",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKKontaktGesundheitseinrichtung",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKKontaktGesundheitseinrichtung",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Herstellung eines Fallbezuges welcher in der Mehrheit der ISiK Szenarien im Krankenhaus essentiell ist.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKPatient.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKPatient",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPatient",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKPatient",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die Nutzung von administrativen Patientendaten in ISiK-Szenarien.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKPersonImGesundheitsberuf.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKPersonImGesundheitsberuf",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKPersonImGesundheitsberuf",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKPersonImGesundheitsberuf",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Nutzung von in Gesundheitsberufen tätigen Personen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKProzedur.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKProzedur",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKProzedur",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKProzedur",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Diese Profil ermöglicht die Nutzung von Prozedur-bezogenen Informationen in ISiK Szenarien.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKValueSet.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKValueSet",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKValueSet",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKValueSet",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil beschreibt die maschinenlesbare Auswahl von Codes für die Kodierung spezifischer FHIR-Elemente in ISiK-Szenarien",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisGesetzlich.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKVersicherungsverhaeltnisGesetzlich",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisGesetzlich",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKVersicherungsverhaeltnisGesetzlich",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht die Darstellung eines gesetzlichen Versicherungsverhältnisses in ISiK Szenarien.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-ISiKVersicherungsverhaeltnisSelbstzahler.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKVersicherungsverhaeltnisSelbstzahler",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/StructureDefinition/ISiKVersicherungsverhaeltnisSelbstzahler",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "ISiKVersicherungsverhaeltnisSelbstzahler",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "description": "Dieses Profil ermöglicht Selbstzahler Szenarien in ISiK.",
   "fhirVersion": "4.0.1",

Resources/fsh-generated/resources/StructureDefinition-PlannedEndDate.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "PlannedEndDate",
   "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedEndDate",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "PlannedEndDate",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

Resources/fsh-generated/resources/StructureDefinition-PlannedStartDate.json

@@ -2,11 +2,11 @@
   "resourceType": "StructureDefinition",
   "id": "PlannedStartDate",
   "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Encounter.plannedStartDate",
-  "version": "2.0.5",
+  "version": "2.0.6",
   "name": "PlannedStartDate",
   "status": "active",
   "experimental": false,
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

Resources/fsh-generated/resources/ValueSet-DiagnosesSCT.json

@@ -4,11 +4,11 @@
   "name": "DiagnosesSCT",
   "id": "DiagnosesSCT",
   "description": "Enthaelt alle SNOMED Clinical finding, Event und Situation with explicit context codes",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/DiagnosesSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {

Resources/fsh-generated/resources/ValueSet-ISiKAccountType.json

@@ -4,11 +4,11 @@
   "name": "ISiKAccountType",
   "id": "ISiKAccountType",
   "title": "ISiKAccountType",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKAccountType",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {

Resources/fsh-generated/resources/ValueSet-ISiKLocationPhysicalType.json

@@ -3,11 +3,11 @@
   "status": "active",
   "name": "ISiKLocationPhysicalType",
   "id": "ISiKLocationPhysicalType",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ISiKLocationPhysicalType",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {

Resources/fsh-generated/resources/ValueSet-ProzedurenCodesSCT.json

@@ -4,11 +4,11 @@
   "name": "ProzedurenCodesSCT",
   "id": "ProzedurenCodesSCT",
   "description": "Enthaelt alle SNOMED Procedure Codes",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenCodesSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {

Resources/fsh-generated/resources/ValueSet-ProzedurenKategorieSCT.json

@@ -4,11 +4,11 @@
   "name": "ProzedurenKategorieSCT",
   "id": "ProzedurenKategorieSCT",
   "description": "Enthaelt alle SNOMED Codes für ein Mapping der OPS Klassentitel",
-  "version": "2.0.5",
   "url": "https://gematik.de/fhir/isik/v2/Basismodul/ValueSet/ProzedurenKategorieSCT",
+  "version": "2.0.6",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-03-24",
+  "date": "2023-07-01",
   "compose": {
     "include": [
       {