diff --git a/ImplementationGuide/ImplementierungsleitfadenIsiK_Terminplanung.json b/ImplementationGuide/ImplementierungsleitfadenIsiK_Terminplanung.json index a3e01881..1a00d138 100644 --- a/ImplementationGuide/ImplementierungsleitfadenIsiK_Terminplanung.json +++ b/ImplementationGuide/ImplementierungsleitfadenIsiK_Terminplanung.json @@ -2,7 +2,7 @@ "resourceType": "ImplementationGuide", "url": "https://gematik.de/fhir/ISiK/v3/Terminplanung/ImplementationGuide/ISiK-Terminplanung", "name": "Implementierungsleitfaden ISiK-Modul Terminplanung", - "version": "3.0.6", + "version": "3.0.7", "status": "active", "fhirVersion": [ "4.0.1" diff --git a/ImplementationGuide/markdown/Einfuehrung.md b/ImplementationGuide/markdown/Einfuehrung.md index 3a3633c6..5d3ce2cb 100644 --- a/ImplementationGuide/markdown/Einfuehrung.md +++ b/ImplementationGuide/markdown/Einfuehrung.md @@ -1,9 +1,9 @@ gematik logo ---- -Version: 3.0.6 +Version: 3.0.7 -Datum: 19.11.2024 +Datum: 20.02.2025 Status: Aktiv diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index ef21c672..38a59666 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -4,6 +4,18 @@ 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: 3.0.7 + +Datum: 20.02.2025 + +* `change` Die Verbindlichkeit der Suchparameter `subject` in Communication sowie `include` (für `Communication:recipient` und `Communication:sender`) wurde von SHALL auf MAY reduziert https://github.com/gematik/spec-ISiK-Terminplanung/pull/257 +* `fixed` Display Values ISiKTerminCancelationReason https://github.com/gematik/spec-ISiK-Terminplanung/pull/265 +* `fixed` Korektur des Constraints zur Kardinalität im Sinne der Kohärenz mit Schedule (Kalender) auch bei Appointment.participant.actor.display https://github.com/gematik/spec-ISiK-Terminplanung/pull/263 +* `fixed` Anpassung der Kardinalität von Appointment.start/end um 'proposed', 'cancelled', 'waitlist' als Status zu ermöglichen https://github.com/gematik/spec-ISiK-Terminplanung/pull/261 + +--- + + Version: 3.0.6 Datum: 19.11.2024 diff --git a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json index 293049e9..9f515b68 100644 --- a/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json +++ b/Resources/fsh-generated/resources/CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json @@ -5,10 +5,10 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "version": "3.0.6", - "date": "2024-11-19", + "version": "3.0.7", + "date": "2025-02-20", "implementationGuide": [ - "https://gematik.de/fhir/isik/v3/Terminplanung/ImplementationGuide|3.0.6" + "https://gematik.de/fhir/isik/v3/Terminplanung/ImplementationGuide|3.0.7" ], "name": "ISiKCapabilityStatementTerminplanungServer", "title": "ISiK CapabilityStatement Terminplanung Server", @@ -406,7 +406,7 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ] }, @@ -414,7 +414,7 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ] } @@ -485,13 +485,24 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ], "name": "subject", "definition": "http://hl7.org/fhir/SearchParameter/Communication-subject", "type": "reference" }, + { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", + "valueCode": "SHALL" + } + ], + "name": "patient", + "definition": "http://hl7.org/fhir/SearchParameter/clinical-patient", + "type": "reference" + }, { "extension": [ { @@ -524,7 +535,7 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ] }, @@ -532,7 +543,7 @@ "extension": [ { "url": "http://hl7.org/fhir/StructureDefinition/capabilitystatement-expectation", - "valueCode": "SHALL" + "valueCode": "MAY" } ] } diff --git a/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json b/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json index 67993121..40bb34d2 100644 --- a/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json +++ b/Resources/fsh-generated/resources/OperationDefinition-ISiKAppointmentBookOperation.json @@ -4,8 +4,8 @@ "status": "active", "experimental": false, "publisher": "gematik GmbH", - "version": "3.0.6", - "date": "2024-11-19", + "version": "3.0.7", + "date": "2025-02-20", "name": "book", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/OperationDefinition/AppointmentBook", "kind": "operation", diff --git a/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json b/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json index 47b81373..a641a090 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json +++ b/Resources/fsh-generated/resources/StructureDefinition-AppointmentReplaces.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "AppointmentReplaces", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Appointment.replaces", - "version": "3.0.6", + "version": "3.0.7", "name": "AppointmentReplaces", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "complex-type", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json index 8f38ec44..553ada2a 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKKalender.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKKalender", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKKalender", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKKalender", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", @@ -170,7 +170,7 @@ { "id": "Schedule.actor.display", "path": "Schedule.actor.display", - "comment": "Hinweis: Für alle Target-Ressourcen SOLL ein Displaywert für die Referenz angegeben werden, sodass Systeme eine Übersicht der am Termin beteiligten Akteure anzeigen können ohne die Referenzen auflösen zu müssen.", + "comment": "Begründung zu Must Support: Dieses Feld ist optional (0..1), muss jedoch implementiert werden (MS), um die Möglichkeit zu bieten, einen Display-Wert (z.B. Namen) für einen Akteur zu verarbeiten und zu persistieren, dem der Kalender zugewiesen ist.\n \n Hinweis: Für alle Target-Ressourcen SOLL ein Displaywert für die Referenz angegeben werden, sodass Systeme eine Übersicht der am Termin beteiligten Akteure anzeigen können ohne die Referenzen auflösen zu müssen.", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json index 2ec2d071..818bb35e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKMedizinischeBehandlungseinheit.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKMedizinischeBehandlungseinheit", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKMedizinischeBehandlungseinheit", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKMedizinischeBehandlungseinheit", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json index 312c89e2..b94040ae 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachricht.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKNachricht", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKNachricht", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKNachricht", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json index 91c285c2..22057330 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKNachrichtExtension.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKNachrichtExtension", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKNachrichtExtension", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKNachrichtExtension", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "complex-type", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json index d2e10b0a..422853c0 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKTermin.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKTermin", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKTermin", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKTermin", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", @@ -191,16 +191,6 @@ { "id": "Appointment.priority.extension", "path": "Appointment.priority.extension", - "slicing": { - "discriminator": [ - { - "type": "value", - "path": "url" - } - ], - "ordered": false, - "rules": "open" - }, "mustSupport": true }, { @@ -222,13 +212,13 @@ { "id": "Appointment.start", "path": "Appointment.start", - "min": 1, + "comment": "Begründung zu Kardinalität und Must Support: Der Startzeitpunkt eines Termins ist von entscheidender Bedeutung, um die Verfügbarkeit und Planung des Termins zu gewährleisten. Daher muss dieses Feld unterstützt werden (MS). Das Feld ist in den meisten Fällen verpflichtend, nur für die Status 'proposed', 'cancelled', 'waitlist' existiert kein Wert.", "mustSupport": true }, { "id": "Appointment.end", "path": "Appointment.end", - "min": 1, + "comment": "Begründung zu Kardinalität und Must Support: Der Endzeitpunkt eines Termins ist von entscheidender Bedeutung, um die Verfügbarkeit und Planung des Termins zu gewährleisten. Daher muss dieses Feld unterstützt werden (MS). Das Feld ist in den meisten Fällen verpflichtend, nur für die Status 'proposed', 'cancelled', 'waitlist' existiert kein Wert.", "mustSupport": true }, { @@ -272,7 +262,7 @@ { "id": "Appointment.participant.actor.display", "path": "Appointment.participant.actor.display", - "min": 1, + "comment": "Begründung zu Must Support: Dieses Feld ist optional (0..1), muss jedoch implementiert werden (MS), um die Möglichkeit zu bieten, einen Display-Wert für einen am Termin teilnehmenden Akteur zu verarbeiten und zu persistieren.", "mustSupport": true }, { diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json index fa241443..be4ad5c8 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKTerminKontaktMitGesundheitseinrichtung", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKTerminKontaktMitGesundheitseinrichtung", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKTerminKontaktMitGesundheitseinrichtung", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json index 60a215b6..a78dba8e 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminPriorityExtension.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKTerminPriorityExtension", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKTerminPriorityExtension", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKTerminPriorityExtension", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "complex-type", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json index d6f1d206..98bee7e6 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKTerminblock.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ISiKTerminblock", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/StructureDefinition/ISiKTerminblock", - "version": "3.0.6", + "version": "3.0.7", "name": "ISiKTerminblock", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "resource", diff --git a/Resources/fsh-generated/resources/StructureDefinition-ScheduleName.json b/Resources/fsh-generated/resources/StructureDefinition-ScheduleName.json index b81fd3e9..76ba5c87 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ScheduleName.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ScheduleName.json @@ -2,11 +2,11 @@ "resourceType": "StructureDefinition", "id": "ScheduleName", "url": "http://hl7.org/fhir/5.0/StructureDefinition/extension-Schedule.name", - "version": "3.0.6", + "version": "3.0.7", "name": "ScheduleName", "status": "active", "experimental": false, - "date": "2024-11-19", + "date": "2025-02-20", "publisher": "gematik GmbH", "fhirVersion": "4.0.1", "kind": "complex-type", diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json b/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json index 4d9ce46d..f951dda5 100644 --- a/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json +++ b/Resources/fsh-generated/resources/ValueSet-ISiKTerminCancelationReason.json @@ -4,30 +4,35 @@ "name": "ISiKTerminCancelationReason", "id": "ISiKTerminCancelationReason", "description": "Enthaelt alle erlaubten Gruende fuer eine Stornierung eines ISiKTermins", - "version": "3.0.6", + "version": "3.0.7", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/ValueSet/ISiKTerminCancelationReason", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-11-19", + "date": "2025-02-20", "compose": { "include": [ { "system": "http://terminology.hl7.org/CodeSystem/appointment-cancellation-reason", "concept": [ { - "code": "pat" + "code": "pat", + "display": "Patient" }, { - "code": "prov" + "code": "prov", + "display": "Provider" }, { - "code": "maint" + "code": "maint", + "display": "Equipment Maintenance/Repair" }, { - "code": "meds-inc" + "code": "meds-inc", + "display": "Prep/Med Incomplete" }, { - "code": "other" + "code": "other", + "display": "Other" } ] } diff --git a/Resources/fsh-generated/resources/ValueSet-ISiKTerminPriority.json b/Resources/fsh-generated/resources/ValueSet-ISiKTerminPriority.json index d2764531..17d791b3 100644 --- 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": "3.0.6", + "version": "3.0.7", "url": "https://gematik.de/fhir/isik/v3/Terminplanung/ValueSet/ISiKTerminPriority", "experimental": false, "publisher": "gematik GmbH", - "date": "2024-11-19", + "date": "2025-02-20", "compose": { "include": [ { diff --git a/Resources/input/fsh/ISiKKalender.fsh b/Resources/input/fsh/ISiKKalender.fsh index 2967c9e8..2d519b3a 100644 --- a/Resources/input/fsh/ISiKKalender.fsh +++ b/Resources/input/fsh/ISiKKalender.fsh @@ -29,8 +29,10 @@ Id: ISiKKalender * actor 1..* MS * ^comment = "Ein dezidierter Kalender ist für jeden Akteur zu pflegen." * identifier 0..1 MS - * display 0..1 MS - * ^comment = "Hinweis: Für alle Target-Ressourcen SOLL ein Displaywert für die Referenz angegeben werden, sodass Systeme eine Übersicht der am Termin beteiligten Akteure anzeigen können ohne die Referenzen auflösen zu müssen." + * display MS + * ^comment = "Begründung zu Must Support: Dieses Feld ist optional (0..1), muss jedoch implementiert werden (MS), um die Möglichkeit zu bieten, einen Display-Wert (z.B. Namen) für einen Akteur zu verarbeiten und zu persistieren, dem der Kalender zugewiesen ist. + + Hinweis: Für alle Target-Ressourcen SOLL ein Displaywert für die Referenz angegeben werden, sodass Systeme eine Übersicht der am Termin beteiligten Akteure anzeigen können ohne die Referenzen auflösen zu müssen." * ^slicing.discriminator.type = #type * ^slicing.discriminator.path = "$this" * ^slicing.rules = #open diff --git a/Resources/input/fsh/ISiKTermin.fsh b/Resources/input/fsh/ISiKTermin.fsh index 27f2c9c4..15384e17 100644 --- a/Resources/input/fsh/ISiKTermin.fsh +++ b/Resources/input/fsh/ISiKTermin.fsh @@ -17,15 +17,18 @@ Id: ISiKTermin * status 1..1 MS * cancelationReason 0..1 MS * cancelationReason from ISiKTerminCancelationReason (required) -* start 1..1 MS -* end 1..1 MS +* start MS + * ^comment = "Begründung zu Kardinalität und Must Support: Der Startzeitpunkt eines Termins ist von entscheidender Bedeutung, um die Verfügbarkeit und Planung des Termins zu gewährleisten. Daher muss dieses Feld unterstützt werden (MS). Das Feld ist in den meisten Fällen verpflichtend, nur für die Status 'proposed', 'cancelled', 'waitlist' existiert kein Wert." +* end MS + * ^comment = "Begründung zu Kardinalität und Must Support: Der Endzeitpunkt eines Termins ist von entscheidender Bedeutung, um die Verfügbarkeit und Planung des Termins zu gewährleisten. Daher muss dieses Feld unterstützt werden (MS). Das Feld ist in den meisten Fällen verpflichtend, nur für die Status 'proposed', 'cancelled', 'waitlist' existiert kein Wert." * slot 0..* MS * reference 1.. MS * slot ^comment = "Zur Referenzierung auf eine Slot-Ressource MUSS eine Reference.reference mit einer URL verwendet werden. Das Termin-Repository muss so gestaltet sein, dass es aus Perspektive des Clients nur eine Service-BaseUrl gibt." //Zur Begründung: verschiedene Referenzierungs-Arten (z.B. mit Business-Identifiern) sind ggf. nicht interoperabel * patientInstruction 0..1 MS * participant 1..* MS * actor 1..1 MS - * actor.display 1..1 MS + * actor.display MS + * actor.display ^comment = "Begründung zu Must Support: Dieses Feld ist optional (0..1), muss jedoch implementiert werden (MS), um die Möglichkeit zu bieten, einen Display-Wert für einen am Termin teilnehmenden Akteur zu verarbeiten und zu persistieren." * status 1..1 MS * ^slicing.discriminator.type = #type * ^slicing.discriminator.path = "actor.resolve()" diff --git a/Resources/input/fsh/ISiKTerminplanungCapabilityStatement.fsh b/Resources/input/fsh/ISiKTerminplanungCapabilityStatement.fsh index 219d2f67..92a3e313 100644 --- a/Resources/input/fsh/ISiKTerminplanungCapabilityStatement.fsh +++ b/Resources/input/fsh/ISiKTerminplanungCapabilityStatement.fsh @@ -149,10 +149,10 @@ Usage: #definition * rest.resource[=].operation[=].definition = Canonical(ISiKAppointmentBookOperation) * rest.resource[=].searchInclude = "Appointment:slot" * rest.resource[=].searchInclude[=].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchInclude[=].extension.valueCode = #SHALL +* rest.resource[=].searchInclude[=].extension.valueCode = #MAY * rest.resource[=].searchInclude[+] = "Appointment:actor" * rest.resource[=].searchInclude[=].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchInclude[=].extension.valueCode = #SHALL +* rest.resource[=].searchInclude[=].extension.valueCode = #MAY * rest.resource[+].extension.url = $capabilitystatement-expectation * rest.resource[=].extension.valueCode = #MAY * rest.resource[=].type = #Communication @@ -175,12 +175,17 @@ Usage: #definition * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Resource-id" * rest.resource[=].searchParam[=].type = #token * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchParam[=].extension.valueCode = #SHALL +* rest.resource[=].searchParam[=].extension.valueCode = #MAY * rest.resource[=].searchParam[=].name = "subject" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Communication-subject" * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation * rest.resource[=].searchParam[=].extension.valueCode = #SHALL +* rest.resource[=].searchParam[=].name = "patient" +* rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/clinical-patient" +* rest.resource[=].searchParam[=].type = #reference +* rest.resource[=].searchParam[+].extension.url = $capabilitystatement-expectation +* rest.resource[=].searchParam[=].extension.valueCode = #SHALL * rest.resource[=].searchParam[=].name = "recipient" * rest.resource[=].searchParam[=].definition = "http://hl7.org/fhir/SearchParameter/Communication-recipient" * rest.resource[=].searchParam[=].type = #reference @@ -191,13 +196,13 @@ Usage: #definition * rest.resource[=].searchParam[=].type = #reference * rest.resource[=].searchInclude = "Communication:recipient" * rest.resource[=].searchInclude[=].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchInclude[=].extension.valueCode = #SHALL +* rest.resource[=].searchInclude[=].extension.valueCode = #MAY * rest.resource[=].searchInclude = "Communication:sender" * rest.resource[=].searchInclude[=].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchInclude[=].extension.valueCode = #SHALL +* rest.resource[=].searchInclude[=].extension.valueCode = #MAY * rest.resource[=].searchInclude[+] = "Communication:subject" * rest.resource[=].searchInclude[=].extension.url = $capabilitystatement-expectation -* rest.resource[=].searchInclude[=].extension.valueCode = #SHALL +* rest.resource[=].searchInclude[=].extension.valueCode = #MAY * rest.resource[+].extension.url = $capabilitystatement-expectation * rest.resource[=].extension.valueCode = #SHALL diff --git a/Resources/input/fsh/ruleset.fsh b/Resources/input/fsh/ruleset.fsh index 9f36f82e..96bb79a3 100644 --- a/Resources/input/fsh/ruleset.fsh +++ b/Resources/input/fsh/ruleset.fsh @@ -1,16 +1,16 @@ RuleSet: Meta * ^experimental = false * ^publisher = "gematik GmbH" -* ^version = "3.0.6" -* ^date = "2024-11-19" +* ^version = "3.0.7" +* ^date = "2025-02-20" RuleSet: Meta-Inst * status = #active * experimental = false * publisher = "gematik GmbH" -* version = "3.0.6" -* date = "2024-11-19" +* version = "3.0.7" +* date = "2025-02-20" RuleSet: Meta-CapabilityStatement -* implementationGuide = "https://gematik.de/fhir/isik/v3/Terminplanung/ImplementationGuide|3.0.6" +* implementationGuide = "https://gematik.de/fhir/isik/v3/Terminplanung/ImplementationGuide|3.0.7" * url = "https://gematik.de/fhir/isik/v3/Terminplanung/CapabilityStatement/terminplanung-server" \ No newline at end of file diff --git a/Resources/input/fsh/valueSets.fsh b/Resources/input/fsh/valueSets.fsh index 0df4cdb4..baf11057 100644 --- a/Resources/input/fsh/valueSets.fsh +++ b/Resources/input/fsh/valueSets.fsh @@ -2,11 +2,11 @@ ValueSet: ISiKTerminCancelationReason Id: ISiKTerminCancelationReason Description: "Enthaelt alle erlaubten Gruende fuer eine Stornierung eines ISiKTermins" * insert Meta -* $cancelationReason#pat -* $cancelationReason#prov -* $cancelationReason#maint -* $cancelationReason#meds-inc -* $cancelationReason#other +* $cancelationReason#pat "Patient" +* $cancelationReason#prov "Provider" +* $cancelationReason#maint "Equipment Maintenance/Repair" +* $cancelationReason#meds-inc "Prep/Med Incomplete" +* $cancelationReason#other "Other" ValueSet: ISiKTerminPriority Id: ISiKTerminPriority diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml index 91285478..a026e279 100644 --- a/Resources/sushi-config.yaml +++ b/Resources/sushi-config.yaml @@ -3,7 +3,7 @@ fhirVersion: 4.0.1 FSHOnly: true applyExtensionMetadataToRoot: false status: active -version: 3.0.6 +version: 3.0.7 dependencies: de.gematik.isik-basismodul: 3.0.x hl7.fhir.extensions.r5: 4.0.1 diff --git a/package.json b/package.json index f7c3021f..83403078 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "de.gematik.isik-terminplanung", - "version": "3.0.6", + "version": "3.0.7", "description": "Package Release des ISiK Modul Terminplanung", "fhirVersions": [ "4.0.1"