Merge pull request #57 from CCC-MF/issue_54

Übernahme des ECOG-Status aus anderen Therapieformularen

2 files changed, 26 insertions, 12 deletions

diff --git a/src/main/java/DNPM/analyzer/DNPMHelper.java b/src/main/java/DNPM/analyzer/DNPMHelper.java
index 376333e..bb21fa0 100644
--- a/src/main/java/DNPM/analyzer/DNPMHelper.java
+++ b/src/main/java/DNPM/analyzer/DNPMHelper.java
@@ -1,5 +1,6 @@
 package DNPM.analyzer;
 
+import DNPM.dto.EcogStatusWithDate;
 import DNPM.VerweisVon;
 import DNPM.security.DelegatingDataBasedPermissionEvaluator;
 import DNPM.security.IllegalSecuredObjectAccessException;
@@ -237,7 +238,7 @@ public class DNPMHelper extends BackendService {
 
     }
 
-    public List<SystemtherapieService.EcogStatusWithDate> getEcogStatus(final Map<String, Object> input) {
+    public List<EcogStatusWithDate> getEcogStatus(final Map<String, Object> input) {
         var pid = AnalyzerUtils.getRequiredId(input, "PatientId");
         if (pid.isEmpty()) {
             logger.error("Kein Parameter 'PatientId' angegeben, gebe leere Liste zurück");
diff --git a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java
index f886f3d..46841e1 100644
--- a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java
+++ b/src/main/java/DNPM/analyzer/TherapieMitEcogAnalyzer.java
@@ -1,5 +1,7 @@
 package DNPM.analyzer;
 
+import DNPM.dto.EcogStatusWithDate;
+import DNPM.services.strahlentherapie.StrahlentherapieService;
 import DNPM.services.systemtherapie.SystemtherapieService;
 import de.itc.onkostar.api.Disease;
 import de.itc.onkostar.api.IOnkostarApi;
@@ -20,28 +22,31 @@ import java.util.stream.Collectors;
 /**
  * Diese Klasse implementiert ein Plugin, welches Aktionen nach Bearbeitung eines Formulars zur Systemtherapie durchführt.
  *
- * @since 0.4.0
+ * @since 0.6.0
  */
 @Component
-public class SystemtherapieAnalyzer extends Analyzer {
+public class TherapieMitEcogAnalyzer extends Analyzer {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     private final IOnkostarApi onkostarApi;
 
+    private final StrahlentherapieService strahlentherapieService;
     private final SystemtherapieService systemtherapieService;
 
-    public SystemtherapieAnalyzer(
+    public TherapieMitEcogAnalyzer(
             final IOnkostarApi onkostarApi,
+            final StrahlentherapieService strahlentherapieService,
             final SystemtherapieService systemtherapieService
     ) {
         this.onkostarApi = onkostarApi;
+        this.strahlentherapieService = strahlentherapieService;
         this.systemtherapieService = systemtherapieService;
     }
 
     @Override
     public String getDescription() {
-        return "Aktualisiert verknüpfte Formulare nach Änderungen im Formularen vom Typ Systemtherapie";
+        return "Aktualisiert verknüpfte Formulare nach Änderungen in Formularen vom Typ Strahlen-/Systemtherapie mit ECOG-Status";
     }
 
     /**
@@ -55,7 +60,9 @@ public class SystemtherapieAnalyzer extends Analyzer {
     @Override
     public boolean isRelevantForAnalyzer(Procedure procedure, Disease disease) {
         return null != procedure && null != disease && (
-                procedure.getFormName().equals("OS.Systemische Therapie")
+                procedure.getFormName().equals("OS.Strahlentherapie")
+                        || procedure.getFormName().equals("OS.Strahlentherapie.VarianteUKW")
+                        || procedure.getFormName().equals("OS.Systemische Therapie")
                         || procedure.getFormName().equals("OS.Systemische Therapie.VarianteUKW")
         );
     }
@@ -89,12 +96,18 @@ public class SystemtherapieAnalyzer extends Analyzer {
             return;
         }
 
-        var ecogFromCompleted = systemtherapieService.ecogStatus(procedure.getPatient())
+        var ecog = strahlentherapieService.ecogStatus(procedure.getPatient())
                 .stream()
                 .filter(ecogStatusWithDate -> ecogStatusWithDate.getDate().after(disease.getDiagnosisDate()))
                 .collect(Collectors.toList());
 
-        if (ecogFromCompleted.isEmpty()) {
+        ecog.addAll(systemtherapieService.ecogStatus(procedure.getPatient())
+                .stream()
+                .filter(ecogStatusWithDate -> ecogStatusWithDate.getDate().after(disease.getDiagnosisDate()))
+                .collect(Collectors.toList()));
+
+
+        if (ecog.isEmpty()) {
             // Nothing to do
             return;
         }
@@ -104,14 +117,14 @@ public class SystemtherapieAnalyzer extends Analyzer {
                 .forEach(p -> {
                     var ufEcog = p.getValue("ECOGVerlauf");
                     if (null != ufEcog && ufEcog.getValue() instanceof List) {
-                        updateExistingEcogVerlauf(p, ecogFromCompleted, ufEcog);
+                        updateExistingEcogVerlauf(p, ecog, ufEcog);
                     } else {
-                        newEcogverlauf(p, ecogFromCompleted);
+                        newEcogverlauf(p, ecog);
                     }
                 });
     }
 
-    private void updateExistingEcogVerlauf(Procedure p, List<SystemtherapieService.EcogStatusWithDate> ecogFromCompleted, Item ufEcog) {
+    private void updateExistingEcogVerlauf(Procedure p, List<EcogStatusWithDate> ecogFromCompleted, Item ufEcog) {
         var shouldSave = false;
         var existingDates = ufEcog.<List<Map<String, String>>>getValue().stream()
                 .map(v -> v.get("Datum"))
@@ -136,7 +149,7 @@ public class SystemtherapieAnalyzer extends Analyzer {
         }
     }
 
-    private void newEcogverlauf(Procedure p, List<SystemtherapieService.EcogStatusWithDate> ecogFromCompleted) {
+    private void newEcogverlauf(Procedure p, List<EcogStatusWithDate> ecogFromCompleted) {
         p.setValue("ECOGVerlauf", new Item("ECOGVerlauf", List.of()));
         for (var ecog : ecogFromCompleted) {
             var newSubProcedure = new Procedure(onkostarApi);