Merge branch 'master' into issue_37

2 files changed, 100 insertions, 3 deletions

diff --git a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
index 7c7e2b6..377e3d9 100644
--- a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
+++ b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
@@ -2,11 +2,12 @@ package DNPM.services.systemtherapie;
 
 import DNPM.services.SettingsService;
 import de.itc.onkostar.api.IOnkostarApi;
+import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
+import de.itc.onkostar.api.ProcedureEditStateType;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Standardimplementierung des Systemtherapieservices
@@ -15,6 +16,8 @@ import java.util.Map;
  */
 public class DefaultSystemtherapieService implements SystemtherapieService {
 
+    private static final String ECOG_FIELD = "ECOGvorTherapie";
+
     private final IOnkostarApi onkostarApi;
 
     private final SettingsService settingsService;
@@ -51,6 +54,43 @@ public class DefaultSystemtherapieService implements SystemtherapieService {
         return new OsSystemischeTherapieToProzedurwerteMapper();
     }
 
+    /**
+     * Ermittelt den letzten bekannten ECOG-Status aus allen Systemtherapieformularen des Patienten
+     *
+     * @param patient Der zu verwendende Patient
+     * @return Der ECOG-Status als String oder leeres Optional
+     */
+    @Override
+    public Optional<String> latestEcogStatus(Patient patient) {
+        return ecogSatus(patient).stream()
+                .max(Comparator.comparing(EcogStatusWithDate::getDate))
+                .map(EcogStatusWithDate::getStatus);
+    }
+
+    /**
+     * Ermittelt jeden bekannten ECOG-Status aus allen Systemtherapieformularen des Patienten
+     *
+     * @param patient Der zu verwendende Patient
+     * @return Eine Liste mit Datum und ECOG-Status als String
+     */
+    @Override
+    public List<EcogStatusWithDate> ecogSatus(Patient patient) {
+        return patient.getDiseases().stream()
+                .flatMap(disease -> onkostarApi.getProceduresForDiseaseByForm(disease.getId(), getFormName()).stream())
+                .filter(procedure -> procedure.getEditState() == ProcedureEditStateType.COMPLETED)
+                .filter(procedure -> null != procedure.getStartDate())
+                .sorted(Comparator.comparing(Procedure::getStartDate))
+                .map(procedure -> {
+                    try {
+                        return new EcogStatusWithDate(procedure.getStartDate(), procedure.getValue(ECOG_FIELD).getString());
+                    } catch (IllegalArgumentException e) {
+                        return null;
+                    }
+                })
+                .filter(Objects::nonNull)
+                .collect(Collectors.toList());
+    }
+
     private String getFormName() {
         return settingsService
                 .getSetting("systemtherapieform")
diff --git a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
index 00b7a6d..a664c05 100644
--- a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
+++ b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
@@ -1,9 +1,13 @@
 package DNPM.services.systemtherapie;
 
+import de.itc.onkostar.api.Patient;
 import de.itc.onkostar.api.Procedure;
+import org.springframework.util.Assert;
 
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Service für Systemtherapieformulare
@@ -25,4 +29,57 @@ public interface SystemtherapieService {
      */
     ProzedurToProzedurwerteMapper prozedurToProzedurwerteMapper(Procedure procedure);
 
+    /**
+     * Ermittelt den letzten bekannten ECOG-Status aus allen Systemtherapieformularen des Patienten
+     * @param patient Der zu verwendende Patient
+     * @return Der ECOG-Status als String oder leeres Optional
+     */
+    Optional<String> latestEcogStatus(Patient patient);
+
+    /**
+     * Ermittelt jeden bekannten ECOG-Status aus allen Systemtherapieformularen des Patienten
+     * @param patient Der zu verwendende Patient
+     * @return Eine Liste mit Datum und ECOG-Status als String
+     */
+    List<EcogStatusWithDate> ecogSatus(Patient patient);
+
+    /**
+     * Datenklasse zum Abbilden des ECOG-Status und Datum
+     */
+    class EcogStatusWithDate {
+        private Date date;
+        private String status;
+
+        public EcogStatusWithDate(Date date, String status) {
+            Assert.notNull(date, "Date cannot be null");
+            Assert.hasText(status, "Status cannot be empty String");
+            Assert.isTrue(isValidEcogCode(status), "Not a valid ADT.LeistungszustandECOG code");
+            this.date = date;
+            this.status = status;
+        }
+
+        private boolean isValidEcogCode(String status) {
+            switch (status) {
+                case "0":
+                case "1":
+                case "2":
+                case "3":
+                case "4":
+                case "5":
+                case "U":
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
+        public Date getDate() {
+            return date;
+        }
+
+        public String getStatus() {
+            return status;
+        }
+    }
+
 }