Merge pull request #68 from gematik/2.0.3

2.0.3
gematik · Mar 24, 2023 · e1ba4af · e1ba4af
2 parents 4c48bfd + 1c96ffa
commit e1ba4af
Show file tree

Hide file tree

Showing 20 changed files with 108 additions and 53 deletions.
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-Basismodul/master-isik-stufe-2/Material/Gematik_Logo_Flag.png" alt="gematik logo" width="400"/>
 
 ----
-Version: 2.0.2
+Version: 2.0.3
 
-Datum: 31.01.2023
+Datum: 24.03.2023
 
 Status: Aktiv
 

diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md
@@ -4,6 +4,28 @@ Im Rahmen der ISiK-Veröffentlichungen wird das [Semantic Versioning](https://se
 
 Die erste Ziffer X bezeichnet ein Major-Release und regelt die Gültigkeit von Releases. Die dritte Ziffer Y (Release x.0.y) bezeichnet eine technische Korrektur und versioniert kleinere Änderungen (Packages) während eines Jahres, z. B. 1.0.1.
 
+
+Version: 2.0.3
+
+Datum: 24.03.2023
+
+* enhancement: backport extension r5 by @f-peverali in https://github.com/gematik/spec-ISiK-Terminplanung/pull/61
+  * ISiKKalender - Harmonisierung mit den Empfehlungen der Basisprofile DE
+* quickfix: typo IG by @f-peverali in https://github.com/gematik/spec-ISiK-Terminplanung/pull/63
+
+
+**Full Changelog**: https://github.com/gematik/spec-ISiK-Terminplanung/compare/v2.0.2...v.2.0.3
+
+----
+Version: 2.0.2
+
+Datum: 31.01.2023
+
+- ISiKTerminblock
+  - Reference(Schedule) statt Reference(ISiKKalender). Reference-Element erweitert auf die Kernspezifikation (entspricht allgemeinem Design-Prinzip), damit die Profile auch außerhalb des ISiK-Kontextes nutzbar sind. 
+- Update Basismodul Dependency -> 2.0.4
+- weitere Änderungen an IG (informativ)
+
 ----
 Version: 2.0.2
 

diff --git a/...h-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json b/...h-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json
@@ -4,11 +4,11 @@
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/CapabilityStatement/terminplanung-server",
   "status": "active",
   "experimental": false,
-  "version": "2.0.2",
+  "version": "2.0.3",
   "publisher": "gematik GmbH",
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "implementationGuide": [
-    "https://gematik.de/fhir/isik/v2/Terminplanung/ImplementationGuide|2.0.2"
+    "https://gematik.de/fhir/isik/v2/Terminplanung/ImplementationGuide|2.0.3"
   ],
   "name": "ISiKCapabilityStatementTerminplanungServer",
   "title": "ISiK CapabilityStatement Terminplanung Server",

diff --git a/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json b/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json
@@ -3,9 +3,9 @@
   "id": "ISiKAppointmentBookOperation",
   "status": "active",
   "experimental": false,
-  "version": "2.0.2",
+  "version": "2.0.3",
   "publisher": "gematik GmbH",
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "name": "book",
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/OperationDefinition/AppointmentBook",
   "kind": "operation",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "AppointmentReplaces",
   "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Appointment.replaces",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "AppointmentReplaces",
   "status": "active",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalender",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKKalender",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [
@@ -49,16 +49,47 @@
         "mustSupport": true
       },
       {
-        "id": "Schedule.extension:Name",
+        "id": "Schedule.extension.extension",
+        "path": "Schedule.extension.extension",
+        "max": "0"
+      },
+      {
+        "id": "Schedule.extension.value[x]",
+        "path": "Schedule.extension.value[x]",
+        "slicing": {
+          "discriminator": [
+            {
+              "type": "type",
+              "path": "$this"
+            }
+          ],
+          "ordered": false,
+          "rules": "open"
+        },
+        "min": 1
+      },
+      {
+        "id": "Schedule.extension.valueString",
+        "path": "Schedule.extension.valueString",
+        "min": 1,
+        "max": "1",
+        "type": [
+          {
+            "code": "string"
+          }
+        ]
+      },
+      {
+        "id": "Schedule.extension:KalenderName",
         "path": "Schedule.extension",
-        "sliceName": "Name",
+        "sliceName": "KalenderName",
         "min": 0,
         "max": "1",
         "type": [
           {
             "code": "Extension",
             "profile": [
-              "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension"
+              "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
             ]
           }
         ],

diff --git a/...urces/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json b/...urces/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKMedizinischeBehandlungseinheit",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKMedizinischeBehandlungseinheit",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKNachricht",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKNachricht",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKNachrichtExtension",
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKNachrichtExtension",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKNachrichtExtension",
   "status": "active",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKTermin",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKTermin",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

diff --git a/...h-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json b/...h-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKTerminKontaktMitGesundheitseinrichtung",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKTerminKontaktMitGesundheitseinrichtung",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json
@@ -2,7 +2,7 @@
   "resourceType": "StructureDefinition",
   "id": "ISiKTerminPriorityExtension",
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKTerminPriorityExtension",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKTerminPriorityExtension",
   "status": "active",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json
@@ -12,11 +12,11 @@
     }
   ],
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKTerminblock",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "name": "ISiKTerminblock",
   "status": "active",
   "experimental": false,
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [

diff --git a/...Definition-ISiKKalenderNameExtension.json → ...ces/StructureDefinition-ScheduleName.json b/...Definition-ISiKKalenderNameExtension.json → ...ces/StructureDefinition-ScheduleName.json
@@ -1,9 +1,9 @@
 {
   "resourceType": "StructureDefinition",
-  "id": "ISiKKalenderNameExtension",
-  "url": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension",
-  "version": "2.0.2",
-  "name": "ISiKKalenderNameExtension",
+  "id": "ScheduleName",
+  "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name",
+  "version": "2.0.3",
+  "name": "ScheduleName",
   "status": "active",
   "fhirVersion": "4.0.1",
   "mapping": [
@@ -34,7 +34,7 @@
       {
         "id": "Extension.url",
         "path": "Extension.url",
-        "fixedUri": "https://gematik.de/fhir/isik/v2/Terminplanung/StructureDefinition/ISiKKalenderNameExtension"
+        "fixedUri": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
       },
       {
         "id": "Extension.value[x]",
@@ -49,7 +49,6 @@
           "ordered": false,
           "rules": "open"
         },
-        "min": 1,
         "type": [
           {
             "code": "string"
@@ -59,9 +58,8 @@
       {
         "id": "Extension.valueString",
         "path": "Extension.valueString",
-        "min": 1,
-        "max": "1",
-        "mustSupport": true
+        "min": 0,
+        "max": "1"
       }
     ]
   }

diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json b/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json
@@ -4,11 +4,11 @@
   "name": "ISiKTerminCancelationReason",
   "id": "ISiKTerminCancelationReason",
   "description": "Enthaelt alle erlaubten Gruende fuer eine Stornierung eines ISiKTermins",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/ValueSet/ISiKTerminCancelationReason",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "compose": {
     "include": [
       {

diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKTerminPriority.json b/Resources/fsh-generated/resources/ValueSet-ISiKTerminPriority.json
@@ -4,11 +4,11 @@
   "name": "ISiKTerminPriority",
   "id": "ISiKTerminPriority",
   "description": "Enthaelt alle SNOMED Codes, die eine valide Priorität für den ISiKTermin sind",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "url": "https://gematik.de/fhir/isik/v2/Terminplanung/ValueSet/ISiKTerminPriority",
   "experimental": false,
   "publisher": "gematik GmbH",
-  "date": "2023-01-31",
+  "date": "2023-03-24",
   "compose": {
     "include": [
       {

diff --git a/Resources/input/fsh/ISiKKalender.fsh b/Resources/input/fsh/ISiKKalender.fsh
@@ -20,12 +20,16 @@ Id: ISiKKalender
 * actor[Akteur] only Reference(Practitioner or HealthcareService)
 * actor[Akteur].reference 1..1 MS
 * extension MS
-* extension contains ISiKKalenderNameExtension named Name 0..1 MS
+* extension contains http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name named KalenderName 0..1 MS
+  * valueString 1..1
 
-Extension: ISiKKalenderNameExtension
-Id: ISiKKalenderNameExtension
+// This extension can be safely removed as soon as a package for R5 backport extensions is published and referenced by this project
+//WIP
+Extension: ScheduleName
+Id: ScheduleName
+* ^url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name"
 * value[x] only string
-* valueString 1..1 MS
+* valueString 0..1
 
 Instance: ISiKKalenderExample
 InstanceOf: ISiKKalender

diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh
@@ -2,22 +2,22 @@ RuleSet: Meta
 * ^status = #active
 * ^experimental = false
 * ^publisher = "gematik GmbH"
-* ^version = "2.0.2"
-* ^date = "2023-01-31"
+* ^version = "2.0.3"
+* ^date = "2023-03-24"
 
 
 RuleSet: Meta-Inst
 * status = #active
 * experimental = false
-* version = "2.0.2"
+* version = "2.0.3"
 * publisher = "gematik GmbH"
-* date = "2023-01-31"
+* date = "2023-03-24"
 
 RuleSet: Meta-CapabilityStatement
 * status = #active
 * experimental = false
-* version = "2.0.2"
+* version = "2.0.3"
 * publisher = "gematik GmbH"
-* date = "2023-01-31"
-* implementationGuide = "https://gematik.de/fhir/isik/v2/Terminplanung/ImplementationGuide|2.0.2"
+* date = "2023-03-24"
+* implementationGuide = "https://gematik.de/fhir/isik/v2/Terminplanung/ImplementationGuide|2.0.3"
 * url = "https://gematik.de/fhir/isik/v2/Terminplanung/CapabilityStatement/terminplanung-server"
diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
@@ -5,11 +5,11 @@ applyExtensionMetadataToRoot: false
 id: Implementierungsleitfaden ISiK-Modul Terminplanung
 name: Implementierungsleitfaden ISiK-Modul Terminplanung
 status: active
-version: "2.0.2"
+version: "2.0.3"
 publisher:
   name: Gematik GmbH
   url: https://www.gematik.de/
   email: [email protected]
 dependencies:
-  de.gematik.isik-basismodul: 2.0.4
+  de.gematik.isik-basismodul: 2.0.5
   hl7.fhir.extensions.r5: 4.0.1
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
     "name": "de.gematik.isik-terminplanung",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "Package Release des ISiK Modul Terminplanung",
     "fhirVersions": [
         "4.0.1"
     ],
     "dependencies": {
-        "de.gematik.isik-basismodul": "2.0.4"
+        "de.gematik.isik-basismodul": "2.0.5"
       }
 }