Skip to content

Commit

Permalink
Merge pull request #185 from gematik/TC_2.0.5
Browse files Browse the repository at this point in the history
* update version

* fix version + update basis dependency

* update IHE VS -Stufe 2 (#186)

* update IHE VS

* add fachabteilungsschlüsselerweiter VS

* Commit from GitHub Actions (CI (FHIR Validation))

* update comment

* update Basis dependency to wildcard

* Commit from GitHub Actions (CI (FHIR Validation))

---------

Co-authored-by: f-peverali <[email protected]>

* update MS and Comment

* Commit from GitHub Actions (CI (FHIR Validation))

* Update/ihe vs stufe2 post review (#188)

* fix VS instead of CS

* fix cardinality

* fix link

* fix alias

* add examples

* add dependency to IHE package

* Commit from GitHub Actions (CI (FHIR Validation))

---------

Co-authored-by: f-peverali <[email protected]>

* Update/ihe vs stufe2 post review (#189)

* fix VS instead of CS

* fix cardinality

* fix link

* fix alias

* add examples

* add dependency to IHE package

* Commit from GitHub Actions (CI (FHIR Validation))

* fix coding syntax in example

---------

Co-authored-by: f-peverali <[email protected]>

* update requirements regarding SLot search with Schedlue and Start defined -  ANFISK.302 (#190)

* update requirements

* Update ImplementationGuide/markdown/Datenobjekte/ISiKTerminblockSlot.md

Co-authored-by: Alexander Zautke <[email protected]>

* Update ImplementationGuide/markdown/Datenobjekte/ISiKTerminblockSlot.md

Co-authored-by: Alexander Zautke <[email protected]>

* update releasenotes

---------

Co-authored-by: Alexander Zautke <[email protected]>

---------

Co-authored-by: f-peverali <[email protected]>
Co-authored-by: Alexander Zautke <[email protected]>
  • Loading branch information
3 people authored Jun 20, 2024
2 parents a3491c8 + dee8e38 commit 8506681
Show file tree
Hide file tree
Showing 36 changed files with 640 additions and 212 deletions.
38 changes: 38 additions & 0 deletions .github/workflows/TC-version-update.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@

name: TC version update

# Controls when the action will run.
on:
push:
branches:
- 'TC-*'
- 'TC_*'


# setup python and run script
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout repo content
uses: actions/checkout@v2 # checkout the repository content

- name: setup python
uses: actions/setup-python@v4
with:
python-version: '3.10' # install the python version needed

- name: install python packages
run: |
python -m pip install --upgrade pip
pip install pyyaml
- name: execute py script # run main.py
run: python ./scripts/release_publish.py -b

- name: Add & Commit
uses: EndBug/add-and-commit@v9
with:
committer_name: GitHub Actions Bot
committer_email: [email protected]
message: auto-generated file update of TC version by GitHub Actions (CI FSH to FHIR Validation)
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
# Java and .NET are already installed on ubuntu-latest

- name: Firely.Terminal (GitHub Actions)
uses: FirelyTeam/[email protected].0
uses: FirelyTeam/[email protected].1
with:
PATH_TO_CONFORMANCE_RESOURCES: Resources/fsh-generated/resources/
#PATH_TO_EXAMPLES: Examples
Expand All @@ -42,7 +42,7 @@ jobs:
SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
SUSHI_ENABLED: true
SUSHI_OPTIONS: Resources/
SUSHI_VERSION: 3.5.0
SUSHI_VERSION: 3.10.0
EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA

- name: Add & Commit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"resourceType": "ImplementationGuide",
"url": "https://gematik.de/fhir/ISiK/v2/Terminplanung/ImplementationGuide/ISiK-terminplanung",
"name": "Implementierungsleitfaden ISiK-Modul Terminplanung",
"version": "2.0.4",
"version": "2.0.5",
"status": "active",
"fhirVersion": [
"4.0.1"
Expand Down
16 changes: 8 additions & 8 deletions ImplementationGuide/markdown/Datenobjekte/ISiKTerminblockSlot.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,18 @@ Für die Ressource Slot MUSS die REST-Interaktion "READ" implementiert werden.

Anwendungshinweise: Weitere Informationen zur Suche nach "_id" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Parameters for all resources"]https://hl7.org/fhir/R4/search.html#all).

2. Der Suchparameter "schedule" MUSS unterstützt werden:
2. Der Suchparameter "schedule" MUSS in Kombination mit einem definierten Startzeitpunkt mittels Suchparameter "start" unterstützt werden. Der Suchparameter "schedule" KANN alleinstehend unterstützt werden.
Beim Fehlen des "start"-Suchparameters SOLL der aktuelle Zeitpunkt des Servers als Startzeitpunkt per Default verwendet werden.

Beispiele:

```GET [base]/Slot?schedule=Schedule/ISiKKalenderExample:start=2022-12-10T09:00:00Z```

```GET [base]/Slot?schedule=Schedule/ISiKKalenderExample```

Anwendungshinweise: Weitere Informationen zur Suche nach "Slot.schedule" finden sich in der [FHIR-Basisspezifikation - Abschnitt "reference"]https://hl7.org/fhir/R4/search.html#reference).

In diesem Fall ist auch ein Chaining auf weitere verknüpfte Akteure möglich: `GET https://example.org/fhir/Slot?schedule.actor:HealthcareService.type=https://example.org/fhir/CodeSystem/Behandlungsleistung|CT`

3. Der Suchparameter "status" MUSS unterstützt werden:

Expand All @@ -84,19 +89,14 @@ Für die Ressource Slot MUSS die REST-Interaktion "READ" implementiert werden.

Anwendungshinweise: Weitere Informationen zur Suche nach "Slot.status" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Token Search"]https://hl7.org/fhir/R4/search.html#token).

4. Der Suchparameter "start" MUSS unterstützt werden:
4. Der Suchparameter "start" MUSS alleinstehend unterstützt werden:

Beispiele:

```GET [base]/Slot?start=2022-12-10T09:00:00Z```

Anwendungshinweise: Weitere Informationen zur Suche nach "Slot.start" finden sich in der [FHIR-Basisspezifikation - Abschnitt "Date Search"]https://hl7.org/fhir/R4/search.html#date).

5. Abfrage aller verfügbaren Slots für einen Kalender:

```GET https://example.org/fhir/Slot?schedule=<Scheudule/ISiKKalenderExampple>```

Anwendungshinweise: In diesem Fall ist auch ein Chaining auf weitere verknüpfte Akteure möglich: `GET https://example.org/fhir/Slot?schedule.actor:HealthcareService.type=https://example.org/fhir/CodeSystem/Behandlungsleistung|CT`

---

### Beispiele
Expand Down
4 changes: 2 additions & 2 deletions ImplementationGuide/markdown/Einfuehrung.md
Original file line number Diff line number Diff line change
@@ -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.4
Version: 2.0.5

Datum: 29.11.2023
Datum: 20.06.2024

Status: Aktiv

Expand Down
7 changes: 7 additions & 0 deletions ImplementationGuide/markdown/ReleaseNotes.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,13 @@ 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.5

Datum: 20.06.2024

* Ändern der ValueSets von IHE https://github.com/gematik/spec-ISiK-Terminplanung/pull/186
* Änderung der Anforderung für Suchanfrage zu Terminblöcken aus Kalendern https://github.com/gematik/spec-ISiK-Terminplanung/pull/190


Version: 2.0.4

Expand Down
170 changes: 170 additions & 0 deletions Resources/fsh-generated/fsh-index.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
[
{
"outputFile": "Appointment-ISiKTerminExample.json",
"fshName": "ISiKTerminExample",
"fshType": "Instance",
"fshFile": "ISiKTermin.fsh",
"startLine": 83,
"endLine": 100
},
{
"outputFile": "Appointment-ISiKTerminExampleExtendedICU.json",
"fshName": "ISiKTerminExampleExtendedICU",
"fshType": "Instance",
"fshFile": "ISiKTermin.fsh",
"startLine": 102,
"endLine": 120
},
{
"outputFile": "Appointment-ISiKTerminExampleOld.json",
"fshName": "ISiKTerminExampleOld",
"fshType": "Instance",
"fshFile": "ISiKTermin.fsh",
"startLine": 122,
"endLine": 139
},
{
"outputFile": "CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json",
"fshName": "ISiKCapabilityStatementTerminplanungServer",
"fshType": "Instance",
"fshFile": "ISiKTerminplanungCapabilityStatement.fsh",
"startLine": 1,
"endLine": 332
},
{
"outputFile": "Communication-ISiKNachrichtExample.json",
"fshName": "ISiKNachrichtExample",
"fshType": "Instance",
"fshFile": "ISiKNachricht.fsh",
"startLine": 30,
"endLine": 39
},
{
"outputFile": "HealthcareService-ISiKMedizinischeBehandlungseinheitExample.json",
"fshName": "ISiKMedizinischeBehandlungseinheitExample",
"fshType": "Instance",
"fshFile": "ISiKMedizinischeBehandlungseinheit.fsh",
"startLine": 26,
"endLine": 32
},
{
"outputFile": "OperationDefinition-ISiKAppointmentBookOperation.json",
"fshName": "Book",
"fshType": "Instance",
"fshFile": "ISiKBookOperation.fsh",
"startLine": 1,
"endLine": 45
},
{
"outputFile": "Schedule-ISiKKalenderExample.json",
"fshName": "ISiKKalenderExample",
"fshType": "Instance",
"fshFile": "ISiKKalender.fsh",
"startLine": 46,
"endLine": 53
},
{
"outputFile": "Slot-ISiKTerminblockExample.json",
"fshName": "ISiKTerminblockExample",
"fshType": "Instance",
"fshFile": "ISiKTerminblock.fsh",
"startLine": 19,
"endLine": 25
},
{
"outputFile": "StructureDefinition-AppointmentReplaces.json",
"fshName": "AppointmentReplaces",
"fshType": "Extension",
"fshFile": "ISiKTermin.fsh",
"startLine": 143,
"endLine": 147
},
{
"outputFile": "StructureDefinition-ISiKKalender.json",
"fshName": "ISiKKalender",
"fshType": "Profile",
"fshFile": "ISiKKalender.fsh",
"startLine": 1,
"endLine": 35
},
{
"outputFile": "StructureDefinition-ISiKMedizinischeBehandlungseinheit.json",
"fshName": "ISiKMedizinischeBehandlungseinheit",
"fshType": "Profile",
"fshFile": "ISiKMedizinischeBehandlungseinheit.fsh",
"startLine": 1,
"endLine": 24
},
{
"outputFile": "StructureDefinition-ISiKNachricht.json",
"fshName": "ISiKNachricht",
"fshType": "Profile",
"fshFile": "ISiKNachricht.fsh",
"startLine": 1,
"endLine": 28
},
{
"outputFile": "StructureDefinition-ISiKNachrichtExtension.json",
"fshName": "ISiKNachrichtExtension",
"fshType": "Extension",
"fshFile": "ISiKTermin.fsh",
"startLine": 66,
"endLine": 69
},
{
"outputFile": "StructureDefinition-ISiKTermin.json",
"fshName": "ISiKTermin",
"fshType": "Profile",
"fshFile": "ISiKTermin.fsh",
"startLine": 1,
"endLine": 64
},
{
"outputFile": "StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json",
"fshName": "ISiKTerminKontaktMitGesundheitseinrichtung",
"fshType": "Profile",
"fshFile": "ISiKTerminKontaktMitGesundheitseinrichtung.fsh",
"startLine": 1,
"endLine": 5
},
{
"outputFile": "StructureDefinition-ISiKTerminPriorityExtension.json",
"fshName": "ISiKTerminPriorityExtension",
"fshType": "Extension",
"fshFile": "ISiKTermin.fsh",
"startLine": 71,
"endLine": 76
},
{
"outputFile": "StructureDefinition-ISiKTerminblock.json",
"fshName": "ISiKTerminblock",
"fshType": "Profile",
"fshFile": "ISiKTerminblock.fsh",
"startLine": 1,
"endLine": 12
},
{
"outputFile": "StructureDefinition-ScheduleName.json",
"fshName": "ScheduleName",
"fshType": "Extension",
"fshFile": "ISiKKalender.fsh",
"startLine": 39,
"endLine": 44
},
{
"outputFile": "ValueSet-ISiKTerminCancelationReason.json",
"fshName": "ISiKTerminCancelationReason",
"fshType": "ValueSet",
"fshFile": "valueSets.fsh",
"startLine": 1,
"endLine": 9
},
{
"outputFile": "ValueSet-ISiKTerminPriority.json",
"fshName": "ISiKTerminPriority",
"fshType": "ValueSet",
"fshFile": "valueSets.fsh",
"startLine": 11,
"endLine": 15
}
]
22 changes: 22 additions & 0 deletions Resources/fsh-generated/fsh-index.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Output File Name Type FSH File Lines
Appointment-ISiKTerminExample.json ISiKTerminExample Instance ISiKTermin.fsh 83 - 100
Appointment-ISiKTerminExampleExtendedICU.json ISiKTerminExampleExtendedICU Instance ISiKTermin.fsh 102 - 120
Appointment-ISiKTerminExampleOld.json ISiKTerminExampleOld Instance ISiKTermin.fsh 122 - 139
CapabilityStatement-ISiKCapabilityStatementTerminplanungServer.json ISiKCapabilityStatementTerminplanungServer Instance ISiKTerminplanungCapabilityStatement.fsh 1 - 332
Communication-ISiKNachrichtExample.json ISiKNachrichtExample Instance ISiKNachricht.fsh 30 - 39
HealthcareService-ISiKMedizinischeBehandlungseinheitExample.json ISiKMedizinischeBehandlungseinheitExample Instance ISiKMedizinischeBehandlungseinheit.fsh 26 - 32
OperationDefinition-ISiKAppointmentBookOperation.json Book Instance ISiKBookOperation.fsh 1 - 45
Schedule-ISiKKalenderExample.json ISiKKalenderExample Instance ISiKKalender.fsh 46 - 53
Slot-ISiKTerminblockExample.json ISiKTerminblockExample Instance ISiKTerminblock.fsh 19 - 25
StructureDefinition-AppointmentReplaces.json AppointmentReplaces Extension ISiKTermin.fsh 143 - 147
StructureDefinition-ISiKKalender.json ISiKKalender Profile ISiKKalender.fsh 1 - 35
StructureDefinition-ISiKMedizinischeBehandlungseinheit.json ISiKMedizinischeBehandlungseinheit Profile ISiKMedizinischeBehandlungseinheit.fsh 1 - 24
StructureDefinition-ISiKNachricht.json ISiKNachricht Profile ISiKNachricht.fsh 1 - 28
StructureDefinition-ISiKNachrichtExtension.json ISiKNachrichtExtension Extension ISiKTermin.fsh 66 - 69
StructureDefinition-ISiKTermin.json ISiKTermin Profile ISiKTermin.fsh 1 - 64
StructureDefinition-ISiKTerminKontaktMitGesundheitseinrichtung.json ISiKTerminKontaktMitGesundheitseinrichtung Profile ISiKTerminKontaktMitGesundheitseinrichtung.fsh 1 - 5
StructureDefinition-ISiKTerminPriorityExtension.json ISiKTerminPriorityExtension Extension ISiKTermin.fsh 71 - 76
StructureDefinition-ISiKTerminblock.json ISiKTerminblock Profile ISiKTerminblock.fsh 1 - 12
StructureDefinition-ScheduleName.json ScheduleName Extension ISiKKalender.fsh 39 - 44
ValueSet-ISiKTerminCancelationReason.json ISiKTerminCancelationReason ValueSet valueSets.fsh 1 - 9
ValueSet-ISiKTerminPriority.json ISiKTerminPriority ValueSet valueSets.fsh 11 - 15
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
"reference": "ISiKSlotExample"
}
],
"comment": "Dies ist ein Test Kommentar!",
"serviceType": [
{
"coding": [
Expand All @@ -43,8 +42,8 @@
{
"coding": [
{
"code": "010",
"system": "urn:oid:1.2.276.0.76.5.114"
"code": "ALLG",
"system": "http://ihe-d.de/CodeSystems/AerztlicheFachrichtungen"
}
]
}
Expand Down
Loading

0 comments on commit 8506681

Please sign in to comment.