From aef9dd7889ddf03cc75f5d682a26380ac6fb75d3 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Mon, 28 Aug 2023 12:17:29 +0200
Subject: Issue #29: Aktualisiere keinen EcogStatus vor Diagnosedatum

---
 src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java')

diff --git a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java
index 16fe577..e0d3037 100644
--- a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java
@@ -71,7 +71,7 @@ public class SystemtherapieAnalyzer implements IProcedureAnalyzer {
 
     @Override
     public boolean isRelevantForAnalyzer(Procedure procedure, Disease disease) {
-        return null != procedure && (
+        return null != procedure && null != disease && (
                 procedure.getFormName().equals("OS.Systemische Therapie")
                         || procedure.getFormName().equals("OS.Systemische Therapie.VarianteUKW")
         );
@@ -106,7 +106,11 @@ public class SystemtherapieAnalyzer implements IProcedureAnalyzer {
             return;
         }
 
-        var ecogFromCompleted = systemtherapieService.ecogSatus(procedure.getPatient());
+        var ecogFromCompleted = systemtherapieService.ecogSatus(procedure.getPatient())
+                .stream()
+                .filter(ecogStatusWithDate -> ecogStatusWithDate.getDate().after(disease.getDiagnosisDate()))
+                .collect(Collectors.toList());
+
         if (ecogFromCompleted.isEmpty()) {
             // Nothing to do
             return;
-- 
cgit v1.2.3