1 files changed, 6 insertions, 2 deletions
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;