From e60e0953f513d81b5c208bf8d51c6666013af65b Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 29 Aug 2023 08:51:30 +0200 Subject: Issue #42: Defaultangabe Version und Name sowie Typ der Pluginklasse --- src/main/java/DNPM/analyzer/Analyzer.java | 12 +++++++++++ src/main/java/DNPM/analyzer/BackendService.java | 25 ++++++++++++++++++++++ .../DNPM/analyzer/EinzelempfehlungAnalyzer.java | 24 +-------------------- src/main/java/DNPM/analyzer/FollowUpAnalyzer.java | 19 +--------------- src/main/java/DNPM/analyzer/IPluginPart.java | 19 ++++++++++++++++ .../java/DNPM/analyzer/SystemtherapieAnalyzer.java | 19 +--------------- .../java/DNPM/analyzer/TherapieplanAnalyzer.java | 19 +--------------- 7 files changed, 60 insertions(+), 77 deletions(-) create mode 100644 src/main/java/DNPM/analyzer/Analyzer.java create mode 100644 src/main/java/DNPM/analyzer/BackendService.java create mode 100644 src/main/java/DNPM/analyzer/IPluginPart.java (limited to 'src/main/java/DNPM') diff --git a/src/main/java/DNPM/analyzer/Analyzer.java b/src/main/java/DNPM/analyzer/Analyzer.java new file mode 100644 index 0000000..fd2fdec --- /dev/null +++ b/src/main/java/DNPM/analyzer/Analyzer.java @@ -0,0 +1,12 @@ +package DNPM.analyzer; + +import de.itc.onkostar.api.analysis.OnkostarPluginType; + +public abstract class Analyzer implements IPluginPart { + + @Override + public final OnkostarPluginType getType() { + return OnkostarPluginType.ANALYZER; + } + +} diff --git a/src/main/java/DNPM/analyzer/BackendService.java b/src/main/java/DNPM/analyzer/BackendService.java new file mode 100644 index 0000000..84895dd --- /dev/null +++ b/src/main/java/DNPM/analyzer/BackendService.java @@ -0,0 +1,25 @@ +package DNPM.analyzer; + +import de.itc.onkostar.api.Disease; +import de.itc.onkostar.api.Procedure; +import de.itc.onkostar.api.analysis.OnkostarPluginType; + +public abstract class BackendService implements IPluginPart { + + @Override + public final OnkostarPluginType getType() { + return OnkostarPluginType.BACKEND_SERVICE; + } + + /** + * Ein Backend-Service verwendet die Methode nicht, daher wird hier eine final Stub-Implementierung + * verwendet, die ein Überschreiben verhindert. + * @param procedure + * @param disease + */ + @Override + public final void analyze(Procedure procedure, Disease disease) { + // No op + } + +} diff --git a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java b/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java index 1ace2f8..1724272 100644 --- a/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java +++ b/src/main/java/DNPM/analyzer/EinzelempfehlungAnalyzer.java @@ -10,8 +10,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.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.security.core.context.SecurityContextHolder; @@ -26,7 +24,7 @@ import java.util.Map; * @since 0.2.0 */ @Component -public class EinzelempfehlungAnalyzer implements IProcedureAnalyzer { +public class EinzelempfehlungAnalyzer extends BackendService { private final static Logger logger = LoggerFactory.getLogger(EinzelempfehlungAnalyzer.class); @@ -50,21 +48,6 @@ public class EinzelempfehlungAnalyzer implements IProcedureAnalyzer { this.permissionEvaluator = permissionEvaluator; } - @Override - public OnkostarPluginType getType() { - return OnkostarPluginType.BACKEND_SERVICE; - } - - @Override - public String getVersion() { - return "0.4.0"; - } - - @Override - public String getName() { - return "DNPM Einzelempfehlung Backend Service"; - } - @Override public String getDescription() { return "Stellt Funktionen zur Nutzung im Therapieplan-Unterformular für Einzelempfehlungen bereit"; @@ -93,11 +76,6 @@ public class EinzelempfehlungAnalyzer implements IProcedureAnalyzer { return AnalyzerRequirement.PROCEDURE; } - @Override - public void analyze(Procedure procedure, Disease disease) { - // No op - } - public List getVariants(Map input) { var procedureId = AnalyzerUtils.getRequiredId(input, "id"); diff --git a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java b/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java index 0a68461..07b5fa0 100644 --- a/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java +++ b/src/main/java/DNPM/analyzer/FollowUpAnalyzer.java @@ -6,8 +6,6 @@ import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyseTriggerEvent; 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; import org.springframework.stereotype.Component; @@ -20,7 +18,7 @@ import java.util.Set; * @since 0.0.2 */ @Component -public class FollowUpAnalyzer implements IProcedureAnalyzer { +public class FollowUpAnalyzer extends Analyzer { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -30,21 +28,6 @@ public class FollowUpAnalyzer implements IProcedureAnalyzer { this.onkostarApi = onkostarApi; } - @Override - public OnkostarPluginType getType() { - return OnkostarPluginType.ANALYZER; - } - - @Override - public String getVersion() { - return "0.4.0"; - } - - @Override - public String getName() { - return "DNPM FollowUp Analyzer"; - } - @Override public String getDescription() { return "Aktualisiert verknüpfte Formulare nach Änderungen im FollowUp-Formular"; diff --git a/src/main/java/DNPM/analyzer/IPluginPart.java b/src/main/java/DNPM/analyzer/IPluginPart.java new file mode 100644 index 0000000..31e9fff --- /dev/null +++ b/src/main/java/DNPM/analyzer/IPluginPart.java @@ -0,0 +1,19 @@ +package DNPM.analyzer; + +import de.itc.onkostar.api.analysis.IProcedureAnalyzer; + +public interface IPluginPart extends IProcedureAnalyzer { + + default String getVersion() { + return "0.4.0"; + } + + default String getName() { + return "DNPM Plugin"; + } + + default String getDescription() { + return String.format("Plugin-Bestandteil '%s'", this.getClass().getSimpleName()); + } + +} diff --git a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java index e0d3037..af7fb9d 100644 --- a/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java +++ b/src/main/java/DNPM/analyzer/SystemtherapieAnalyzer.java @@ -7,8 +7,6 @@ import de.itc.onkostar.api.Item; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyseTriggerEvent; 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; import org.springframework.stereotype.Component; @@ -25,7 +23,7 @@ import java.util.stream.Collectors; * @since 0.4.0 */ @Component -public class SystemtherapieAnalyzer implements IProcedureAnalyzer { +public class SystemtherapieAnalyzer extends Analyzer { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @@ -41,21 +39,6 @@ public class SystemtherapieAnalyzer implements IProcedureAnalyzer { this.systemtherapieService = systemtherapieService; } - @Override - public OnkostarPluginType getType() { - return OnkostarPluginType.ANALYZER; - } - - @Override - public String getVersion() { - return "0.4.0"; - } - - @Override - public String getName() { - return "DNPM Systemtherapie Analyzer"; - } - @Override public String getDescription() { return "Aktualisiert verknüpfte Formulare nach Änderungen im Formularen vom Typ Systemtherapie"; diff --git a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java index 9e69d3d..932cafb 100644 --- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java +++ b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java @@ -8,8 +8,6 @@ import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyseTriggerEvent; import de.itc.onkostar.api.analysis.AnalyzerRequirement; -import de.itc.onkostar.api.analysis.IProcedureAnalyzer; -import de.itc.onkostar.api.analysis.OnkostarPluginType; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Component; @@ -22,7 +20,7 @@ import java.util.Set; * @since 0.0.2 */ @Component -public class TherapieplanAnalyzer implements IProcedureAnalyzer { +public class TherapieplanAnalyzer extends Analyzer { private final TherapieplanServiceFactory therapieplanServiceFactory; @@ -40,21 +38,6 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer { this.permissionEvaluator = permissionEvaluator; } - @Override - public OnkostarPluginType getType() { - return OnkostarPluginType.ANALYZER; - } - - @Override - public String getVersion() { - return "0.4.0"; - } - - @Override - public String getName() { - return "DNPM Therapieplan Analyzer"; - } - @Override public String getDescription() { return "Aktualisiert Unterformulare nach Änderungen im Therapieplan-Formular"; -- cgit v1.2.3 From b8e795d22e846ff4fb024682b5ecced2538971e7 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Tue, 29 Aug 2023 09:19:33 +0200 Subject: Issue #42: Verschiebe Pluginklassen in Paket 'analyzer' und passe an --- src/main/java/DNPM/ConsentManager.java | 80 ------- src/main/java/DNPM/DNPMHelper.java | 284 ----------------------- src/main/java/DNPM/Merkmalskatalog.java | 115 --------- src/main/java/DNPM/analyzer/ConsentManager.java | 63 +++++ src/main/java/DNPM/analyzer/DNPMHelper.java | 260 +++++++++++++++++++++ src/main/java/DNPM/analyzer/Merkmalskatalog.java | 93 ++++++++ 6 files changed, 416 insertions(+), 479 deletions(-) delete mode 100644 src/main/java/DNPM/ConsentManager.java delete mode 100644 src/main/java/DNPM/DNPMHelper.java delete mode 100644 src/main/java/DNPM/Merkmalskatalog.java create mode 100644 src/main/java/DNPM/analyzer/ConsentManager.java create mode 100644 src/main/java/DNPM/analyzer/DNPMHelper.java create mode 100644 src/main/java/DNPM/analyzer/Merkmalskatalog.java (limited to 'src/main/java/DNPM') diff --git a/src/main/java/DNPM/ConsentManager.java b/src/main/java/DNPM/ConsentManager.java deleted file mode 100644 index 877f087..0000000 --- a/src/main/java/DNPM/ConsentManager.java +++ /dev/null @@ -1,80 +0,0 @@ -package DNPM; - -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 { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private final IOnkostarApi onkostarApi; - - private final ConsentManagerServiceFactory consentManagerServiceFactory; - - public ConsentManager( - final IOnkostarApi onkostarApi, - final ConsentManagerServiceFactory consentManagerServiceFactory - ) { - this.onkostarApi = onkostarApi; - this.consentManagerServiceFactory = consentManagerServiceFactory; - } - - @Override - public String getDescription() { - return "Aktualisiert Consent Daten in verknüpften Formularen"; - } - - @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")); - } - - @Override - public boolean isRelevantForDeletedProcedure() { - // TODO is relevant for deleted procedure = true - return false; - } - - @Override - public boolean isSynchronous() { - return true; - } - - @Override - public void analyze(Procedure prozedur, Disease erkrankung) { - var consentManagerService = consentManagerServiceFactory.currentUsableInstance(); - if (! consentManagerService.canApply(prozedur)) { - logger.error("Fehler im ConsentManagement: Kann Prozedur mit Formularnamen '{}' nicht anwenden", prozedur.getFormName()); - return; - } - consentManagerService.applyConsent(prozedur); - } - -} diff --git a/src/main/java/DNPM/DNPMHelper.java b/src/main/java/DNPM/DNPMHelper.java deleted file mode 100644 index 838ca9a..0000000 --- a/src/main/java/DNPM/DNPMHelper.java +++ /dev/null @@ -1,284 +0,0 @@ -package DNPM; - -import DNPM.analyzer.AnalyzerUtils; -import DNPM.security.IllegalSecuredObjectAccessException; -import DNPM.security.PermissionType; -import DNPM.security.PersonPoolBasedPermissionEvaluator; -import DNPM.services.systemtherapie.SystemtherapieService; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -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; -import org.hibernate.transform.Transformers; -import org.hibernate.type.StandardBasicTypes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.security.core.context.SecurityContextHolder; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class DNPMHelper implements IProcedureAnalyzer { - - private static final Logger logger = LoggerFactory.getLogger(DNPMHelper.class); - - private final IOnkostarApi onkostarApi; - - private final SystemtherapieService systemtherapieService; - - private final PersonPoolBasedPermissionEvaluator personPoolBasedPermissionEvaluator; - - public DNPMHelper( - 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"; - } - - @Override - public boolean isRelevantForDeletedProcedure() { - return false; - } - - @Override - public boolean isSynchronous() { - return true; - } - - @Override - public AnalyzerRequirement getRequirement() { - return AnalyzerRequirement.PROCEDURE; - } - - @Override - public boolean isRelevantForAnalyzer(Procedure entry, Disease currentDisease) { - // Plugin enthält nur Methoden für Formulare und soll nicht ausgeführt werden - 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> getVerweise(final Map input) { - var procedureId = AnalyzerUtils.getRequiredId(input, "ProcedureId"); - var patientId = AnalyzerUtils.getRequiredId(input, "PatientId"); - - if (procedureId.isEmpty() || patientId.isEmpty()) { - return null; - } - - var verbundeneFormulare = new ArrayList>(); - - try { - SessionFactory sessionFactory = onkostarApi.getSessionFactory(); - Session session = sessionFactory.getCurrentSession(); - - String sql = "SELECT prozedur.id AS procedure_id, prozedur.data_form_id, data_catalogue.name AS data_catalogue, data_catalogue_entry.name AS data_catalogue_entry, data_form.description AS formname, prozedur.beginndatum AS datum " + - "FROM prozedur " + - "LEFT JOIN data_form_data_catalogue ON data_form_data_catalogue.data_form_id = prozedur.data_form_id " + - "LEFT JOIN data_catalogue_entry ON data_catalogue_entry.data_catalogue_id = data_form_data_catalogue.data_catalogue_id " + - "LEFT JOIN data_catalogue ON data_catalogue.id = data_catalogue_entry.data_catalogue_id " + - "LEFT JOIN data_form ON data_form.id = prozedur.data_form_id " + - "WHERE patient_id = " + patientId.get() + " " + - "AND geloescht = 0 " + - "AND data_catalogue_entry.type = 'formReference' " + - "GROUP BY prozedur.id, prozedur.data_form_id, data_catalogue.name, data_catalogue_entry.name"; - - SQLQuery query = session.createSQLQuery(sql) - .addScalar("procedure_id", StandardBasicTypes.INTEGER) - .addScalar("data_form_id", StandardBasicTypes.INTEGER) - .addScalar("data_catalogue", StandardBasicTypes.STRING) - .addScalar("data_catalogue_entry", StandardBasicTypes.STRING) - .addScalar("formname", StandardBasicTypes.STRING) - .addScalar("datum", StandardBasicTypes.DATE); - - query.setResultTransformer(Transformers.aliasToBean(VerweisVon.class)); - List result = query.list(); - try { - int value = 0; - for (VerweisVon verweisVon : result) { - sql = verweisVon.getSQL(); - query = session.createSQLQuery(sql) - .addScalar("value", StandardBasicTypes.INTEGER); - if (query.uniqueResult() != null) { - value = (Integer) query.uniqueResult(); - } - if (value == procedureId.get()) { - verbundeneFormulare.add(Map.of("formular", verweisVon.getVerbundenesFormular())); - value = 0; - } - } - } catch (Exception e) { - logger.warn("Fehler beim Hinzufügen eines Formularverweises", e); - } - } catch (Exception e) { - logger.error("Fehler beim Ermitteln der Formularverweise", e); - return null; - } - return verbundeneFormulare; - } - - public List> getSystemischeTherapienFromDiagnose(final Map input) { - var diagnoseId = AnalyzerUtils.getRequiredId(input, "DiagnoseId"); - if (diagnoseId.isEmpty()) { - logger.error("Kein Parameter 'DiagnoseId' angegeben, gebe 'null' zurück"); - return null; - } - - return systemtherapieService.getSystemischeTherapienFromDiagnose(diagnoseId.get()); - } - - public String getProzedurenFromDiagnose(final Map input) { - // Prozedur, Feldname, Wert - var dataForm = AnalyzerUtils.getRequiredValue(input, "dataForm", String.class); - var diagnoseId = AnalyzerUtils.getRequiredId(input, "DiagnoseId"); - var patientId = AnalyzerUtils.getRequiredId(input, "PatientId"); - - if (dataForm.isEmpty() || diagnoseId.isEmpty() || patientId.isEmpty()) { - return ""; - } - - var formulare = new ArrayList>(); - List prozeduren = onkostarApi.getProceduresByPatientId(patientId.get()); - for (Procedure Prozedur : prozeduren) { - // Formular gehört zur aktuellen Diagnose und hat den angegebenen Namen - if (Prozedur.getDiseaseIds().contains(diagnoseId.get()) && Prozedur.getFormName().contains(dataForm.get())) { - // alle Werte auslesen - // System.out.println(WerteListe.getKey() + ": " + WerteListe.getValue()); - formulare.add(Map.of( - "Formular", Prozedur.getFormName(), - "Felder", new HashMap<>(Prozedur.getAllValues()) - )); - } - } - try { - ObjectMapper objectMapper = new ObjectMapper(); - return objectMapper.writeValueAsString(formulare); - } catch (JsonProcessingException e) { - logger.error("Kann Formulare nicht in JSON mappen", e); - } - return ""; - } - - public Object getEmpfehlung(final Map input) { - var procedureID = AnalyzerUtils.getRequiredId(input, "ProcedureID"); - - if (procedureID.isEmpty()) { - logger.error("Kein Parameter 'ProcedureID' angegeben, gebe 'null' zurück"); - return null; - } - - try { - SessionFactory sessionFactory = onkostarApi.getSessionFactory(); - Session session = sessionFactory.getCurrentSession(); - var sql = "SELECT prozedur.id, genname, geneid, geneidlink, empfehlung, beginndatum FROM prozedur " - + "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id " - + "JOIN data_form df ON prozedur.data_form_id = df.id AND df.name = 'MR.MTB_Einzelempfehlung' " - + "WHERE prozedur.hauptprozedur_id = " + procedureID.get() + " AND prozedur.geloescht = 0 " - + "ORDER BY beginndatum"; - - SQLQuery query = session.createSQLQuery(sql) - .addScalar("id", StandardBasicTypes.STRING) - .addScalar("genname", StandardBasicTypes.STRING) - .addScalar("geneid", StandardBasicTypes.STRING) - .addScalar("geneidlink", StandardBasicTypes.STRING) - .addScalar("empfehlung", StandardBasicTypes.STRING) - .addScalar("beginndatum", StandardBasicTypes.STRING); - - @SuppressWarnings("unchecked") - List rows = query.list(); - return rows; - } catch (Exception e) { - logger.error("Fehler bei Abfrage von Empfehlungen", e); - return null; - } - } - - public Object updateEmpfehlungPrio(final Map input) { - // Auslesen und Prüfen der Parameter aus 'input' - var rid = AnalyzerUtils.getRequiredId(input, "rid"); - if (rid.isEmpty()) { - logger.error("Kein Parameter 'rid' angegeben, gebe 'false' zurück"); - return false; - } - - var strDate = AnalyzerUtils.getRequiredValueMatching(input, "bd", "[\\d]{4}-[\\d]{2}-[\\d]{2}"); - if (strDate.isEmpty()) { - logger.error("Kein oder ungültiger Parameter 'bd' angegeben, gebe 'false' zurück"); - return false; - } - - //String strD = strDate.toString(); - //String CompareDate = strD.substring(1, 11); - //DateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd"); - - try { - String sql = "UPDATE prozedur SET beginndatum = '" + strDate.get() + "' WHERE id = '" + rid.get() + "' "; - SQLQuery result = onkostarApi.getSessionFactory().getCurrentSession().createSQLQuery(sql); - result.executeUpdate(); - return true; - } catch (Exception e) { - return "Achtung: Ein Fehler ist aufgetreten, Änderung konnte nicht gespeichert werden!"; - //return null; - } - - } - - // TODO Achtung, keine Sicherheitsprüfung, darüber kann für jeden Patienten die Liste mit ECOG-Status abgerufen werden! - public List getEcogStatus(final Map input) { - var pid = AnalyzerUtils.getRequiredId(input, "PatientId"); - if (pid.isEmpty()) { - logger.error("Kein Parameter 'PatientId' angegeben, gebe leere Liste zurück"); - return List.of(); - } - - var patient = onkostarApi.getPatient(pid.get()); - if (null == patient) { - logger.error("Patient nicht gefunden, gebe leere Liste zurück"); - return List.of(); - } - - if (personPoolBasedPermissionEvaluator.hasPermission(SecurityContextHolder.getContext().getAuthentication(), patient, PermissionType.READ)) { - return systemtherapieService.ecogSatus(patient); - } - - throw new IllegalSecuredObjectAccessException("Kein Zugriff auf diesen Patienten"); - } -} \ No newline at end of file diff --git a/src/main/java/DNPM/Merkmalskatalog.java b/src/main/java/DNPM/Merkmalskatalog.java deleted file mode 100644 index f11786e..0000000 --- a/src/main/java/DNPM/Merkmalskatalog.java +++ /dev/null @@ -1,115 +0,0 @@ -package DNPM; - -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; -import org.hibernate.type.StandardBasicTypes; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.List; -import java.util.Map; - -public class Merkmalskatalog implements IProcedureAnalyzer { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - private final IOnkostarApi onkostarApi; - - public Merkmalskatalog(final IOnkostarApi onkostarApi) { - this.onkostarApi = onkostarApi; - } - - @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"; - } - - @Override - public boolean isRelevantForDeletedProcedure() { - return false; - } - - @Override - public boolean isSynchronous() { - return true; - } - - @Override - public AnalyzerRequirement getRequirement() { - return AnalyzerRequirement.PROCEDURE; - } - - @Override - public boolean isRelevantForAnalyzer(Procedure procedure, Disease currentDisease) { - return false; - } - - @Override - public void analyze(Procedure procedure, Disease disease) { - } - - public List getMerkmalskatalog(final Map input) { - var merkmalskatalog = AnalyzerUtils.getRequiredValue(input, "Merkmalskatalog", String.class); - var spalten = AnalyzerUtils.getRequiredValue(input, "Spalten", String.class); - - if (merkmalskatalog.isEmpty()) { - logger.error("Kein Merkmalskatalog angegeben!"); - return null; - } - - if (spalten.isEmpty()) { - logger.error("Keine Spalten angegeben!"); - return null; - } - - String[] spaltenArray = spalten.get().split("\\s*,\\s*"); - - try { - SessionFactory sessionFactory = onkostarApi.getSessionFactory(); - Session session = sessionFactory.getCurrentSession(); - - String sql = "SELECT p.id, p.code, p.shortdesc, p.description, p.note, p.synonyms " - + "FROM property_catalogue " - + "LEFT JOIN property_catalogue_version ON property_catalogue_version.datacatalog_id = property_catalogue.id " - + "LEFT JOIN property_catalogue_version_entry p ON p.property_version_id = property_catalogue_version.id " - + "WHERE name = '" + merkmalskatalog.get() + "' AND aktiv = 1 " - + "ORDER BY position ASC"; - - SQLQuery query = session.createSQLQuery(sql); - - for (String s : spaltenArray) { - query.addScalar(s, StandardBasicTypes.STRING); - } - - @SuppressWarnings("unchecked") - List rows = query.list(); - return rows; - } catch (Exception e) { - logger.error("Fehler bei der Ausführung von getMerkmalskatalog()", e); - return null; - } - } -} diff --git a/src/main/java/DNPM/analyzer/ConsentManager.java b/src/main/java/DNPM/analyzer/ConsentManager.java new file mode 100644 index 0000000..6051bc0 --- /dev/null +++ b/src/main/java/DNPM/analyzer/ConsentManager.java @@ -0,0 +1,63 @@ +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 org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class ConsentManager extends Analyzer { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + private final IOnkostarApi onkostarApi; + + private final ConsentManagerServiceFactory consentManagerServiceFactory; + + public ConsentManager( + final IOnkostarApi onkostarApi, + final ConsentManagerServiceFactory consentManagerServiceFactory + ) { + this.onkostarApi = onkostarApi; + this.consentManagerServiceFactory = consentManagerServiceFactory; + } + + @Override + public String getDescription() { + return "Aktualisiert Consent Daten in verknüpften Formularen"; + } + + @Override + public AnalyzerRequirement getRequirement() { + return AnalyzerRequirement.PROCEDURE; + } + + @Override + public boolean isRelevantForAnalyzer(Procedure prozedur, Disease erkrankung) { + return prozedur.getFormName().equals(onkostarApi.getGlobalSetting("consentform")); + } + + @Override + public boolean isRelevantForDeletedProcedure() { + // TODO is relevant for deleted procedure = true + return false; + } + + @Override + public boolean isSynchronous() { + return true; + } + + @Override + public void analyze(Procedure prozedur, Disease erkrankung) { + var consentManagerService = consentManagerServiceFactory.currentUsableInstance(); + if (! consentManagerService.canApply(prozedur)) { + logger.error("Fehler im ConsentManagement: Kann Prozedur mit Formularnamen '{}' nicht anwenden", prozedur.getFormName()); + return; + } + consentManagerService.applyConsent(prozedur); + } + +} diff --git a/src/main/java/DNPM/analyzer/DNPMHelper.java b/src/main/java/DNPM/analyzer/DNPMHelper.java new file mode 100644 index 0000000..9bfa04a --- /dev/null +++ b/src/main/java/DNPM/analyzer/DNPMHelper.java @@ -0,0 +1,260 @@ +package DNPM.analyzer; + +import DNPM.VerweisVon; +import DNPM.security.IllegalSecuredObjectAccessException; +import DNPM.security.PermissionType; +import DNPM.security.PersonPoolBasedPermissionEvaluator; +import DNPM.services.systemtherapie.SystemtherapieService; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +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 org.hibernate.SQLQuery; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.transform.Transformers; +import org.hibernate.type.StandardBasicTypes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.security.core.context.SecurityContextHolder; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DNPMHelper extends BackendService { + + private static final Logger logger = LoggerFactory.getLogger(DNPMHelper.class); + + private final IOnkostarApi onkostarApi; + + private final SystemtherapieService systemtherapieService; + + private final PersonPoolBasedPermissionEvaluator personPoolBasedPermissionEvaluator; + + public DNPMHelper( + final IOnkostarApi onkostarApi, + final SystemtherapieService systemtherapieService, + final PersonPoolBasedPermissionEvaluator permissionEvaluator + ) { + this.onkostarApi = onkostarApi; + this.systemtherapieService = systemtherapieService; + this.personPoolBasedPermissionEvaluator = permissionEvaluator; + } + + @Override + public String getDescription() { + return "Methoden für DNPM-Formulare"; + } + + @Override + public boolean isRelevantForDeletedProcedure() { + return false; + } + + @Override + public boolean isSynchronous() { + return true; + } + + @Override + public AnalyzerRequirement getRequirement() { + return AnalyzerRequirement.PROCEDURE; + } + + @Override + public boolean isRelevantForAnalyzer(Procedure entry, Disease currentDisease) { + // Plugin enthält nur Methoden für Formulare und soll nicht ausgeführt werden + return false; + } + + @SuppressWarnings("unchecked") + public List> getVerweise(final Map input) { + var procedureId = AnalyzerUtils.getRequiredId(input, "ProcedureId"); + var patientId = AnalyzerUtils.getRequiredId(input, "PatientId"); + + if (procedureId.isEmpty() || patientId.isEmpty()) { + return null; + } + + var verbundeneFormulare = new ArrayList>(); + + try { + SessionFactory sessionFactory = onkostarApi.getSessionFactory(); + Session session = sessionFactory.getCurrentSession(); + + String sql = "SELECT prozedur.id AS procedure_id, prozedur.data_form_id, data_catalogue.name AS data_catalogue, data_catalogue_entry.name AS data_catalogue_entry, data_form.description AS formname, prozedur.beginndatum AS datum " + + "FROM prozedur " + + "LEFT JOIN data_form_data_catalogue ON data_form_data_catalogue.data_form_id = prozedur.data_form_id " + + "LEFT JOIN data_catalogue_entry ON data_catalogue_entry.data_catalogue_id = data_form_data_catalogue.data_catalogue_id " + + "LEFT JOIN data_catalogue ON data_catalogue.id = data_catalogue_entry.data_catalogue_id " + + "LEFT JOIN data_form ON data_form.id = prozedur.data_form_id " + + "WHERE patient_id = " + patientId.get() + " " + + "AND geloescht = 0 " + + "AND data_catalogue_entry.type = 'formReference' " + + "GROUP BY prozedur.id, prozedur.data_form_id, data_catalogue.name, data_catalogue_entry.name"; + + SQLQuery query = session.createSQLQuery(sql) + .addScalar("procedure_id", StandardBasicTypes.INTEGER) + .addScalar("data_form_id", StandardBasicTypes.INTEGER) + .addScalar("data_catalogue", StandardBasicTypes.STRING) + .addScalar("data_catalogue_entry", StandardBasicTypes.STRING) + .addScalar("formname", StandardBasicTypes.STRING) + .addScalar("datum", StandardBasicTypes.DATE); + + query.setResultTransformer(Transformers.aliasToBean(VerweisVon.class)); + List result = query.list(); + try { + int value = 0; + for (VerweisVon verweisVon : result) { + sql = verweisVon.getSQL(); + query = session.createSQLQuery(sql) + .addScalar("value", StandardBasicTypes.INTEGER); + if (query.uniqueResult() != null) { + value = (Integer) query.uniqueResult(); + } + if (value == procedureId.get()) { + verbundeneFormulare.add(Map.of("formular", verweisVon.getVerbundenesFormular())); + value = 0; + } + } + } catch (Exception e) { + logger.warn("Fehler beim Hinzufügen eines Formularverweises", e); + } + } catch (Exception e) { + logger.error("Fehler beim Ermitteln der Formularverweise", e); + return null; + } + return verbundeneFormulare; + } + + public List> getSystemischeTherapienFromDiagnose(final Map input) { + var diagnoseId = AnalyzerUtils.getRequiredId(input, "DiagnoseId"); + if (diagnoseId.isEmpty()) { + logger.error("Kein Parameter 'DiagnoseId' angegeben, gebe 'null' zurück"); + return null; + } + + return systemtherapieService.getSystemischeTherapienFromDiagnose(diagnoseId.get()); + } + + public String getProzedurenFromDiagnose(final Map input) { + // Prozedur, Feldname, Wert + var dataForm = AnalyzerUtils.getRequiredValue(input, "dataForm", String.class); + var diagnoseId = AnalyzerUtils.getRequiredId(input, "DiagnoseId"); + var patientId = AnalyzerUtils.getRequiredId(input, "PatientId"); + + if (dataForm.isEmpty() || diagnoseId.isEmpty() || patientId.isEmpty()) { + return ""; + } + + var formulare = new ArrayList>(); + List prozeduren = onkostarApi.getProceduresByPatientId(patientId.get()); + for (Procedure Prozedur : prozeduren) { + // Formular gehört zur aktuellen Diagnose und hat den angegebenen Namen + if (Prozedur.getDiseaseIds().contains(diagnoseId.get()) && Prozedur.getFormName().contains(dataForm.get())) { + // alle Werte auslesen + // System.out.println(WerteListe.getKey() + ": " + WerteListe.getValue()); + formulare.add(Map.of( + "Formular", Prozedur.getFormName(), + "Felder", new HashMap<>(Prozedur.getAllValues()) + )); + } + } + try { + ObjectMapper objectMapper = new ObjectMapper(); + return objectMapper.writeValueAsString(formulare); + } catch (JsonProcessingException e) { + logger.error("Kann Formulare nicht in JSON mappen", e); + } + return ""; + } + + public Object getEmpfehlung(final Map input) { + var procedureID = AnalyzerUtils.getRequiredId(input, "ProcedureID"); + + if (procedureID.isEmpty()) { + logger.error("Kein Parameter 'ProcedureID' angegeben, gebe 'null' zurück"); + return null; + } + + try { + SessionFactory sessionFactory = onkostarApi.getSessionFactory(); + Session session = sessionFactory.getCurrentSession(); + var sql = "SELECT prozedur.id, genname, geneid, geneidlink, empfehlung, beginndatum FROM prozedur " + + "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id " + + "JOIN data_form df ON prozedur.data_form_id = df.id AND df.name = 'MR.MTB_Einzelempfehlung' " + + "WHERE prozedur.hauptprozedur_id = " + procedureID.get() + " AND prozedur.geloescht = 0 " + + "ORDER BY beginndatum"; + + SQLQuery query = session.createSQLQuery(sql) + .addScalar("id", StandardBasicTypes.STRING) + .addScalar("genname", StandardBasicTypes.STRING) + .addScalar("geneid", StandardBasicTypes.STRING) + .addScalar("geneidlink", StandardBasicTypes.STRING) + .addScalar("empfehlung", StandardBasicTypes.STRING) + .addScalar("beginndatum", StandardBasicTypes.STRING); + + @SuppressWarnings("unchecked") + List rows = query.list(); + return rows; + } catch (Exception e) { + logger.error("Fehler bei Abfrage von Empfehlungen", e); + return null; + } + } + + public Object updateEmpfehlungPrio(final Map input) { + // Auslesen und Prüfen der Parameter aus 'input' + var rid = AnalyzerUtils.getRequiredId(input, "rid"); + if (rid.isEmpty()) { + logger.error("Kein Parameter 'rid' angegeben, gebe 'false' zurück"); + return false; + } + + var strDate = AnalyzerUtils.getRequiredValueMatching(input, "bd", "[\\d]{4}-[\\d]{2}-[\\d]{2}"); + if (strDate.isEmpty()) { + logger.error("Kein oder ungültiger Parameter 'bd' angegeben, gebe 'false' zurück"); + return false; + } + + //String strD = strDate.toString(); + //String CompareDate = strD.substring(1, 11); + //DateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd"); + + try { + String sql = "UPDATE prozedur SET beginndatum = '" + strDate.get() + "' WHERE id = '" + rid.get() + "' "; + SQLQuery result = onkostarApi.getSessionFactory().getCurrentSession().createSQLQuery(sql); + result.executeUpdate(); + return true; + } catch (Exception e) { + return "Achtung: Ein Fehler ist aufgetreten, Änderung konnte nicht gespeichert werden!"; + //return null; + } + + } + + // TODO Achtung, keine Sicherheitsprüfung, darüber kann für jeden Patienten die Liste mit ECOG-Status abgerufen werden! + public List getEcogStatus(final Map input) { + var pid = AnalyzerUtils.getRequiredId(input, "PatientId"); + if (pid.isEmpty()) { + logger.error("Kein Parameter 'PatientId' angegeben, gebe leere Liste zurück"); + return List.of(); + } + + var patient = onkostarApi.getPatient(pid.get()); + if (null == patient) { + logger.error("Patient nicht gefunden, gebe leere Liste zurück"); + return List.of(); + } + + if (personPoolBasedPermissionEvaluator.hasPermission(SecurityContextHolder.getContext().getAuthentication(), patient, PermissionType.READ)) { + return systemtherapieService.ecogSatus(patient); + } + + throw new IllegalSecuredObjectAccessException("Kein Zugriff auf diesen Patienten"); + } +} \ No newline at end of file diff --git a/src/main/java/DNPM/analyzer/Merkmalskatalog.java b/src/main/java/DNPM/analyzer/Merkmalskatalog.java new file mode 100644 index 0000000..071a559 --- /dev/null +++ b/src/main/java/DNPM/analyzer/Merkmalskatalog.java @@ -0,0 +1,93 @@ +package DNPM.analyzer; + +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 org.hibernate.SQLQuery; +import org.hibernate.Session; +import org.hibernate.SessionFactory; +import org.hibernate.type.StandardBasicTypes; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.List; +import java.util.Map; + +public class Merkmalskatalog extends BackendService { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + private final IOnkostarApi onkostarApi; + + public Merkmalskatalog(final IOnkostarApi onkostarApi) { + this.onkostarApi = onkostarApi; + } + + @Override + public String getDescription() { + return "Methoden für Merkmalskataloge"; + } + + @Override + public boolean isRelevantForDeletedProcedure() { + return false; + } + + @Override + public boolean isSynchronous() { + return true; + } + + @Override + public AnalyzerRequirement getRequirement() { + return AnalyzerRequirement.PROCEDURE; + } + + @Override + public boolean isRelevantForAnalyzer(Procedure procedure, Disease currentDisease) { + return false; + } + + public List getMerkmalskatalog(final Map input) { + var merkmalskatalog = AnalyzerUtils.getRequiredValue(input, "Merkmalskatalog", String.class); + var spalten = AnalyzerUtils.getRequiredValue(input, "Spalten", String.class); + + if (merkmalskatalog.isEmpty()) { + logger.error("Kein Merkmalskatalog angegeben!"); + return null; + } + + if (spalten.isEmpty()) { + logger.error("Keine Spalten angegeben!"); + return null; + } + + String[] spaltenArray = spalten.get().split("\\s*,\\s*"); + + try { + SessionFactory sessionFactory = onkostarApi.getSessionFactory(); + Session session = sessionFactory.getCurrentSession(); + + String sql = "SELECT p.id, p.code, p.shortdesc, p.description, p.note, p.synonyms " + + "FROM property_catalogue " + + "LEFT JOIN property_catalogue_version ON property_catalogue_version.datacatalog_id = property_catalogue.id " + + "LEFT JOIN property_catalogue_version_entry p ON p.property_version_id = property_catalogue_version.id " + + "WHERE name = '" + merkmalskatalog.get() + "' AND aktiv = 1 " + + "ORDER BY position ASC"; + + SQLQuery query = session.createSQLQuery(sql); + + for (String s : spaltenArray) { + query.addScalar(s, StandardBasicTypes.STRING); + } + + @SuppressWarnings("unchecked") + List rows = query.list(); + return rows; + } catch (Exception e) { + logger.error("Fehler bei der Ausführung von getMerkmalskatalog()", e); + return null; + } + } +} -- cgit v1.2.3