summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/main/java/DNPM/analyzer/ConsentManager.java (renamed from src/main/java/DNPM/ConsentManager.java)21
-rw-r--r--src/main/java/DNPM/analyzer/DNPMHelper.java (renamed from src/main/java/DNPM/DNPMHelper.java)32
-rw-r--r--src/main/java/DNPM/analyzer/Merkmalskatalog.java (renamed from src/main/java/DNPM/Merkmalskatalog.java)26
-rw-r--r--src/main/resources/de/itc/onkostar/library/moduleContext.xml6
-rw-r--r--src/test/java/DNPM/ConsentManagerTest.java1
-rw-r--r--src/test/java/DNPM/DNPMHelperTest.java1
-rw-r--r--src/test/java/DNPM/MerkmalskatalogTest.java1
7 files changed, 14 insertions, 74 deletions
diff --git a/src/main/java/DNPM/ConsentManager.java b/src/main/java/DNPM/analyzer/ConsentManager.java
index 877f087..6051bc0 100644
--- a/src/main/java/DNPM/ConsentManager.java
+++ b/src/main/java/DNPM/analyzer/ConsentManager.java
@@ -1,16 +1,14 @@
-package DNPM;
+package DNPM.analyzer;
import DNPM.services.consent.ConsentManagerServiceFactory;
import de.itc.onkostar.api.Disease;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Procedure;
import de.itc.onkostar.api.analysis.AnalyzerRequirement;
-import de.itc.onkostar.api.analysis.IProcedureAnalyzer;
-import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class ConsentManager implements IProcedureAnalyzer {
+public class ConsentManager extends Analyzer {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -32,26 +30,11 @@ public class ConsentManager implements IProcedureAnalyzer {
}
@Override
- public String getName() {
- return "Consent Manager";
- }
-
- @Override
public AnalyzerRequirement getRequirement() {
return AnalyzerRequirement.PROCEDURE;
}
@Override
- public OnkostarPluginType getType() {
- return OnkostarPluginType.ANALYZER;
- }
-
- @Override
- public String getVersion() {
- return "0.3.0";
- }
-
- @Override
public boolean isRelevantForAnalyzer(Procedure prozedur, Disease erkrankung) {
return prozedur.getFormName().equals(onkostarApi.getGlobalSetting("consentform"));
}
diff --git a/src/main/java/DNPM/DNPMHelper.java b/src/main/java/DNPM/analyzer/DNPMHelper.java
index 838ca9a..9bfa04a 100644
--- a/src/main/java/DNPM/DNPMHelper.java
+++ b/src/main/java/DNPM/analyzer/DNPMHelper.java
@@ -1,6 +1,6 @@
-package DNPM;
+package DNPM.analyzer;
-import DNPM.analyzer.AnalyzerUtils;
+import DNPM.VerweisVon;
import DNPM.security.IllegalSecuredObjectAccessException;
import DNPM.security.PermissionType;
import DNPM.security.PersonPoolBasedPermissionEvaluator;
@@ -11,8 +11,6 @@ import de.itc.onkostar.api.Disease;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Procedure;
import de.itc.onkostar.api.analysis.AnalyzerRequirement;
-import de.itc.onkostar.api.analysis.IProcedureAnalyzer;
-import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -27,7 +25,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-public class DNPMHelper implements IProcedureAnalyzer {
+public class DNPMHelper extends BackendService {
private static final Logger logger = LoggerFactory.getLogger(DNPMHelper.class);
@@ -41,30 +39,13 @@ public class DNPMHelper implements IProcedureAnalyzer {
final IOnkostarApi onkostarApi,
final SystemtherapieService systemtherapieService,
final PersonPoolBasedPermissionEvaluator permissionEvaluator
- ) {
+ ) {
this.onkostarApi = onkostarApi;
this.systemtherapieService = systemtherapieService;
this.personPoolBasedPermissionEvaluator = permissionEvaluator;
}
@Override
- public OnkostarPluginType getType() {
- // Typ des Plugins
- // Für das Interface IProcedureAnalyzer gültig sind ANALYZER und BACKEND_SERVICE
- return OnkostarPluginType.BACKEND_SERVICE;
- }
-
- @Override
- public String getVersion() {
- return "0.4.0";
- }
-
- @Override
- public String getName() {
- return "UMR DNPM";
- }
-
- @Override
public String getDescription() {
return "Methoden für DNPM-Formulare";
}
@@ -90,11 +71,6 @@ public class DNPMHelper implements IProcedureAnalyzer {
return false;
}
- @Override
- public void analyze(Procedure entry, Disease currentDisease) {
- // wird nicht benötigt, da dass Plugin nicht ausgeführt wird
- }
-
@SuppressWarnings("unchecked")
public List<Map<String, String>> getVerweise(final Map<String, Object> input) {
var procedureId = AnalyzerUtils.getRequiredId(input, "ProcedureId");
diff --git a/src/main/java/DNPM/Merkmalskatalog.java b/src/main/java/DNPM/analyzer/Merkmalskatalog.java
index f11786e..071a559 100644
--- a/src/main/java/DNPM/Merkmalskatalog.java
+++ b/src/main/java/DNPM/analyzer/Merkmalskatalog.java
@@ -1,12 +1,9 @@
-package DNPM;
+package DNPM.analyzer;
-import DNPM.analyzer.AnalyzerUtils;
import de.itc.onkostar.api.Disease;
import de.itc.onkostar.api.IOnkostarApi;
import de.itc.onkostar.api.Procedure;
import de.itc.onkostar.api.analysis.AnalyzerRequirement;
-import de.itc.onkostar.api.analysis.IProcedureAnalyzer;
-import de.itc.onkostar.api.analysis.OnkostarPluginType;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -17,7 +14,7 @@ import org.slf4j.LoggerFactory;
import java.util.List;
import java.util.Map;
-public class Merkmalskatalog implements IProcedureAnalyzer {
+public class Merkmalskatalog extends BackendService {
private final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -28,21 +25,6 @@ public class Merkmalskatalog implements IProcedureAnalyzer {
}
@Override
- public OnkostarPluginType getType() {
- return OnkostarPluginType.BACKEND_SERVICE;
- }
-
- @Override
- public String getVersion() {
- return "0.3.0";
- }
-
- @Override
- public String getName() {
- return "UMR Merkmalskatalog";
- }
-
- @Override
public String getDescription() {
return "Methoden für Merkmalskataloge";
}
@@ -67,10 +49,6 @@ public class Merkmalskatalog implements IProcedureAnalyzer {
return false;
}
- @Override
- public void analyze(Procedure procedure, Disease disease) {
- }
-
public List<String[]> getMerkmalskatalog(final Map<String, Object> input) {
var merkmalskatalog = AnalyzerUtils.getRequiredValue(input, "Merkmalskatalog", String.class);
var spalten = AnalyzerUtils.getRequiredValue(input, "Spalten", String.class);
diff --git a/src/main/resources/de/itc/onkostar/library/moduleContext.xml b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
index c554416..e806b99 100644
--- a/src/main/resources/de/itc/onkostar/library/moduleContext.xml
+++ b/src/main/resources/de/itc/onkostar/library/moduleContext.xml
@@ -10,14 +10,14 @@
http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-3.1.xsd
http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.1.xsd">
- <bean id="DNPMHelper" class="DNPM.DNPMHelper">
+ <bean id="DNPMHelper" class="DNPM.analyzer.DNPMHelper">
<constructor-arg ref="localOnkostarApi" />
<constructor-arg ref="systemtherapieService" />
</bean>
- <bean id="Merkmalskatalog" class="DNPM.Merkmalskatalog">
+ <bean id="Merkmalskatalog" class="DNPM.analyzer.Merkmalskatalog">
<constructor-arg ref="localOnkostarApi" />
</bean>
- <bean id="ConsentManager" class="DNPM.ConsentManager">
+ <bean id="ConsentManager" class="DNPM.analyzer.ConsentManager">
<constructor-arg ref="localOnkostarApi" />
<constructor-arg ref="consentManagerServiceFactory" />
</bean>
diff --git a/src/test/java/DNPM/ConsentManagerTest.java b/src/test/java/DNPM/ConsentManagerTest.java
index e4e33e5..cb206db 100644
--- a/src/test/java/DNPM/ConsentManagerTest.java
+++ b/src/test/java/DNPM/ConsentManagerTest.java
@@ -1,5 +1,6 @@
package DNPM;
+import DNPM.analyzer.ConsentManager;
import DNPM.services.consent.ConsentManagerServiceFactory;
import DNPM.services.consent.MrConsentManagerService;
import de.itc.onkostar.api.IOnkostarApi;
diff --git a/src/test/java/DNPM/DNPMHelperTest.java b/src/test/java/DNPM/DNPMHelperTest.java
index 17e8901..7fd8b63 100644
--- a/src/test/java/DNPM/DNPMHelperTest.java
+++ b/src/test/java/DNPM/DNPMHelperTest.java
@@ -1,5 +1,6 @@
package DNPM;
+import DNPM.analyzer.DNPMHelper;
import DNPM.security.IllegalSecuredObjectAccessException;
import DNPM.security.PermissionType;
import DNPM.security.PersonPoolBasedPermissionEvaluator;
diff --git a/src/test/java/DNPM/MerkmalskatalogTest.java b/src/test/java/DNPM/MerkmalskatalogTest.java
index 0c292dc..e97fb30 100644
--- a/src/test/java/DNPM/MerkmalskatalogTest.java
+++ b/src/test/java/DNPM/MerkmalskatalogTest.java
@@ -1,5 +1,6 @@
package DNPM;
+import DNPM.analyzer.Merkmalskatalog;
import de.itc.onkostar.api.IOnkostarApi;
import org.hibernate.SQLQuery;
import org.hibernate.Session;
generated by cgit v1.2.3 (git 2.25.1) at 2026-06-01 07:43:47 +0000