rebased+updated

bzkf · Nov 27, 2024 · 7c135d8 · 7c135d8
1 parent 3a1016d
commit 7c135d8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/ObdsToFhirBundleMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/ObdsToFhirBundleMapper.java
@@ -49,7 +49,7 @@ public Bundle map(OBDS obds) {
       for (var meldung : meldungen) {
         // Diagnose
         if (meldung.getDiagnose() != null) {
-          var condition = conditionMapper.map(meldung, patientReference);
+          var condition = conditionMapper.map(meldung, patientReference, obds.getMeldedatum());
           addEntryToBundle(bundle, condition);
         }
 
@@ -63,12 +63,11 @@ public Bundle map(OBDS obds) {
           var procedureReference = new Reference("Procedure/" + systProcedure.getId());
 
           if (syst.getMengeSubstanz() != null) {
-            var systMedicationStatement =
+            var systMedicationStatements =
                 systemischeTherapieMedicationStatementMapper.map(
                     syst, patientReference, procedureReference);
-            // TODO: updated if the mapper returnss a List<> instead
-            for (var resource :
-                systMedicationStatement.getEntry().stream().map(e -> e.getResource()).toList()) {
+
+            for (var resource : systMedicationStatements) {
               addEntryToBundle(bundle, resource);
             }
           }

diff --git a/...map_withGivenObds_shouldCreateBundleMatchingSnapshot.Testpatient_1.xml.approved.fhir.json b/...map_withGivenObds_shouldCreateBundleMatchingSnapshot.Testpatient_1.xml.approved.fhir.json
@@ -39,6 +39,7 @@
   }, {
     "resource": {
       "resourceType": "Condition",
+      "id": "9896edd80f6833ea17fbb2c5ad5ca42caa1d02f41baea875f4a390be3b372356",
       "meta": {
         "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-diagnose-primaertumor" ]
       },
@@ -51,6 +52,13 @@
             "code": "8010/3"
           } ]
         }
+      }, {
+        "url": "http://hl7.org/fhir/StructureDefinition/condition-assertedDate",
+        "valueDateTime": "2020-03-01"
+      } ],
+      "identifier": [ {
+        "system": "https://bzkf.github.io/obds-to-fhir/identifiers/primaerdiagnose-id",
+        "value": "101"
       } ],
       "verificationStatus": {
         "coding": [ {
@@ -83,11 +91,11 @@
       "subject": {
         "reference": "Patient/a02e16474896f1d528cac71f2c9b4c45ac3c9028e3a53fb414a1f7882991ee07"
       },
-      "recordedDate": "2020-03-01T01:00:00+01:00"
+      "recordedDate": "2024-09-19"
     },
     "request": {
       "method": "PUT",
-      "url": "Condition/null"
+      "url": "Condition/9896edd80f6833ea17fbb2c5ad5ca42caa1d02f41baea875f4a390be3b372356"
     }
   }, {
     "resource": {
@@ -271,6 +279,7 @@
   }, {
     "resource": {
       "resourceType": "Condition",
+      "id": "5236d8328066567b90c671091d739dc044ae00f4f9e73a5d1e6c81ed9049f335",
       "meta": {
         "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-diagnose-primaertumor" ]
       },
@@ -283,6 +292,13 @@
             "code": "8010/3"
           } ]
         }
+      }, {
+        "url": "http://hl7.org/fhir/StructureDefinition/condition-assertedDate",
+        "valueDateTime": "2020-01-01"
+      } ],
+      "identifier": [ {
+        "system": "https://bzkf.github.io/obds-to-fhir/identifiers/primaerdiagnose-id",
+        "value": "102"
       } ],
       "verificationStatus": {
         "coding": [ {
@@ -315,15 +331,16 @@
       "subject": {
         "reference": "Patient/a02e16474896f1d528cac71f2c9b4c45ac3c9028e3a53fb414a1f7882991ee07"
       },
-      "recordedDate": "2020-01-01T01:00:00+01:00"
+      "recordedDate": "2024-09-19"
     },
     "request": {
       "method": "PUT",
-      "url": "Condition/null"
+      "url": "Condition/5236d8328066567b90c671091d739dc044ae00f4f9e73a5d1e6c81ed9049f335"
     }
   }, {
     "resource": {
       "resourceType": "Condition",
+      "id": "a9b49e6ae910db956adf674338ec65dff97a2d4c07c1f0449c154b90782b49d9",
       "meta": {
         "profile": [ "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/StructureDefinition/mii-pr-onko-diagnose-primaertumor" ]
       },
@@ -336,6 +353,13 @@
             "code": "8720/3"
           } ]
         }
+      }, {
+        "url": "http://hl7.org/fhir/StructureDefinition/condition-assertedDate",
+        "valueDateTime": "2020-03-01"
+      } ],
+      "identifier": [ {
+        "system": "https://bzkf.github.io/obds-to-fhir/identifiers/primaerdiagnose-id",
+        "value": "103"
       } ],
       "verificationStatus": {
         "coding": [ {
@@ -368,11 +392,11 @@
       "subject": {
         "reference": "Patient/a02e16474896f1d528cac71f2c9b4c45ac3c9028e3a53fb414a1f7882991ee07"
       },
-      "recordedDate": "2020-03-01T01:00:00+01:00"
+      "recordedDate": "2024-09-19"
     },
     "request": {
       "method": "PUT",
-      "url": "Condition/null"
+      "url": "Condition/a9b49e6ae910db956adf674338ec65dff97a2d4c07c1f0449c154b90782b49d9"
     }
   } ]
 }