diff --git a/fsh-generated/fsh-index.json b/fsh-generated/fsh-index.json index 97a96bb..f61e0eb 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 a9c5624..d1e4db1 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 cd577be..8fc9dc7 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 81d412c..45044cb 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 1481d59..8096eef 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 82876fb..dc00cb9 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 4a41df7..95d7f96 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 be5c527..888e580 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 )