From 081f2e4df40c34e0bf1cdb07ed9aedda70905af4 Mon Sep 17 00:00:00 2001 From: f-peverali <112709306+f-peverali@users.noreply.github.com> Date: Fri, 3 May 2024 14:46:02 +0200 Subject: [PATCH] add system for Slice XDS (#189) * add system as * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * fix system for category + add code and display * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * fix comment and short * typo im XDS-Type-Slice * auto-generated FHIR files by GitHub Actions (CI FSH to FHIR Validation) * update releasenotes * update releasenotes --------- Co-authored-by: f-peverali Co-authored-by: alexey-tschudnowsky Co-authored-by: alexey-tschudnowsky --- ImplementationGuide/markdown/ReleaseNotes.md | 1 + .../Bundle-Suchergebnis-Beispiel.json | 6 ++--- ...DocumentReference-dok-beispiel-server.json | 6 ++--- ...ureDefinition-ISiKDokumentenMetadaten.json | 25 +++++++++++++++++++ .../input/fsh/ISiKDokumentenMetadaten.fsh | 11 +++++++- 5 files changed, 42 insertions(+), 7 deletions(-) diff --git a/ImplementationGuide/markdown/ReleaseNotes.md b/ImplementationGuide/markdown/ReleaseNotes.md index 6cc3f0f7..a4634006 100644 --- a/ImplementationGuide/markdown/ReleaseNotes.md +++ b/ImplementationGuide/markdown/ReleaseNotes.md @@ -12,6 +12,7 @@ Datum: 30.04.2024 * fix IHEXDStypeCode Canonical-URL https://github.com/gematik/spec-ISiK-Dokumentenaustausch/pull/187/commits/33b3832adfd65ba6496d419c92870d6f30d4ffe1 * Add dependency to IHE package +* Fix der XDS Slices für .type und .category https://github.com/gematik/spec-ISiK-Dokumentenaustausch/pull/189 * Update Basismodul-Dependency to Patch-Wildcard 3.0.x ---- diff --git a/Resources/fsh-generated/resources/Bundle-Suchergebnis-Beispiel.json b/Resources/fsh-generated/resources/Bundle-Suchergebnis-Beispiel.json index bc754404..2294c820 100644 --- a/Resources/fsh-generated/resources/Bundle-Suchergebnis-Beispiel.json +++ b/Resources/fsh-generated/resources/Bundle-Suchergebnis-Beispiel.json @@ -37,24 +37,24 @@ "display": "Molekularpathologiebefund" }, { - "code": "PATH", "system": "http://ihe-d.de/CodeSystems/IHEXDStypeCode", + "code": "PATH", "display": "Pathologiebefundberichte" } ] }, - "status": "current", "category": [ { "coding": [ { - "code": "BEF", "system": "http://ihe-d.de/CodeSystems/IHEXDSclassCode", + "code": "BEF", "display": "Befundbericht" } ] } ], + "status": "current", "description": "Molekularpathologiebefund vom 31.12.21", "subject": { "reference": "Patient/PatientinMusterfrau" diff --git a/Resources/fsh-generated/resources/DocumentReference-dok-beispiel-server.json b/Resources/fsh-generated/resources/DocumentReference-dok-beispiel-server.json index e9f9c67c..08c964bc 100644 --- a/Resources/fsh-generated/resources/DocumentReference-dok-beispiel-server.json +++ b/Resources/fsh-generated/resources/DocumentReference-dok-beispiel-server.json @@ -24,24 +24,24 @@ "display": "Molekularpathologiebefund" }, { - "code": "PATH", "system": "http://ihe-d.de/CodeSystems/IHEXDStypeCode", + "code": "PATH", "display": "Pathologiebefundberichte" } ] }, - "status": "current", "category": [ { "coding": [ { - "code": "BEF", "system": "http://ihe-d.de/CodeSystems/IHEXDSclassCode", + "code": "BEF", "display": "Befundbericht" } ] } ], + "status": "current", "description": "Molekularpathologiebefund vom 31.12.21", "subject": { "reference": "Patient/PatientinMusterfrau" diff --git a/Resources/fsh-generated/resources/StructureDefinition-ISiKDokumentenMetadaten.json b/Resources/fsh-generated/resources/StructureDefinition-ISiKDokumentenMetadaten.json index 8b997f62..92368518 100644 --- a/Resources/fsh-generated/resources/StructureDefinition-ISiKDokumentenMetadaten.json +++ b/Resources/fsh-generated/resources/StructureDefinition-ISiKDokumentenMetadaten.json @@ -179,6 +179,30 @@ } ] }, + { + "id": "DocumentReference.type.coding:XDS.system", + "path": "DocumentReference.type.coding.system", + "short": "Kodiersystem", + "min": 1, + "patternUri": "http://ihe-d.de/CodeSystems/IHEXDStypeCode", + "mustSupport": true + }, + { + "id": "DocumentReference.type.coding:XDS.code", + "path": "DocumentReference.type.coding.code", + "short": "Code", + "comment": "Der XDS-Type-Code", + "min": 1, + "mustSupport": true + }, + { + "id": "DocumentReference.type.coding:XDS.display", + "path": "DocumentReference.type.coding.display", + "short": "Anzeigetext", + "comment": "Der Anzeigetext zum XDS-Type-Code", + "min": 1, + "mustSupport": true + }, { "id": "DocumentReference.category", "path": "DocumentReference.category", @@ -225,6 +249,7 @@ "path": "DocumentReference.category.coding.system", "short": "Kodiersystem", "min": 1, + "patternUri": "http://ihe-d.de/CodeSystems/IHEXDSclassCode", "mustSupport": true }, { diff --git a/Resources/input/fsh/ISiKDokumentenMetadaten.fsh b/Resources/input/fsh/ISiKDokumentenMetadaten.fsh index 23243c12..e0e80f3a 100644 --- a/Resources/input/fsh/ISiKDokumentenMetadaten.fsh +++ b/Resources/input/fsh/ISiKDokumentenMetadaten.fsh @@ -43,9 +43,18 @@ In MHD 4.2.0 wurde die Verpflichtung zur Angabe eines Identifiers gelockert, das * type.coding contains KDL 1..1 MS and XDS 0..1 MS * type.coding[XDS] from http://ihe-d.de/ValueSets/IHEXDStypeCode (required) * ^short = "Dokumenttyp gem. IHE-De-Terminologie" + * system 1..1 MS + * system = "http://ihe-d.de/CodeSystems/IHEXDStypeCode" + * ^short = "Kodiersystem" * ^comment = "Die Übermittlung des XDS-Type-Codes ist im Rahmen der Dokumentenbereitstellung für Clients nicht verpflichtend, MUSS jedoch vom Server bei der Entgegennahme ggf. ergänzt und bei der Dokumentenabfrage zurückgegeben werden. Der XDS-Type-Code kann über die im Rahmen der [KDL-Spezifikation](https://simplifier.net/kdl) publizierten [ConceptMaps](https://simplifier.net/kdl/~resources?category=ConceptMap) aus dem KDL-Code ermittelt werden" + * code 1..1 MS + * ^short = "Code" + * ^comment = "Der XDS-Type-Code" + * display 1..1 MS + * ^short = "Anzeigetext" + * ^comment = "Der Anzeigetext zum XDS-Type-Code" * type.coding[KDL] from http://dvmd.de/fhir/ValueSet/kdl (required) * ^short = "Dokumenttyp gem. KDL-Terminologie" * system 1..1 MS @@ -70,9 +79,9 @@ In MHD 4.2.0 wurde die Verpflichtung zur Angabe eines Identifiers gelockert, das * ^slicing.discriminator.path = "$this" * ^slicing.rules = #open * category.coding contains XDS 1..1 MS - * category.coding[XDS] from http://ihe-d.de/ValueSets/IHEXDSclassCode (required) * system 1..1 MS + * system = "http://ihe-d.de/CodeSystems/IHEXDSclassCode" * ^short = "Kodiersystem" * code 1..1 MS * ^short = "Code"