feat: set code.systemische_therapie_art if available

bzkf · Nov 20, 2024 · 194befd · 194befd
1 parent a3c2ffb
commit 194befd
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 23 deletions.
diff --git 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
@@ -83,9 +83,17 @@ public Procedure map(SYSTTyp syst, Reference subject) {
       procedure.setPerformed(performed);
     }
 
-    // Set to absent as of now
     var code = new CodeableConcept();
-    code.addCoding().setSystem(fhirProperties.getSystems().getOps()).setCodeElement(dataAbsentCode);
+    if (null != syst.getTherapieart()) {
+      code.addCoding()
+          .setSystem(fhirProperties.getSystems().getMiiCsOnkoSystemischeTherapieArt())
+          .setCode(syst.getTherapieart().value());
+    } else {
+      // Set to absent as of now
+      code.addCoding()
+          .setSystem(fhirProperties.getSystems().getOps())
+          .setCodeElement(dataAbsentCode);
+    }
     procedure.setCode(code);
 
     // TODO: Same as in Strahlentherapie?

diff --git 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
@@ -31,5 +31,8 @@
                 <jaxb:bindings node="//xs:complexType[@name='SYST_Typ']//xs:element[@name='Meldeanlass']/xs:simpleType">
             <jaxb:typesafeEnumClass name="Meldeanlass" />
         </jaxb:bindings>
+        <jaxb:bindings node="//xs:element[@name='Therapieart']/xs:simpleType">
+            <jaxb:typesafeEnumClass name="Therapieart" />
+        </jaxb:bindings>
     </jaxb:bindings>
 </jaxb:bindings>
diff --git a/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json b/...perTest.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/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json b/...perTest.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/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_3.xml.approved.fhir.json b/...perTest.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": {