From 425e8067b60024256437a5ee4180efdd9d134022 Mon Sep 17 00:00:00 2001
From: Paul-Christian Volkmer
Date: Thu, 6 Apr 2023 09:38:58 +0200
Subject: Issue #22: Verwende Angabe des Systemtherapie-Formulars in den
 Einstellungen

Standardwert, wenn die Einstellung nicht vorhanden ist, ist "OS.Systemische Therapie".

closes #22
---
 .../DefaultSystemtherapieService.java              | 24 +++++-----------------
 .../systemtherapie/SystemtherapieService.java      |  6 ------
 2 files changed, 5 insertions(+), 25 deletions(-)

(limited to 'src/main/java/DNPM')

diff --git a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
index 9fb3149..7c7e2b6 100644
--- a/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
+++ b/src/main/java/DNPM/services/systemtherapie/DefaultSystemtherapieService.java
@@ -3,8 +3,6 @@ package DNPM.services.systemtherapie;
 import DNPM.services.SettingsService;
 import de.itc.onkostar.api.IOnkostarApi;
 import de.itc.onkostar.api.Procedure;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,8 +15,6 @@ import java.util.Map;
  */
 public class DefaultSystemtherapieService implements SystemtherapieService {
 
-    private static final Logger logger = LoggerFactory.getLogger(DefaultSystemtherapieService.class);
-
     private final IOnkostarApi onkostarApi;
 
     private final SettingsService settingsService;
@@ -36,13 +32,8 @@ public class DefaultSystemtherapieService implements SystemtherapieService {
      */
     @Override
     public List<Map<String, String>> getSystemischeTherapienFromDiagnose(int diseaseId) {
-        var sid = this.settingsService.getSID();
-        if (sid.isEmpty()) {
-            logger.error("Kann SID nicht ermitteln um Formularnamen zu erhalten. Gebe 'null' zurück.");
-            return null;
-        }
         List<Map<String, String>> result = new ArrayList<>();
-        for (Procedure prozedur : onkostarApi.getProceduresForDiseaseByForm(diseaseId, selectFormNameBySID(sid.get()))) {
+        for (Procedure prozedur : onkostarApi.getProceduresForDiseaseByForm(diseaseId, getFormName())) {
             prozedurToProzedurwerteMapper(prozedur).apply(prozedur).ifPresent(result::add);
         }
         return result;
@@ -60,14 +51,9 @@ public class DefaultSystemtherapieService implements SystemtherapieService {
         return new OsSystemischeTherapieToProzedurwerteMapper();
     }
 
-    @Override
-    public String selectFormNameBySID(String sid) {
-        switch (sid) {
-            case "2011":
-            case "20119":
-                return "OS.Systemische Therapie.VarianteUKW";
-            default:
-                return "OS.Systemische Therapie";
-        }
+    private String getFormName() {
+        return settingsService
+                .getSetting("systemtherapieform")
+                .orElse("OS.Systemische Therapie");
     }
 }
diff --git a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
index 6b11c76..00b7a6d 100644
--- a/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
+++ b/src/main/java/DNPM/services/systemtherapie/SystemtherapieService.java
@@ -25,10 +25,4 @@ public interface SystemtherapieService {
      */
     ProzedurToProzedurwerteMapper prozedurToProzedurwerteMapper(Procedure procedure);
 
-    /**
-     * Ermittelt den Formularnamen anhand der SID
-     * @param sid die SID
-     * @return Den ermittelten Formularnamen
-     */
-    String selectFormNameBySID(String sid);
 }
-- 
cgit v1.2.3