diff --git a/pom.xml b/pom.xml
index 65940ef..c304c61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,6 +155,12 @@
2.3
test
+
+ log4j
+ log4j
+ 1.2.17
+ test
+
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 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 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..0102fc6 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,56 @@ 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 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 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 "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;
+ }
+ }
+
}
diff --git a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
index 40ce315..7852187 100644
--- a/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
+++ b/src/test/java/DNPM/services/systemtherapie/DefaultSystemtherapieServiceTest.java
@@ -1,8 +1,7 @@
package DNPM.services.systemtherapie;
import DNPM.services.SettingsService;
-import de.itc.onkostar.api.IOnkostarApi;
-import de.itc.onkostar.api.Procedure;
+import de.itc.onkostar.api.*;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
@@ -12,6 +11,7 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
+import java.time.Instant;
import java.util.*;
import static org.assertj.core.api.Assertions.assertThat;
@@ -94,4 +94,40 @@ class DefaultSystemtherapieServiceTest {
.isExactlyInstanceOf(ArrayList.class)
.hasSize(1);
}
+
+ @Test
+ void testShouldReturnListOfEcogStatusWithDate() {
+ doAnswer(invocationOnMock -> {
+ var disease = new Disease(onkostarApi);
+ disease.setId(1);
+ return List.of(disease);
+ }).when(this.onkostarApi).getDiseasesByPatientId(anyInt());
+
+ doAnswer(invocationOnMock -> {
+ var procedure1 = new Procedure(onkostarApi);
+ procedure1.setId(1);
+ procedure1.setFormName("OS.Systemische Therapie");
+ procedure1.setStartDate(Date.from(Instant.parse("2023-07-01T06:00:00Z")));
+ procedure1.setEditState(ProcedureEditStateType.COMPLETED);
+ procedure1.setValue("ECOGvorTherapie", new Item("ECOGvorTherapie", 1));
+
+ var procedure2 = new Procedure(onkostarApi);
+ procedure2.setId(2);
+ procedure2.setFormName("OS.Systemische Therapie");
+ procedure2.setStartDate(Date.from(Instant.parse("2023-07-12T06:00:00Z")));
+ procedure2.setEditState(ProcedureEditStateType.COMPLETED);
+ procedure2.setValue("ECOGvorTherapie", new Item("ECOGvorTherapie", 2));
+ return List.of(procedure1, procedure2);
+ }).when(this.onkostarApi).getProceduresForDiseaseByForm(anyInt(), anyString());
+
+ var patient = new Patient(onkostarApi);
+ patient.setId(1);
+
+ var actual = service.ecogSatus(patient);
+
+ assertThat(actual)
+ .isNotNull()
+ .isExactlyInstanceOf(ArrayList.class)
+ .hasSize(2);
+ }
}