From ef5c91a352788a2ad84afa18fa0c7cdadec70ed8 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 20 Mar 2023 14:07:00 +0100 Subject: Issue #11: Service und Spring Data JPA Repository für Systemeinstellungen --- src/main/java/DNPM/config/PluginConfiguration.java | 16 +++++++- .../java/DNPM/database/ReadOnlyRepository.java | 20 +++++++++ .../java/DNPM/database/SettingsRepository.java | 14 +++++++ src/main/java/DNPM/services/SettingsService.java | 47 ++++++++++++++++++++++ .../DNPM/services/TherapieplanServiceFactory.java | 14 ++++--- src/main/java/de/itc/db/dnpm/Setting.java | 43 ++++++++++++++++++++ 6 files changed, 147 insertions(+), 7 deletions(-) create mode 100644 src/main/java/DNPM/database/ReadOnlyRepository.java create mode 100644 src/main/java/DNPM/database/SettingsRepository.java create mode 100644 src/main/java/DNPM/services/SettingsService.java create mode 100644 src/main/java/de/itc/db/dnpm/Setting.java (limited to 'src/main') diff --git a/src/main/java/DNPM/config/PluginConfiguration.java b/src/main/java/DNPM/config/PluginConfiguration.java index 36b1875..825c57c 100644 --- a/src/main/java/DNPM/config/PluginConfiguration.java +++ b/src/main/java/DNPM/config/PluginConfiguration.java @@ -1,10 +1,12 @@ package DNPM.config; +import DNPM.database.SettingsRepository; import DNPM.services.*; import de.itc.onkostar.api.IOnkostarApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import javax.sql.DataSource; @@ -15,6 +17,7 @@ import javax.sql.DataSource; */ @Configuration @ComponentScan(basePackages = "DNPM.analyzer") +@EnableJpaRepositories(basePackages = "DNPM.database") public class PluginConfiguration { @Bean @@ -28,8 +31,17 @@ public class PluginConfiguration { } @Bean - public TherapieplanServiceFactory therapieplanServiceFactory(final IOnkostarApi onkostarApi, final FormService formService) { - return new TherapieplanServiceFactory(onkostarApi, formService); + public SettingsService settingsService(final SettingsRepository settingsRepository) { + return new SettingsService(settingsRepository); + } + + @Bean + public TherapieplanServiceFactory therapieplanServiceFactory( + final IOnkostarApi onkostarApi, + final SettingsService settingsService, + final FormService formService + ) { + return new TherapieplanServiceFactory(onkostarApi, settingsService, formService); } } diff --git a/src/main/java/DNPM/database/ReadOnlyRepository.java b/src/main/java/DNPM/database/ReadOnlyRepository.java new file mode 100644 index 0000000..775388d --- /dev/null +++ b/src/main/java/DNPM/database/ReadOnlyRepository.java @@ -0,0 +1,20 @@ +package DNPM.database; + +import org.springframework.data.repository.NoRepositoryBean; +import org.springframework.data.repository.Repository; + +import java.io.Serializable; +import java.util.List; + +/** + * Basis-Repository for ReadOnly Spring-Data-JPA Repositories + *

