diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java b/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java
index 4c8481e7..b5b499ea 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/FhirProperties.java
@@ -76,6 +76,7 @@ public static class FhirSystems {
private String miiCsOnkoStrahlentherapieZielgebiet;
private String strahlentherapieProcedureId;
private String systemischeTherapieProcedureId;
+ private String miiCsOnkoSystemischeTherapieArt;
private String miiCsOnkoSeitenlokalisation;
private String conditionVerStatus;
private String icdo3MorphologieOid;
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapper.java
index 1efb9976..fc1dc17d 100644
--- a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapper.java
+++ b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapper.java
@@ -83,9 +83,15 @@ public Procedure map(SYSTTyp syst, Reference subject) {
procedure.setPerformed(performed);
}
- // Set to absent as of now
var code = new CodeableConcept();
+ // Always add absent OPS
code.addCoding().setSystem(fhirProperties.getSystems().getOps()).setCodeElement(dataAbsentCode);
+ if (null != syst.getTherapieart()) {
+ code.addCoding()
+ .setSystem(fhirProperties.getSystems().getMiiCsOnkoSystemischeTherapieArt())
+ .setCode(syst.getTherapieart().value());
+ }
+
procedure.setCode(code);
// TODO: Same as in Strahlentherapie?
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 8e048acb..e187e5a3 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -67,6 +67,7 @@ fhir:
mii-cs-onko-strahlentherapie-strahlenart: "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-strahlentherapie-strahlenart"
mii-cs-onko-strahlentherapie-zielgebiet: "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-strahlentherapie-zielgebiet"
mii-cs-onko-seitenlokalisation: "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-seitenlokalisation"
+ mii-cs-onko-systemische-therapie-art: "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-therapie-typ"
profiles:
histologie: "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Histologie"
grading: "http://dktk.dkfz.de/fhir/StructureDefinition/onco-core-Observation-Grading"
diff --git a/src/main/resources/schema/oBDS_v3.0.3.bindings.xjb b/src/main/resources/schema/oBDS_v3.0.3.bindings.xjb
index d1ead5b7..61bf0d0f 100644
--- a/src/main/resources/schema/oBDS_v3.0.3.bindings.xjb
+++ b/src/main/resources/schema/oBDS_v3.0.3.bindings.xjb
@@ -31,5 +31,8 @@
+
+
+
diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json
index 252b1d4d..d28cee43 100644
--- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json
+++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json
@@ -27,13 +27,8 @@
},
"code": {
"coding": [ {
- "system": "http://fhir.de/CodeSystem/bfarm/ops",
- "_code": {
- "extension": [ {
- "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason",
- "valueCode": "unknown"
- } ]
- }
+ "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-therapie-typ",
+ "code": "IM"
} ]
},
"subject": {
diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json
index d7983f13..45b3b5ed 100644
--- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json
+++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json
@@ -27,13 +27,8 @@
},
"code": {
"coding": [ {
- "system": "http://fhir.de/CodeSystem/bfarm/ops",
- "_code": {
- "extension": [ {
- "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason",
- "valueCode": "unknown"
- } ]
- }
+ "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-therapie-typ",
+ "code": "HO"
} ]
},
"subject": {
diff --git a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_3.xml.approved.fhir.json b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_3.xml.approved.fhir.json
index 66bf3c1a..3ce37227 100644
--- a/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_3.xml.approved.fhir.json
+++ b/src/test/java/snapshots/org/miracum/streams/ume/obdstofhir/mapper/mii/SystemischeTherapieMapperTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_3.xml.approved.fhir.json
@@ -27,13 +27,8 @@
},
"code": {
"coding": [ {
- "system": "http://fhir.de/CodeSystem/bfarm/ops",
- "_code": {
- "extension": [ {
- "url": "http://hl7.org/fhir/StructureDefinition/data-absent-reason",
- "valueCode": "unknown"
- } ]
- }
+ "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-therapie-typ",
+ "code": "CH"
} ]
},
"subject": {