Issue #33: Methoden zum Auffinden von relevanten Follow-Up-Formularen

4 files changed, 62 insertions, 63 deletions

diff --git a/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java b/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java
new file mode 100644
index 0000000..021e30b
--- /dev/null
+++ b/src/main/java/DNPM/services/therapieplan/AbstractTherapieplanService.java
@@ -0,0 +1,42 @@
+package DNPM.services.therapieplan;
+
+import DNPM.services.FormService;
+import de.itc.onkostar.api.IOnkostarApi;
+import de.itc.onkostar.api.Procedure;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+public abstract class AbstractTherapieplanService implements TherapieplanService {
+
+    protected final IOnkostarApi onkostarApi;
+
+    protected final FormService formService;
+
+    public AbstractTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
+        this.onkostarApi = onkostarApi;
+        this.formService = formService;
+    }
+
+    @Override
+    public List<Procedure> findReferencedFollowUpsForSubform(Procedure procedure) {
+        if (null == procedure || !"DNPM UF Einzelempfehlung".equals(procedure.getFormName())) {
+            return List.of();
+        }
+
+        return procedure.getDiseaseIds().stream()
+                .flatMap(diseaseId -> onkostarApi.getProceduresForDiseaseByForm(diseaseId, "DNPM FollowUp").stream())
+                .filter(p -> p.getValue("LinkTherapieempfehlung").getInt() == procedure.getId())
+                .collect(Collectors.toList());
+    }
+
+    @Override
+    public List<Procedure> findReferencedFollowUpsForSubform(int procedureId) {
+        var procedure = this.onkostarApi.getProcedure(procedureId);
+        if (null == procedure || !"DNPM UF Einzelempfehlung".equals(procedure.getFormName())) {
+            return List.of();
+        }
+        return findReferencedFollowUpsForSubform(procedure);
+    }
+
+}
diff --git a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java b/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java
index 8fe3780..c894e04 100644
--- a/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java
+++ b/src/main/java/DNPM/services/therapieplan/DefaultTherapieplanService.java
@@ -1,27 +1,3 @@
-/*
- * MIT License
- *
- * 2023 Comprehensive Cancer Center Mainfranken
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package DNPM.services.therapieplan;
 
 import DNPM.services.FormService;
@@ -37,17 +13,12 @@ import java.util.Objects;
 import static DNPM.services.FormService.hasValue;
 import static DNPM.services.FormService.isYes;
 
-public class DefaultTherapieplanService implements TherapieplanService {
+public class DefaultTherapieplanService extends AbstractTherapieplanService {
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
-    private final IOnkostarApi onkostarApi;
-
-    private final FormService formService;
-
     public DefaultTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
-        this.onkostarApi = onkostarApi;
-        this.formService = formService;
+        super(onkostarApi, formService);
     }
 
     /**
@@ -198,5 +169,4 @@ public class DefaultTherapieplanService implements TherapieplanService {
                 });
     }
 
-
 }
diff --git a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java b/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java
index 11ce876..a3bddde 100644
--- a/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java
+++ b/src/main/java/DNPM/services/therapieplan/MultipleMtbTherapieplanService.java
@@ -37,15 +37,10 @@ import java.util.stream.Collectors;
 import static DNPM.services.FormService.hasValue;
 import static DNPM.services.FormService.isYes;
 
-public class MultipleMtbTherapieplanService implements TherapieplanService {
-
-    private final IOnkostarApi onkostarApi;
-
-    private final FormService formService;
+public class MultipleMtbTherapieplanService extends AbstractTherapieplanService {
 
     public MultipleMtbTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) {
-        this.onkostarApi = onkostarApi;
-        this.formService = formService;
+        super(onkostarApi, formService);
     }
 
     @Override
diff --git a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java b/src/main/java/DNPM/services/therapieplan/TherapieplanService.java
index 3699bb0..957d15c 100644
--- a/src/main/java/DNPM/services/therapieplan/TherapieplanService.java
+++ b/src/main/java/DNPM/services/therapieplan/TherapieplanService.java
@@ -1,27 +1,3 @@
-/*
- * MIT License
- *
- * 2023 Comprehensive Cancer Center Mainfranken
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
 package DNPM.services.therapieplan;
 
 import de.itc.onkostar.api.Procedure;
@@ -54,4 +30,20 @@ public interface TherapieplanService {
      */
     List<Procedure> findReferencedMtbs(int procedureId);
 
+    /**
+     * Finde verlinkte FollowUps für DNPM UF Einzelempfehlung
+     *
+     * @param procedure Die DNPM UF Einzelempfehlung Prozedur
+     * @return Liste mit verlinkten FollowUps
+     */
+    List<Procedure> findReferencedFollowUpsForSubform(Procedure procedure);
+
+    /**
+     * Finde verlinkte FollowUps für DNPM UF Einzelempfehlung
+     *
+     * @param procedureId ID der Prozedur
+     * @return Liste mit verlinkten FollowUps
+     */
+    List<Procedure> findReferencedFollowUpsForSubform(int procedureId);
+
 }