Entity-Klassen müssen in Package de.itc.db.dnpm liegen + * @param Typ des Entities + * @param Typ der ID + */ +@NoRepositoryBean +public interface ReadOnlyRepository extends Repository { + + List findAll(); + +} diff --git a/src/main/java/DNPM/database/SettingsRepository.java b/src/main/java/DNPM/database/SettingsRepository.java new file mode 100644 index 0000000..9a6e331 --- /dev/null +++ b/src/main/java/DNPM/database/SettingsRepository.java @@ -0,0 +1,14 @@ +package DNPM.database; + +import de.itc.db.dnpm.Setting; +import org.springframework.stereotype.Repository; + +/** + * Spring Data JPA Repository zum Lesen von Einstellungen + */ +@Repository("dnpmSettingRepository") +public interface SettingsRepository extends ReadOnlyRepository { + + Setting findByName(String name); + +} diff --git a/src/main/java/DNPM/services/SettingsService.java b/src/main/java/DNPM/services/SettingsService.java new file mode 100644 index 0000000..b07a2f3 --- /dev/null +++ b/src/main/java/DNPM/services/SettingsService.java @@ -0,0 +1,47 @@ +package DNPM.services; + +import DNPM.database.SettingsRepository; + +import java.util.Optional; + +/** + * Implementiert den Dienst zur Ermittlung von Systemeinstellungen + */ +public class SettingsService { + + private final SettingsRepository settingsRepository; + + public SettingsService(final SettingsRepository settingsRepository) { + this.settingsRepository = settingsRepository; + } + + /** + * Übergibt ein Optional für die Einstellung mit angegebenen Namen + * @param name Name der Einstellung + * @return Optional mit Wert der Einstellung oder ein leeres Optional, wenn Einstellung nicht gefunden + */ + public Optional getSetting(String name) { + var sid = settingsRepository.findByName(name); + if (null == sid) { + return Optional.empty(); + } + return Optional.of(sid.getValue()); + } + + /** + * Übergibt die SID als Optional + * @return Optional mit Wert der SID + */ + public Optional getSID() { + return getSetting("SID"); + } + + /** + * Übergibt die Einstellung für mehrere_mtb_in_mtbepisode + * @return Übergibt true, wenn mehrere_mtb_in_mtbepisode auf "Ja" gesetzt ist. + */ + public boolean multipleMtbsInMtbEpisode() { + var setting = getSetting("SID"); + return setting.isPresent() && setting.get().equals("true"); + } +} diff --git a/src/main/java/DNPM/services/TherapieplanServiceFactory.java b/src/main/java/DNPM/services/TherapieplanServiceFactory.java index 5b3b54c..0b64410 100644 --- a/src/main/java/DNPM/services/TherapieplanServiceFactory.java +++ b/src/main/java/DNPM/services/TherapieplanServiceFactory.java @@ -6,18 +6,22 @@ public class TherapieplanServiceFactory { private final IOnkostarApi onkostarApi; + private final SettingsService settingsService; + private final FormService formService; - public TherapieplanServiceFactory(IOnkostarApi onkostarApi, FormService formService) { + public TherapieplanServiceFactory( + final IOnkostarApi onkostarApi, + final SettingsService settingsService, + final FormService formService + ) { this.onkostarApi = onkostarApi; + this.settingsService = settingsService; this.formService = formService; } public TherapieplanService currentUsableInstance() { - if ( - null != onkostarApi.getGlobalSetting("mehrere_mtb_in_mtbepisode") - && onkostarApi.getGlobalSetting("mehrere_mtb_in_mtbepisode").equals("true") - ) { + if (settingsService.multipleMtbsInMtbEpisode()) { return new MultipleMtbTherapieplanService(); } diff --git a/src/main/java/de/itc/db/dnpm/Setting.java b/src/main/java/de/itc/db/dnpm/Setting.java new file mode 100644 index 0000000..262d2c9 --- /dev/null +++ b/src/main/java/de/itc/db/dnpm/Setting.java @@ -0,0 +1,43 @@ +package de.itc.db.dnpm; + +import org.hibernate.annotations.Immutable; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Immutable +@Table(name = "einstellung") +public class Setting { + @Id + private Long id; + + private String name; + + @Column(name = "wert") + private String value; + + protected Setting() { + // No content + } + + public Setting(Long id, String name, String value) { + this.id = id; + this.name = name; + this.value = value; + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } +} -- cgit v1.2.3 From 887221d5aec7fbe32a86b705b33aa4b5d2fa7062 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 20 Mar 2023 16:43:07 +0100 Subject: Issue #11: Service zum Generieren des Protokollauszugs aus MTBs Implementierungen vorhanden für die Formulare: * OS.Tumorkonferenz * OS.Tumorkonferenz.VarianteUKW --- .../java/DNPM/services/mtb/DefaultMtbService.java | 39 ++++++++++++++++++++ src/main/java/DNPM/services/mtb/MtbService.java | 9 +++++ .../mtb/OsTumorkonferenzToProtocolMapper.java | 33 +++++++++++++++++ ...sTumorkonferenzVarianteUkwToProtocolMapper.java | 42 ++++++++++++++++++++++ .../services/mtb/ProcedureToProtocolMapper.java | 10 ++++++ 5 files changed, 133 insertions(+) create mode 100644 src/main/java/DNPM/services/mtb/DefaultMtbService.java create mode 100644 src/main/java/DNPM/services/mtb/MtbService.java create mode 100644 src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java create mode 100644 src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java create mode 100644 src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java (limited to 'src/main') diff --git a/src/main/java/DNPM/services/mtb/DefaultMtbService.java b/src/main/java/DNPM/services/mtb/DefaultMtbService.java new file mode 100644 index 0000000..40d9360 --- /dev/null +++ b/src/main/java/DNPM/services/mtb/DefaultMtbService.java @@ -0,0 +1,39 @@ +package DNPM.services.mtb; + +import DNPM.services.SettingsService; +import de.itc.onkostar.api.Procedure; + +import java.util.List; + +public class DefaultMtbService implements MtbService { + + private final SettingsService settingsService; + + public DefaultMtbService(final SettingsService settingsService) { + this.settingsService = settingsService; + } + + @Override + public String getProtocol(List procedures) { + ProcedureToProtocolMapper mapper = null; + var sid = settingsService.getSID(); + + if (sid.isPresent()) { + switch (sid.get()) { + case "20119": + mapper = new OsTumorkonferenzVarianteUkwToProtocolMapper(); + default: + if (!settingsService.multipleMtbsInMtbEpisode()) { + mapper = new OsTumorkonferenzToProtocolMapper(); + } + } + } + + if (null == mapper) { + return ""; + } + + return mapper.apply(procedures).orElse(""); + } + +} diff --git a/src/main/java/DNPM/services/mtb/MtbService.java b/src/main/java/DNPM/services/mtb/MtbService.java new file mode 100644 index 0000000..b854307 --- /dev/null +++ b/src/main/java/DNPM/services/mtb/MtbService.java @@ -0,0 +1,9 @@ +package DNPM.services.mtb; + +import de.itc.onkostar.api.Procedure; + +import java.util.List; + +public interface MtbService { + String getProtocol(List procedures); +} diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java new file mode 100644 index 0000000..f6684a2 --- /dev/null +++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java @@ -0,0 +1,33 @@ +package DNPM.services.mtb; + +import de.itc.onkostar.api.Procedure; + +import java.util.List; +import java.util.Optional; + +public class OsTumorkonferenzToProtocolMapper implements ProcedureToProtocolMapper { + @Override + public Optional apply(List procedures) { + assert(procedures.size() == 1); + + var procedure = procedures.get(0); + + assert(procedure.getFormName().equals("OS.Tumorkonferenz")); + + var fragestellung = procedure.getValue("Fragestellung"); + var empfehlung = procedure.getValue("Empfehlung"); + + if ( + null != fragestellung && !fragestellung.getString().isBlank() + && null != empfehlung && !empfehlung.getString().isBlank() + ) { + return Optional.of(String.format("%s\n%s", fragestellung.getString(), empfehlung.getString())); + } else if (null != fragestellung && !fragestellung.getString().isBlank()) { + return Optional.of(fragestellung.getString()); + } else if (null != empfehlung && !empfehlung.getString().isBlank()) { + return Optional.of(empfehlung.getString()); + } + + return Optional.empty(); + } +} diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java new file mode 100644 index 0000000..de36415 --- /dev/null +++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java @@ -0,0 +1,42 @@ +package DNPM.services.mtb; + +import de.itc.onkostar.api.Procedure; + +import java.util.Comparator; +import java.util.List; +import java.util.Optional; +import java.util.stream.Collectors; + +public class OsTumorkonferenzVarianteUkwToProtocolMapper implements ProcedureToProtocolMapper { + @Override + public Optional apply(List procedures) { + procedures.forEach(procedure -> { + assert (procedure.getFormName().equals("OS.Tumorkonferenz.VarianteUKW")); + }); + + procedures.sort(Comparator.comparing(Procedure::getStartDate)); + + var result = procedures.stream().map(procedure -> { + var fragestellung = procedure.getValue("Fragestellung"); + var empfehlung = procedure.getValue("Empfehlung"); + + if ( + null != fragestellung && !fragestellung.getString().isBlank() + && null != empfehlung && !empfehlung.getString().isBlank() + ) { + return String.format("%s\n%s", fragestellung.getString(), empfehlung.getString()); + } else if (null != fragestellung && !fragestellung.getString().isBlank()) { + return fragestellung.getString(); + } else if (null != empfehlung && !empfehlung.getString().isBlank()) { + return empfehlung.getString(); + } + return ""; + }).collect(Collectors.joining("\n")); + + if (!result.isBlank()) { + return Optional.of(result); + } + + return Optional.empty(); + } +} diff --git a/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java b/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java new file mode 100644 index 0000000..54c04d9 --- /dev/null +++ b/src/main/java/DNPM/services/mtb/ProcedureToProtocolMapper.java @@ -0,0 +1,10 @@ +package DNPM.services.mtb; + +import de.itc.onkostar.api.Procedure; + +import java.util.List; +import java.util.Optional; +import java.util.function.Function; + +@FunctionalInterface +public interface ProcedureToProtocolMapper extends Function, Optional> {} -- cgit v1.2.3 From e9c25818d2966e175ef29f2d6663fd5292318bd8 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 20 Mar 2023 22:16:08 +0100 Subject: Issue #11: Methode zum Auffinden referenzierter MTBs hinzugefügt --- src/main/java/DNPM/config/PluginConfiguration.java | 7 +++ .../DNPM/services/DefaultTherapieplanService.java | 35 ++++++++++++ .../services/MultipleMtbTherapieplanService.java | 63 ++++++++++++++++++++++ src/main/java/DNPM/services/SettingsService.java | 2 +- .../java/DNPM/services/TherapieplanService.java | 18 +++++++ .../DNPM/services/TherapieplanServiceFactory.java | 2 +- 6 files changed, 125 insertions(+), 2 deletions(-) (limited to 'src/main') diff --git a/src/main/java/DNPM/config/PluginConfiguration.java b/src/main/java/DNPM/config/PluginConfiguration.java index 825c57c..3f27034 100644 --- a/src/main/java/DNPM/config/PluginConfiguration.java +++ b/src/main/java/DNPM/config/PluginConfiguration.java @@ -2,6 +2,8 @@ package DNPM.config; import DNPM.database.SettingsRepository; import DNPM.services.*; +import DNPM.services.mtb.DefaultMtbService; +import DNPM.services.mtb.MtbService; import de.itc.onkostar.api.IOnkostarApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -35,6 +37,11 @@ public class PluginConfiguration { return new SettingsService(settingsRepository); } + @Bean + public MtbService mtbService(final SettingsService settingsService) { + return new DefaultMtbService(settingsService); + } + @Bean public TherapieplanServiceFactory therapieplanServiceFactory( final IOnkostarApi onkostarApi, diff --git a/src/main/java/DNPM/services/DefaultTherapieplanService.java b/src/main/java/DNPM/services/DefaultTherapieplanService.java index f705ce8..eee2041 100644 --- a/src/main/java/DNPM/services/DefaultTherapieplanService.java +++ b/src/main/java/DNPM/services/DefaultTherapieplanService.java @@ -6,6 +6,7 @@ import de.itc.onkostar.api.Procedure; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.util.List; import java.util.Objects; import static DNPM.services.FormService.hasValue; @@ -36,6 +37,40 @@ public class DefaultTherapieplanService implements TherapieplanService { this.updateMtbInSubforms(procedure); } + /** + * Finde verlinkte MTBs in Hauptformular und Unterformularen + * + * @param procedure Die Prozedur mit Hauptformular + * @return Liste mit verlinkten MTBs + */ + @Override + public List findReferencedMtbs(Procedure procedure) { + if (!hasValue(procedure, "referstemtb")) { + return List.of(); + } + + var mtbProcedure = this.onkostarApi.getProcedure(procedure.getValue("referstemtb").getInt()); + if (null == mtbProcedure) { + return List.of(); + } + return List.of(mtbProcedure); + } + + /** + * Finde verlinkte MTBs in Hauptformular und Unterformularen + * + * @param procedureId ID der Prozedur mit Hauptformular + * @return Liste mit verlinkten MTBs + */ + @Override + public List findReferencedMtbs(int procedureId) { + var procedure = this.onkostarApi.getProcedure(procedureId); + if (null == procedure) { + return List.of(); + } + return findReferencedMtbs(procedure); + } + private void updateMtbInSections(Procedure procedure) { if (!isYes(procedure, "humangenberatung") && !isYes(procedure, "reevaluation")) { return; diff --git a/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java b/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java index d4eb297..faded4b 100644 --- a/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java +++ b/src/main/java/DNPM/services/MultipleMtbTherapieplanService.java @@ -1,12 +1,75 @@ package DNPM.services; +import de.itc.onkostar.api.IOnkostarApi; import de.itc.onkostar.api.Procedure; +import java.util.ArrayList; +import java.util.Comparator; +import java.util.List; +import java.util.Objects; +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 MultipleMtbTherapieplanService(final IOnkostarApi onkostarApi, final FormService formService) { + this.onkostarApi = onkostarApi; + this.formService = formService; + } + @Override public void updateRequiredMtbEntries(Procedure procedure) { // No action required } + @Override + public List findReferencedMtbs(Procedure procedure) { + var procedureIds = new ArrayList(); + + var mtbReference = procedure.getValue("referstemtb").getInt(); + procedureIds.add(mtbReference); + + if (isYes(procedure, "humangenberatung") && hasValue(procedure, "reftkhumangenber")) { + procedureIds.add(procedure.getValue("reftkhumangenber").getInt()); + } + + if (isYes(procedure, "reevaluation") && hasValue(procedure, "reftkreevaluation")) { + procedureIds.add(procedure.getValue("reftkreevaluation").getInt()); + } + + formService.getSubFormProcedureIds(procedure.getId()).stream() + .map(onkostarApi::getProcedure) + .filter(Objects::nonNull) + .forEach(subform -> { + if (subform.getFormName().equals("DNPM UF Einzelempfehlung")) { + procedureIds.add(subform.getValue("mtb").getInt()); + } + + if (subform.getFormName().equals("DNPM UF Rebiopsie")) { + procedureIds.add(subform.getValue("reftumorkonferenz").getInt()); + } + }); + + return procedureIds.stream() + .distinct() + .map(onkostarApi::getProcedure) + .filter(Objects::nonNull) + .sorted(Comparator.comparing(Procedure::getStartDate)) + .collect(Collectors.toList()); + } + + @Override + public List findReferencedMtbs(int procedureId) { + var procedure = this.onkostarApi.getProcedure(procedureId); + if (null == procedure) { + return List.of(); + } + return findReferencedMtbs(procedure); + } } diff --git a/src/main/java/DNPM/services/SettingsService.java b/src/main/java/DNPM/services/SettingsService.java index b07a2f3..7459d4e 100644 --- a/src/main/java/DNPM/services/SettingsService.java +++ b/src/main/java/DNPM/services/SettingsService.java @@ -41,7 +41,7 @@ public class SettingsService { * @return Übergibt true, wenn mehrere_mtb_in_mtbepisode auf "Ja" gesetzt ist. */ public boolean multipleMtbsInMtbEpisode() { - var setting = getSetting("SID"); + var setting = getSetting("mehrere_mtb_in_mtbepisode"); return setting.isPresent() && setting.get().equals("true"); } } diff --git a/src/main/java/DNPM/services/TherapieplanService.java b/src/main/java/DNPM/services/TherapieplanService.java index e47d75e..7a725fc 100644 --- a/src/main/java/DNPM/services/TherapieplanService.java +++ b/src/main/java/DNPM/services/TherapieplanService.java @@ -2,6 +2,8 @@ package DNPM.services; import de.itc.onkostar.api.Procedure; +import java.util.List; + public interface TherapieplanService { /** @@ -12,4 +14,20 @@ public interface TherapieplanService { */ void updateRequiredMtbEntries(Procedure procedure); + /** + * Finde verlinkte MTBs in Hauptformular und Unterformularen + * + * @param procedure Die Prozedur mit Hauptformular + * @return Liste mit verlinkten MTBs + */ + List findReferencedMtbs(Procedure procedure); + + /** + * Finde verlinkte MTBs in Hauptformular und Unterformularen + * + * @param procedureId ID der Prozedur mit Hauptformular + * @return Liste mit verlinkten MTBs + */ + List findReferencedMtbs(int procedureId); + } diff --git a/src/main/java/DNPM/services/TherapieplanServiceFactory.java b/src/main/java/DNPM/services/TherapieplanServiceFactory.java index 0b64410..3e05fb4 100644 --- a/src/main/java/DNPM/services/TherapieplanServiceFactory.java +++ b/src/main/java/DNPM/services/TherapieplanServiceFactory.java @@ -22,7 +22,7 @@ public class TherapieplanServiceFactory { public TherapieplanService currentUsableInstance() { if (settingsService.multipleMtbsInMtbEpisode()) { - return new MultipleMtbTherapieplanService(); + return new MultipleMtbTherapieplanService(onkostarApi, formService); } return new DefaultTherapieplanService(onkostarApi, formService); -- cgit v1.2.3 From 9809fd550f5ddd394081529318db6a5001b54bac Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 20 Mar 2023 22:18:37 +0100 Subject: Issue #11: Verwende Überschrift für Fragestellung und Empfehlung --- .../java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java | 2 +- .../services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/main') diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java index f6684a2..6379ecf 100644 --- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java +++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzToProtocolMapper.java @@ -21,7 +21,7 @@ public class OsTumorkonferenzToProtocolMapper implements ProcedureToProtocolMapp null != fragestellung && !fragestellung.getString().isBlank() && null != empfehlung && !empfehlung.getString().isBlank() ) { - return Optional.of(String.format("%s\n%s", fragestellung.getString(), empfehlung.getString())); + return Optional.of(String.format("Fragestellung:\n%s\n\nEmpfehlung:\n%s", fragestellung.getString(), empfehlung.getString())); } else if (null != fragestellung && !fragestellung.getString().isBlank()) { return Optional.of(fragestellung.getString()); } else if (null != empfehlung && !empfehlung.getString().isBlank()) { diff --git a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java index de36415..78a94eb 100644 --- a/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java +++ b/src/main/java/DNPM/services/mtb/OsTumorkonferenzVarianteUkwToProtocolMapper.java @@ -24,14 +24,14 @@ public class OsTumorkonferenzVarianteUkwToProtocolMapper implements ProcedureToP null != fragestellung && !fragestellung.getString().isBlank() && null != empfehlung && !empfehlung.getString().isBlank() ) { - return String.format("%s\n%s", fragestellung.getString(), empfehlung.getString()); + return String.format("Fragestellung:\n%s\n\nEmpfehlung:\n%s", fragestellung.getString().trim(), empfehlung.getString().trim()); } else if (null != fragestellung && !fragestellung.getString().isBlank()) { - return fragestellung.getString(); + return fragestellung.getString().trim(); } else if (null != empfehlung && !empfehlung.getString().isBlank()) { - return empfehlung.getString(); + return empfehlung.getString().trim(); } return ""; - }).collect(Collectors.joining("\n")); + }).collect(Collectors.joining("\n\n")); if (!result.isBlank()) { return Optional.of(result); -- cgit v1.2.3 From aad777b5e36238ef437210bd9ad3ea51c3274a45 Mon Sep 17 00:00:00 2001 From: Paul-Christian Volkmer Date: Mon, 20 Mar 2023 22:19:20 +0100 Subject: Issue #11: Backend-Service-Methode zum Abrufen des Protokollauszugs hinzugefügt --- .../java/DNPM/analyzer/TherapieplanAnalyzer.java | 42 +++++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) (limited to 'src/main') diff --git a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java index cf3b633..bdda750 100644 --- a/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java +++ b/src/main/java/DNPM/analyzer/TherapieplanAnalyzer.java @@ -3,6 +3,7 @@ package DNPM.analyzer; import DNPM.services.Studie; import DNPM.services.StudienService; import DNPM.services.TherapieplanServiceFactory; +import DNPM.services.mtb.MtbService; import de.itc.onkostar.api.Disease; import de.itc.onkostar.api.Procedure; import de.itc.onkostar.api.analysis.AnalyseTriggerEvent; @@ -27,12 +28,16 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer { private final TherapieplanServiceFactory therapieplanServiceFactory; + private final MtbService mtbService; + public TherapieplanAnalyzer( final StudienService studienService, - final TherapieplanServiceFactory therapieplanServiceFactory + final TherapieplanServiceFactory therapieplanServiceFactory, + final MtbService mtbService ) { this.studienService = studienService; this.therapieplanServiceFactory = therapieplanServiceFactory; + this.mtbService = mtbService; } @Override @@ -110,6 +115,7 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer { * * * @param input Map mit Eingabewerten + * @return Liste mit Studien */ public List getStudien(Map input) { var query = input.get("q"); @@ -120,4 +126,38 @@ public class TherapieplanAnalyzer implements IProcedureAnalyzer { return studienService.findByQuery(query.toString()); } + /** + * Übergibt den Text der referenzierten MTBs für den Protokollauszug + * + *

Wurde der Eingabewert id nicht übergeben, wird ein leerer String zurück gegeben. + * + *

Beispiel zur Nutzung in einem Formularscript + * 

+     * executePluginMethod(
+     *   'TherapieplanAnalyzer',
+     *   'getProtokollauszug',
+     *   { id: 12345 },
+     *   (response) => console.log(response),
+     *   false
+     * );
+     *
+ * + * @param input Map mit Eingabewerten + * @return Zeichenkette mit Protokollauszug + */ + public String getProtokollauszug(Map input) { + var id = input.get("id"); + + if (null == id || 0 == Integer.parseInt(id.toString())) { + return ""; + } + + var procedureId = Integer.parseInt(id.toString()); + return mtbService.getProtocol( + therapieplanServiceFactory + .currentUsableInstance() + .findReferencedMtbs(procedureId) + ); + } + } -- cgit v1.2.3