feat: add status, code and subject

bzkf · Dec 11, 2024 · af26860 · af26860
1 parent 958f926
commit af26860
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 5 deletions.
diff --git a/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/ResidualstatusMapper.java b/src/main/java/org/miracum/streams/ume/obdstofhir/mapper/mii/ResidualstatusMapper.java
@@ -31,12 +31,25 @@ public Observation map(ResidualstatusTyp rs, Reference patient) {
 
     var observation = new Observation();
 
+    // Subject
+    observation.setSubject(patient);
+
     // Gesamtbeurteilung des Residualstatus
-    var code = new CodeableConcept();
-    code.addCoding()
+    var value = new CodeableConcept();
+    value
+        .addCoding()
         .setSystem(fhirProperties.getSystems().getMiiCsOnkoResidualstatus())
         .setCode(rs.getGesamtbeurteilungResidualstatus().value());
-    observation.setValue(code);
+    observation.setValue(value);
+
+    // See: https://loinc.org/84892-9/
+    var code = new CodeableConcept();
+    code.addCoding().setCode(fhirProperties.getSystems().getLoinc()).setCode("84892-9");
+    observation.setCode(value);
+
+    // Status
+    // TODO: Correct status
+    observation.setStatus(Observation.ObservationStatus.UNKNOWN);
 
     return observation;
   }

diff --git a/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json b/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_1.xml.approved.fhir.json
@@ -1,9 +1,19 @@
 {
   "resourceType": "Observation",
+  "status": "unknown",
+  "code": {
+    "coding": [ {
+      "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-residualstatus",
+      "code": "R2"
+    } ]
+  },
+  "subject": {
+    "reference": "Patient/any"
+  },
   "valueCodeableConcept": {
     "coding": [ {
       "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-residualstatus",
       "code": "R2"
     } ]
   }
-}
+}
diff --git a/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json b/...perTest.map_withGivenObds_shouldCreateValidProcedure.Testpatient_2.xml.approved.fhir.json
@@ -1,9 +1,19 @@
 {
   "resourceType": "Observation",
+  "status": "unknown",
+  "code": {
+    "coding": [ {
+      "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-residualstatus",
+      "code": "R0"
+    } ]
+  },
+  "subject": {
+    "reference": "Patient/any"
+  },
   "valueCodeableConcept": {
     "coding": [ {
       "system": "https://www.medizininformatik-initiative.de/fhir/ext/modul-onko/CodeSystem/mii-cs-onko-residualstatus",
       "code": "R0"
     } ]
   }
-}
+}