Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/unique sites #48

Merged
merged 2 commits into from
Aug 2, 2024
Merged

Fix/unique sites #48

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf3f2ff
extend tests with strahlenart
Jul 31, 2024
66924c9
fix tnm version and adapt tests
Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fix tnm version and adapt tests
  • Loading branch information
[email protected] committed Aug 1, 2024
commit 66924c90a7350e8484e6d286b7875a78a4ff5f7d
17 changes: 4 additions & 13 deletions src/main/resources/MDS2FHIR.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1323,14 +1323,14 @@
<reference value="Condition/{$Diagnosis_ID}"/>
</focus>
<effectiveDateTime value="{mds2fhir:transformDate(Datum)}"/>
<xsl:if test="UICC_Stadium!=''">
<xsl:if test="TNM-Version!=''">
<valueCodeableConcept>
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/UiccstadiumCS"/>
<xsl:if test="TNM-Version!=''">
<version value="{TNM-Version}"/>
<version value="{TNM-Version}"/>
<xsl:if test="UICC_Stadium!=''">
<code value="{UICC_Stadium[1]}"/>
</xsl:if>
<code value="{UICC_Stadium[1]}"/>
</coding>
</valueCodeableConcept>
</xsl:if>
Expand Down Expand Up @@ -1359,9 +1359,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="{TNM-T}"/>
<xsl:if test="TNM-Version!=''">
<version value="{TNM-Version}"/>
</xsl:if>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1391,9 +1388,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="{TNM-N}"/>
<xsl:if test="TNM-Version!=''">
<version value="{TNM-Version}"/>
</xsl:if>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1423,9 +1417,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="{TNM-M}"/>
<xsl:if test="TNM-Version!=''">
<version value="{TNM-Version}"/>
</xsl:if>
</coding>
</valueCodeableConcept>
</component>
Expand Down
30 changes: 12 additions & 18 deletions src/test/resources/FHIR_ADT_Expected-File-1.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -881,6 +881,12 @@
<reference value="Condition/digc8edfdcb9555eed6"/>
</focus>
<effectiveDateTime value="2021-03-16"/>
<valueCodeableConcept>
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/UiccstadiumCS"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
<component>
<extension url="http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Extension-TNMcpuPraefix">
<valueCodeableConcept>
Expand All @@ -899,7 +905,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -921,7 +926,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -943,7 +947,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1074,6 +1077,12 @@
<reference value="Condition/digc8edfdcb9555eed6"/>
</focus>
<effectiveDateTime value="1991-03-16"/>
<valueCodeableConcept>
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/UiccstadiumCS"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
<component>
<extension url="http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Extension-TNMcpuPraefix">
<valueCodeableConcept>
Expand All @@ -1092,7 +1101,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1114,7 +1122,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1136,7 +1143,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1568,7 +1574,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1590,7 +1595,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1612,7 +1616,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -2027,7 +2030,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -2049,7 +2051,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -2071,7 +2072,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -3680,7 +3680,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3702,7 +3701,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3724,7 +3722,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -4369,7 +4366,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="4e"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -4391,7 +4387,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="(sn)(mol+)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -4413,7 +4408,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="2(cy-)"/>
<version value="6"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down
21 changes: 0 additions & 21 deletions src/test/resources/FHIR_ADT_Expected-File-3.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1102,7 +1102,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="1a"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1124,7 +1123,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1146,7 +1144,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1302,7 +1299,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="1a"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1324,7 +1320,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1346,7 +1341,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -1632,7 +1626,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="1a"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1654,7 +1647,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -1676,7 +1668,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -3076,7 +3067,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="1"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3098,7 +3088,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3120,7 +3109,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -3718,7 +3706,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="2"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3740,7 +3727,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3762,7 +3748,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="1"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -3927,7 +3912,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="2"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3949,7 +3933,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -3971,7 +3954,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="1"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down Expand Up @@ -4159,7 +4141,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMTCS"/>
<code value="2"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -4181,7 +4162,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMNCS"/>
<code value="0"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand All @@ -4203,7 +4183,6 @@
<coding>
<system value="http://dktk.dkfz.de/fhir/onco/core/CodeSystem/TNMMCS"/>
<code value="1"/>
<version value="8"/>
</coding>
</valueCodeableConcept>
</component>
Expand Down
Loading
Loading