From 26d0715ddb748144a30f02a1e9d16d5ca073aa4d Mon Sep 17 00:00:00 2001 From: ThomasDeBe Date: Fri, 11 Oct 2024 13:34:29 +0200 Subject: [PATCH 1/6] added files after running _updatePublisher --- _gencontinuous.bat | 2 + _gencontinuous.sh | 2 + _updatePublisher.sh | 3 + fsh-generated/fsh-index.json | 2 +- fsh-generated/fsh-index.txt | 2 +- ...ion-mii-pr-onko-diagnose-primaertumor.json | 210 +++++++++++++++++- .../mii-pr-onko-diagnose-primaertumor.fsh | 14 ++ input/fsh/rulesets/translation.fsh | 6 + 8 files changed, 236 insertions(+), 5 deletions(-) create mode 100644 _gencontinuous.bat create mode 100644 _gencontinuous.sh create mode 100644 input/fsh/rulesets/translation.fsh diff --git a/_gencontinuous.bat b/_gencontinuous.bat new file mode 100644 index 00000000..ca2867a5 --- /dev/null +++ b/_gencontinuous.bat @@ -0,0 +1,2 @@ +@ECHO OFF +CALL ./_genonce.bat -watch \ No newline at end of file diff --git a/_gencontinuous.sh b/_gencontinuous.sh new file mode 100644 index 00000000..b9ac5933 --- /dev/null +++ b/_gencontinuous.sh @@ -0,0 +1,2 @@ +#!/bin/bash +./_genonce.sh -watch diff --git a/_updatePublisher.sh b/_updatePublisher.sh index f127f661..0f9ecbed 100755 --- a/_updatePublisher.sh +++ b/_updatePublisher.sh @@ -117,13 +117,16 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then curl -L $gencont_sh_url -o /tmp/_gencontinuous.new cp /tmp/_gencontinuous.new _gencontinuous.sh + chmod +x _gencontinuous.sh rm /tmp/_gencontinuous.new curl -L $gen_sh_url -o /tmp/_genonce.new cp /tmp/_genonce.new _genonce.sh + chmod +x _genonce.sh rm /tmp/_genonce.new curl -L $update_sh_url -o /tmp/_updatePublisher.new cp /tmp/_updatePublisher.new _updatePublisher.sh + chmod +x _updatePublisher.sh rm /tmp/_updatePublisher.new fi diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json index d996f21f..97a96bb4 100644 --- a/fsh-generated/fsh-index.json +++ b/fsh-generated/fsh-index.json @@ -1301,7 +1301,7 @@ "fshType": "Profile", "fshFile": "oBDS\\05_Diagnose\\mii-pr-onko-diagnose-primaertumor.fsh", "startLine": 1, - "endLine": 40 + "endLine": 54 }, { "outputFile": "StructureDefinition-mii-pr-onko-fernmetastasen.json", diff --git a/fsh-generated/fsh-index.txt b/fsh-generated/fsh-index.txt index 65430cfe..a9c56240 100644 --- a/fsh-generated/fsh-index.txt +++ b/fsh-generated/fsh-index.txt @@ -161,7 +161,7 @@ StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh 1 - 53 StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Sentinel_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh 1 - 54 StructureDefinition-mii-pr-onko-befund.json MII_PR_Onko_Befund Profile oBDS\06_Histologie\mii-pr-onko-befund.fsh 1 - 34 -StructureDefinition-mii-pr-onko-diagnose-primaertumor.json MII_PR_Onko_Diagnose_Primaertumor Profile oBDS\05_Diagnose\mii-pr-onko-diagnose-primaertumor.fsh 1 - 40 +StructureDefinition-mii-pr-onko-diagnose-primaertumor.json MII_PR_Onko_Diagnose_Primaertumor Profile oBDS\05_Diagnose\mii-pr-onko-diagnose-primaertumor.fsh 1 - 54 StructureDefinition-mii-pr-onko-fernmetastasen.json MII_PR_Onko_Fernmetastasen Profile oBDS\11_Fernmetastasen\mii-pr-onko-fernmetastasen.fsh 1 - 43 StructureDefinition-mii-pr-onko-genetische-variante.json MII_PR_Onko_Genetische_Variante Profile oBDS\23_GenetischeVariante\mii-pr-onko-genetische-variante.fsh 1 - 33 StructureDefinition-mii-pr-onko-grading.json MII_PR_Onko_Grading Profile oBDS\06_Histologie\mii-pr-onko-grading.fsh 2 - 49 diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-diagnose-primaertumor.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-diagnose-primaertumor.json index 586d7e0c..f8cdb348 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-diagnose-primaertumor.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-diagnose-primaertumor.json @@ -5,6 +5,23 @@ "version": "2025.0.0", "name": "MII_PR_Onko_Diagnose_Primaertumor", "title": "MII PR Onkologie Diagnose Primärtumor", + "_title": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Onkologische Diagnose im Rahmen einer onkologischen Erkrankung" + } + ] + } + ] + }, "status": "active", "publisher": "Medizininformatik Initiative", "contact": [ @@ -18,6 +35,23 @@ } ], "description": "Dieses Profil beschreibt die Diagnose des Primärtumors (bzw. der primären hämatologisch-myeloneoplastischen Erkrankung)", + "_description": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Diagnose des Primärtumors bzw. der primären hämatologisch-myeloneoplastischen Erkrankung im Rahmen einer onkologischen Erkrankung" + } + ] + } + ] + }, "fhirVersion": "4.0.1", "mapping": [ { @@ -67,7 +101,41 @@ ] } ], - "mustSupport": true + "mustSupport": true, + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "ICD-O-Morphologie" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Morphologie des Primärtumors nach ICD-O-3 nach 6.3 oBDS" + } + ] + } + ] + } }, { "id": "Condition.extension:morphology-behavior-icdo3.value[x].coding.version", @@ -149,6 +217,40 @@ "binding": { "strength": "required", "valueSet": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/ValueSet/mii-vs-onko-primaertumor-diagnosesicherung" + }, + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Diagnosesicherung gemäß oBDS" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Art der Diagnosesicherung nach 5.7 oBDS 2021" + } + ] + } + ] } }, { @@ -211,7 +313,41 @@ { "id": "Condition.bodySite.coding:icd-o-3", "path": "Condition.bodySite.coding", - "sliceName": "icd-o-3" + "sliceName": "icd-o-3", + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "ICD-O-Topographie" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "LiTopographie des Primärtumors nach ICD-O-3 nach 5.4 oBDS 2021" + } + ] + } + ] + } }, { "id": "Condition.bodySite.coding:icd-o-3.version", @@ -248,6 +384,40 @@ "binding": { "strength": "required", "valueSet": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/ValueSet/mii-vs-onko-seitenlokalisation" + }, + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Seitenlokalisation des Primärtumors gemäß oBDS" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Seitenlokalisation des Primärtumors nach 5.8 oBDS 2021" + } + ] + } + ] } }, { @@ -312,7 +482,41 @@ ] } ], - "mustSupport": true + "mustSupport": true, + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Evidenz für Erstdiagnose" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Liste aller für die Erstdiagnose ausschlaggebenden Beobachtungen" + } + ] + } + ] + } } ] } diff --git a/input/fsh/oBDS/05_Diagnose/mii-pr-onko-diagnose-primaertumor.fsh b/input/fsh/oBDS/05_Diagnose/mii-pr-onko-diagnose-primaertumor.fsh index a2315266..524d9bd1 100644 --- a/input/fsh/oBDS/05_Diagnose/mii-pr-onko-diagnose-primaertumor.fsh +++ b/input/fsh/oBDS/05_Diagnose/mii-pr-onko-diagnose-primaertumor.fsh @@ -6,6 +6,8 @@ Description: "Dieses Profil beschreibt die Diagnose des Primärtumors (bzw. der * insert PR_CS_VS_Version * insert Publisher * ^status = #active +* insert Translation(^title, de-DE, Onkologische Diagnose im Rahmen einer onkologischen Erkrankung) +* insert Translation(^description, de-DE, Diagnose des Primärtumors bzw. der primären hämatologisch-myeloneoplastischen Erkrankung im Rahmen einer onkologischen Erkrankung) * meta.profile 0..* MS * encounter 0..1 MS * subject 1..1 MS @@ -23,21 +25,33 @@ Description: "Dieses Profil beschreibt die Diagnose des Primärtumors (bzw. der * verificationStatus.coding[primaertumorDiagnosesicherung] from mii-vs-onko-primaertumor-diagnosesicherung (required) * verificationStatus.coding[primaertumorDiagnosesicherung].code 1.. MS * verificationStatus.coding[primaertumorDiagnosesicherung].system 1.. MS +* insert Translation(verificationStatus.coding[primaertumorDiagnosesicherung] ^short, de-DE, Diagnosesicherung gemäß oBDS ) +* insert Translation(verificationStatus.coding[primaertumorDiagnosesicherung] ^definition, de-DE, Art der Diagnosesicherung nach 5.7 oBDS 2021 ) + * bodySite.coding contains primaertumorSeitenlokalisation 0..1 MS * bodySite.coding[primaertumorSeitenlokalisation] from mii-vs-onko-seitenlokalisation * bodySite.coding[primaertumorSeitenlokalisation].system 1.. MS * bodySite.coding[primaertumorSeitenlokalisation] ^patternCoding.system = $mii-cs-onko-seitenlokalisation * bodySite.coding[primaertumorSeitenlokalisation].code 1.. MS +* insert Translation(bodySite.coding[primaertumorSeitenlokalisation] ^short, de-DE, Seitenlokalisation des Primärtumors gemäß oBDS ) +* insert Translation(bodySite.coding[primaertumorSeitenlokalisation] ^definition, de-DE, Seitenlokalisation des Primärtumors nach 5.8 oBDS 2021 ) +* insert Translation(bodySite.coding[icd-o-3] ^short, de-DE, ICD-O-Topographie ) +* insert Translation(bodySite.coding[icd-o-3] ^definition, de-DE, LiTopographie des Primärtumors nach ICD-O-3 nach 5.4 oBDS 2021 ) + * evidence 0..1 MS * evidence.detail MS * evidence.detail only Reference(MII_PR_Onko_Liste_Evidenz_Erstdiagnose) +* insert Translation(evidence.detail ^short, de-DE, Evidenz für Erstdiagnose ) +* insert Translation(evidence.detail ^definition, de-DE, Liste aller für die Erstdiagnose ausschlaggebenden Beobachtungen) * extension MS * extension ^slicing.discriminator.type = #value * extension ^slicing.discriminator.path = "url" * extension ^slicing.rules = #open * extension contains MII_EX_Onko_Histology_Morphology_Behavior_ICDO3 named morphology-behavior-icdo3 0..1 MS +* insert Translation(extension[morphology-behavior-icdo3] ^short, de-DE, ICD-O-Morphologie ) +* insert Translation(extension[morphology-behavior-icdo3] ^definition, de-DE, Morphologie des Primärtumors nach ICD-O-3 nach 6.3 oBDS ) Mapping: FHIR-oBDS-Diagnose Id: oBDS diff --git a/input/fsh/rulesets/translation.fsh b/input/fsh/rulesets/translation.fsh new file mode 100644 index 00000000..abf62048 --- /dev/null +++ b/input/fsh/rulesets/translation.fsh @@ -0,0 +1,6 @@ +RuleSet: Translation(path, language, translation) +* {path}.extension[+].url = "http://hl7.org/fhir/StructureDefinition/translation" +* {path}.extension[=].extension[0].url = "lang" +* {path}.extension[=].extension[0].valueCode = #{language} +* {path}.extension[=].extension[1].url = "content" +* {path}.extension[=].extension[1].valueString = "{translation}" \ No newline at end of file From 58a01fc6caed4a5a5c2447a76310b9db310c954f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Debertsh=C3=A4user?= Date: Fri, 11 Oct 2024 14:36:07 +0200 Subject: [PATCH 2/6] adjusted mapping from Histology --- input/fsh/oBDS/06_Histologie/mii-pr-onko-specimen.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-specimen.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-specimen.fsh index 4f18bcd5..24bd4def 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-specimen.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-specimen.fsh @@ -21,4 +21,4 @@ Title: "Mapping FHIR zu oBDS" Source: MII_PR_Onko_Specimen * -> "6" "Histologie" * collection.collectedDateTime -> "6.1" "Tumor Histologiedatum" -* identifier.value -> "6.2" "Histologie-Einsendenummer" \ No newline at end of file +* accessionIdentifier.value -> "6.2" "Histologie-Einsendenummer" \ No newline at end of file From dab53d260a808d3755566dc8f43bc1362edd46f0 Mon Sep 17 00:00:00 2001 From: ThomasDeBe Date: Fri, 11 Oct 2024 14:46:07 +0200 Subject: [PATCH 3/6] correcting mapping in specimen --- input/fsh/oBDS/06_Histologie/mii-pr-onko-befund.fsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-befund.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-befund.fsh index c369b5d4..d4b5ff2e 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-befund.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-befund.fsh @@ -20,7 +20,7 @@ Description: "Histologie: Befund. Vollständiger Befundbericht des Pathologen." * specimen 0..* MS * specimen only Reference(MII_PR_Onko_Specimen or Specimen) * code MS -* code ^short = "Pathology report code" +* code ^short = "Pathology report code" * code.coding MS * code.coding ^slicing.discriminator.type = #pattern * code.coding ^slicing.discriminator.path = "$this" From 3fe5a41980af814576707c194333c4fd1e2a4207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Debertsh=C3=A4user?= Date: Fri, 11 Oct 2024 15:05:10 +0200 Subject: [PATCH 4/6] added correct subject to IG page diagnosis --- .../FHIR-Profile/Diagnose/Diagnose-Condition.page.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/implementation-guides/ImplementationGuide-2024.x-DE/MIIIGModulOnkologie/TechnischeImplementierung/FHIR-Profile/Diagnose/Diagnose-Condition.page.md b/implementation-guides/ImplementationGuide-2024.x-DE/MIIIGModulOnkologie/TechnischeImplementierung/FHIR-Profile/Diagnose/Diagnose-Condition.page.md index d377b324..52337d0f 100644 --- a/implementation-guides/ImplementationGuide-2024.x-DE/MIIIGModulOnkologie/TechnischeImplementierung/FHIR-Profile/Diagnose/Diagnose-Condition.page.md +++ b/implementation-guides/ImplementationGuide-2024.x-DE/MIIIGModulOnkologie/TechnischeImplementierung/FHIR-Profile/Diagnose/Diagnose-Condition.page.md @@ -1,7 +1,7 @@ --- parent: topic: DiagnoseCondition -subject: https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-diagnose_primaertumor +subject: https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-diagnose-primaertumor --- ## {{page-title}} From 9896ac0050096fe8aaf1d330865a2c327010d3f5 Mon Sep 17 00:00:00 2001 From: ThomasDeBe Date: Fri, 11 Oct 2024 15:06:27 +0200 Subject: [PATCH 5/6] added FDPG description to Lymph nodes --- .../06_Histologie/mii-pr-onko-anzahl-befallene-lymphknoten.fsh | 2 ++ .../mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh | 3 +++ .../mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh | 3 +++ .../mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh | 3 +++ 4 files changed, 11 insertions(+) diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-lymphknoten.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-lymphknoten.fsh index fd8153c6..72612126 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-lymphknoten.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-lymphknoten.fsh @@ -45,6 +45,8 @@ Description: "Histologie: Anzahl der befallenen Lymphknoten. Gibt an, wie viele * valueQuantity.system = $UCUM (exactly) * valueQuantity.unit 1.. MS * valueQuantity.value 1.. MS +* insert Translation(valueQuantity.value ^short, de-DE, Anzahl befallener Lymphknoten ) +* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl befallener Lymphknoten nach 6.8 oBDS 2021 ) // Referenz zu Primärtumor diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh index 192dee11..84fcbb7b 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh @@ -46,6 +46,9 @@ Description: "Histologie: Anzahl der befallenen Sentinel-Lymphknoten. Gibt an, w * valueQuantity.system = $UCUM (exactly) * valueQuantity.unit 1.. MS * valueQuantity.value 1.. MS +* insert Translation(valueQuantity.value ^short, de-DE, Anzahl befallener Sentinel-Lymphknoten ) +* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl befallener Lymphknoten nach 6.10 oBDS 2021 ) + // Referenz zu Primärtumor diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh index bb9bbf3b..0e657e17 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh @@ -46,6 +46,9 @@ Description: "Histologie: Anzahl der untersuchten Lymphknoten. Gibt an, wie viel * valueQuantity.system = $UCUM (exactly) * valueQuantity.unit 1.. MS * valueQuantity.value 1.. MS +* insert Translation(valueQuantity.value ^short, de-DE, Anzahl untersuchter Lymphknoten ) +* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl untersuchter Lymphknoten nach 6.7 oBDS 2021 ) + // Referenz zu Primärtumor diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh index b09170d9..be5c527e 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh @@ -46,6 +46,9 @@ Description: "Histologie: Anzahl der untersuchten Sentinel-Lymphknoten. Gibt an, * valueQuantity.system = $UCUM (exactly) * valueQuantity.unit 1.. MS * valueQuantity.value 1.. MS +* insert Translation(valueQuantity.value ^short, de-DE, Anzahl untersuchter Lymphknoten ) +* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl untersuchter SentinelLymphknoten nach 6.8 oBDS 2021 ) + From 4b0f4972e761d0469f67de18e85af4c6277bad0a Mon Sep 17 00:00:00 2001 From: ThomasDeBe Date: Fri, 11 Oct 2024 15:09:06 +0200 Subject: [PATCH 6/6] ran sushi --- fsh-generated/fsh-index.json | 10 +++--- fsh-generated/fsh-index.txt | 10 +++--- ...-pr-onko-anzahl-befallene-lymphknoten.json | 36 ++++++++++++++++++- ...anzahl-befallene-sentinel-lymphknoten.json | 36 ++++++++++++++++++- ...r-onko-anzahl-untersuchte-lymphknoten.json | 36 ++++++++++++++++++- ...zahl-untersuchte-sentinel-lymphknoten.json | 36 ++++++++++++++++++- ...uctureDefinition-mii-pr-onko-specimen.json | 20 +++++++---- ...nzahl-untersuchte-sentinel-lymphknoten.fsh | 4 +-- 8 files changed, 165 insertions(+), 23 deletions(-) diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json index 97a96bb4..f61e0eb2 100644 --- a/fsh-generated/fsh-index.json +++ b/fsh-generated/fsh-index.json @@ -1261,7 +1261,7 @@ "fshType": "Profile", "fshFile": "oBDS\\06_Histologie\\mii-pr-onko-anzahl-befallene-lymphknoten.fsh", "startLine": 1, - "endLine": 52 + "endLine": 54 }, { "outputFile": "StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json", @@ -1269,7 +1269,7 @@ "fshType": "Profile", "fshFile": "oBDS\\06_Histologie\\mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh", "startLine": 1, - "endLine": 53 + "endLine": 56 }, { "outputFile": "StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json", @@ -1277,7 +1277,7 @@ "fshType": "Profile", "fshFile": "oBDS\\06_Histologie\\mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh", "startLine": 1, - "endLine": 53 + "endLine": 56 }, { "outputFile": "StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json", @@ -1285,7 +1285,7 @@ "fshType": "Profile", "fshFile": "oBDS\\06_Histologie\\mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh", "startLine": 1, - "endLine": 54 + "endLine": 57 }, { "outputFile": "StructureDefinition-mii-pr-onko-befund.json", @@ -1373,7 +1373,7 @@ "fshType": "Profile", "fshFile": "oBDS\\06_Histologie\\mii-pr-onko-specimen.fsh", "startLine": 1, - "endLine": 14 + "endLine": 16 }, { "outputFile": "StructureDefinition-mii-pr-onko-strahlentherapie.json", diff --git a/fsh-generated/fsh-index.txt b/fsh-generated/fsh-index.txt index a9c56240..d1e4db11 100644 --- a/fsh-generated/fsh-index.txt +++ b/fsh-generated/fsh-index.txt @@ -156,10 +156,10 @@ StructureDefinition-mii-ex-onko-tnm-itc-suffix.json StructureDefinition-mii-ex-onko-tnm-sn-suffix.json MII_EX_Onko_TNM_SN_Suffix Extension oBDS\08_TNMKlassifikation\mii-ex-onko-tnm-sn-suffix.fsh 1 - 11 StructureDefinition-mii-lm-onko.json MII_LM_Onko Logical mii-lm-onko.fsh 1 - 123 StructureDefinition-mii-pr-onko-allgemeiner-leistungszustand.json MII_PR_Onko_Allgemeiner_Leistungszustand Profile oBDS\12_Allgemeiner_Leistungszustand\mii-pr-onko-allgemeiner-leistungszustand.fsh 1 - 52 -StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json MII_PR_Onko_Anzahl_Befallene_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-befallene-lymphknoten.fsh 1 - 52 -StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json MII_PR_Onko_Anzahl_Befallene_Sentinel_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh 1 - 53 -StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh 1 - 53 -StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Sentinel_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh 1 - 54 +StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json MII_PR_Onko_Anzahl_Befallene_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-befallene-lymphknoten.fsh 1 - 54 +StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json MII_PR_Onko_Anzahl_Befallene_Sentinel_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.fsh 1 - 56 +StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-lymphknoten.fsh 1 - 56 +StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json MII_PR_Onko_Anzahl_Untersuchte_Sentinel_Lymphknoten Profile oBDS\06_Histologie\mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh 1 - 57 StructureDefinition-mii-pr-onko-befund.json MII_PR_Onko_Befund Profile oBDS\06_Histologie\mii-pr-onko-befund.fsh 1 - 34 StructureDefinition-mii-pr-onko-diagnose-primaertumor.json MII_PR_Onko_Diagnose_Primaertumor Profile oBDS\05_Diagnose\mii-pr-onko-diagnose-primaertumor.fsh 1 - 54 StructureDefinition-mii-pr-onko-fernmetastasen.json MII_PR_Onko_Fernmetastasen Profile oBDS\11_Fernmetastasen\mii-pr-onko-fernmetastasen.fsh 1 - 43 @@ -170,7 +170,7 @@ StructureDefinition-mii-pr-onko-liste-evidenz-erstdiagnose.json StructureDefinition-mii-pr-onko-nebenwirkung-adverse-event.json MII_PR_Onko_Nebenwirkung_Adverse_Event Profile oBDS\15_Nebenwirkung_ST_SYST\mii-pr-onko-nebenwirkung-adverseEvent.fsh 1 - 36 StructureDefinition-mii-pr-onko-operation.json MII_PR_Onko_Operation Profile oBDS\13_OP\mii-pr-onko-operation.fsh 1 - 65 StructureDefinition-mii-pr-onko-residualstatus.json MII_PR_Onko_Residualstatus Profile oBDS\10_Residualstatus\mii-pr-onko-residualstatus.fsh 1 - 49 -StructureDefinition-mii-pr-onko-specimen.json MII_PR_Onko_Specimen Profile oBDS\06_Histologie\mii-pr-onko-specimen.fsh 1 - 14 +StructureDefinition-mii-pr-onko-specimen.json MII_PR_Onko_Specimen Profile oBDS\06_Histologie\mii-pr-onko-specimen.fsh 1 - 16 StructureDefinition-mii-pr-onko-strahlentherapie.json MII_PR_Onko_Strahlentherapie Profile oBDS\14_Strahlentherapie\mii-pr-onko-strahlentherapie.fsh 1 - 54 StructureDefinition-mii-pr-onko-studienteilnahme.json MII_PR_Onko_Studienteilnahme Profile oBDS\24_Studienteilnahme\mii-pr-onko-studienteilnahme.fsh 1 - 36 StructureDefinition-mii-pr-onko-systemische-therapie-medikation.json MII_PR_Onko_Systemische_Therapie_Medikation Profile oBDS\16_SystemischeTherapie\mii-pr-onko-systemische-therapie-medikation.fsh 1 - 33 diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json index cd577beb..8fc9dc7b 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-lymphknoten.json @@ -197,7 +197,41 @@ "map": "6.8", "comment": "Anzahl der befallenen Lymphknoten" } - ] + ], + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl befallener Lymphknoten" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl befallener Lymphknoten nach 6.8 oBDS 2021" + } + ] + } + ] + } }, { "id": "Observation.value[x].unit", diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json index 81d412cf..45044cbd 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-befallene-sentinel-lymphknoten.json @@ -197,7 +197,41 @@ "map": "6.10", "comment": "Anzahl der befallenen Sentinel-Lymphknoten" } - ] + ], + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl befallener Sentinel-Lymphknoten" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl befallener Lymphknoten nach 6.10 oBDS 2021" + } + ] + } + ] + } }, { "id": "Observation.value[x].unit", diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json index 1481d591..8096eef0 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-lymphknoten.json @@ -197,7 +197,41 @@ "map": "6.7", "comment": "Anzahl der untersuchten Lymphknoten" } - ] + ], + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl untersuchter Lymphknoten" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl untersuchter Lymphknoten nach 6.7 oBDS 2021" + } + ] + } + ] + } }, { "id": "Observation.value[x].unit", diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json index 82876fbf..dc00cb9f 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.json @@ -197,7 +197,41 @@ "map": "6.9", "comment": "Anzahl der untersuchten Sentinel-Lymphknoten" } - ] + ], + "_short": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl untersuchter Lymphknoten" + } + ] + } + ] + }, + "_definition": { + "extension": [ + { + "url": "http://hl7.org/fhir/StructureDefinition/translation", + "extension": [ + { + "url": "lang", + "valueCode": "de-DE" + }, + { + "url": "content", + "valueString": "Anzahl untersuchter SentinelLymphknoten nach 6.8 oBDS 2021" + } + ] + } + ] + } }, { "id": "Observation.value[x].unit", diff --git a/fsh-generated/resources/StructureDefinition-mii-pr-onko-specimen.json b/fsh-generated/resources/StructureDefinition-mii-pr-onko-specimen.json index 4a41df78..95d7f967 100644 --- a/fsh-generated/resources/StructureDefinition-mii-pr-onko-specimen.json +++ b/fsh-generated/resources/StructureDefinition-mii-pr-onko-specimen.json @@ -49,8 +49,14 @@ "mustSupport": true }, { - "id": "Specimen.identifier.value", - "path": "Specimen.identifier.value", + "id": "Specimen.accessionIdentifier", + "path": "Specimen.accessionIdentifier", + "mustSupport": true + }, + { + "id": "Specimen.accessionIdentifier.value", + "path": "Specimen.accessionIdentifier.value", + "mustSupport": true, "mapping": [ { "identity": "oBDS", @@ -59,11 +65,6 @@ } ] }, - { - "id": "Specimen.accessionIdentifier.value", - "path": "Specimen.accessionIdentifier.value", - "mustSupport": true - }, { "id": "Specimen.subject", "path": "Specimen.subject", @@ -78,6 +79,11 @@ ], "mustSupport": true }, + { + "id": "Specimen.collection", + "path": "Specimen.collection", + "mustSupport": true + }, { "id": "Specimen.collection.collected[x]", "path": "Specimen.collection.collected[x]", diff --git a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh index be5c527e..888e5805 100644 --- a/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh +++ b/input/fsh/oBDS/06_Histologie/mii-pr-onko-anzahl-untersuchte-sentinel-lymphknoten.fsh @@ -46,8 +46,8 @@ Description: "Histologie: Anzahl der untersuchten Sentinel-Lymphknoten. Gibt an, * valueQuantity.system = $UCUM (exactly) * valueQuantity.unit 1.. MS * valueQuantity.value 1.. MS -* insert Translation(valueQuantity.value ^short, de-DE, Anzahl untersuchter Lymphknoten ) -* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl untersuchter SentinelLymphknoten nach 6.8 oBDS 2021 ) +* insert Translation(valueQuantity.value ^short, de-DE, Anzahl untersuchter Sentinel-Lymphknoten ) +* insert Translation(valueQuantity.value ^definition, de-DE, Anzahl untersuchter Sentinel-Lymphknoten nach 6.9 oBDS 2021 )