mirror of
https://github.com/pcvolkmer/onkostar-plugin-dnpm.git
synced 2025-07-02 09:12:54 +00:00
Aufteilung der Methode getSystemischeTherapienFromDiagnose() und Prüfung auf DiagnoseId
This commit is contained in:
@ -15,10 +15,14 @@ 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 java.util.*;
|
||||
|
||||
public class DNPMHelper implements IProcedureAnalyzer{
|
||||
public class DNPMHelper implements IProcedureAnalyzer {
|
||||
|
||||
private static final Logger logger = LoggerFactory.getLogger(DNPMHelper.class);
|
||||
|
||||
private final IOnkostarApi onkostarApi;
|
||||
|
||||
@ -112,7 +116,7 @@ public class DNPMHelper implements IProcedureAnalyzer{
|
||||
query = session.createSQLQuery(sql)
|
||||
.addScalar("value", StandardBasicTypes.INTEGER);
|
||||
if (query.uniqueResult() != null) {
|
||||
value = (Integer)query.uniqueResult();
|
||||
value = (Integer) query.uniqueResult();
|
||||
}
|
||||
if (value == ProcedureId) {
|
||||
VerbundeneFormulare.add(Map.of("formular", var.getVerbundenesFormular()));
|
||||
@ -132,86 +136,78 @@ public class DNPMHelper implements IProcedureAnalyzer{
|
||||
return VerbundeneFormulare;
|
||||
}
|
||||
|
||||
public Object getSystemischeTherapienFromDiagnose(final Map<String, Object> input) {
|
||||
int DiagnoseId = (int) input.get("DiagnoseId");
|
||||
public List<Map<String, String>> getSystemischeTherapienFromDiagnose(final Map<String, Object> input) {
|
||||
var diagnoseId = input.get("DiagnoseId");
|
||||
|
||||
String jsonStr = "";
|
||||
List<Object> Rueckgabewerte = new ArrayList<Object>();
|
||||
List<Procedure> Prozeduren = onkostarApi.getProceduresForDiseaseByForm(DiagnoseId, "OS.Systemische Therapie");
|
||||
// für jede Prozedur
|
||||
for (Procedure Prozedur : Prozeduren) {
|
||||
String Beginn = new String();
|
||||
String Ende = new String();
|
||||
String Wirkstoffe = new String();
|
||||
String Beendigung = new String();
|
||||
String Ergebnis = new String();
|
||||
if (null == diagnoseId || Integer.parseInt(diagnoseId.toString()) == 0) {
|
||||
logger.error("Kein Parameter 'DiagnoseId' angegeben, gebe 'null' zurück");
|
||||
return null;
|
||||
}
|
||||
|
||||
List<Map<String, String>> result = new ArrayList<>();
|
||||
for (Procedure Prozedur : onkostarApi.getProceduresForDiseaseByForm(Integer.parseInt(diagnoseId.toString()), "OS.Systemische Therapie")) {
|
||||
result.add(getProzedurwerte(Prozedur));
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private static Map<String, String> getProzedurwerte(Procedure Prozedur) {
|
||||
List<String> wirkstoffListe = new ArrayList<>();
|
||||
// SubstanzenCodesListe enthält die Liste der SubstanzenCodes
|
||||
List<Map<String, String>> SubstanzenCodesListe = new ArrayList<Map<String, String>>();
|
||||
List<Map<String, String>> substanzenCodesListe = new ArrayList<>();
|
||||
|
||||
// alle Werte der Prozedur auslesen
|
||||
Map<String, Item> alleWerte = Prozedur.getAllValues();
|
||||
// Prozedurwerte enthält nur die interessanten Werte
|
||||
Map<String, Object> Prozedurwerte = new HashMap<>();
|
||||
Map<String, String> prozedurwerte = new HashMap<>();
|
||||
// alle Werte durchgehen und die interessanten übernehmen
|
||||
for (Map.Entry<String, Item> WerteListe : alleWerte.entrySet()) {
|
||||
// Datum des Hauptformulars merken
|
||||
if (WerteListe.getKey().equals("Beendigung")) {
|
||||
Beendigung = WerteListe.getValue().getValue();
|
||||
if (alleWerte.containsKey("Beendigung")) {
|
||||
prozedurwerte.put("Beendigung", alleWerte.get("Beendigung").getValue());
|
||||
}
|
||||
if (WerteListe.getKey().equals("Ergebnis")) {
|
||||
Ergebnis = WerteListe.getValue().getValue();
|
||||
if (alleWerte.containsKey("Ergebnis")) {
|
||||
prozedurwerte.put("Ergebnis", alleWerte.get("Ergebnis").getValue());
|
||||
}
|
||||
if (WerteListe.getKey().equals("Beginn")) {
|
||||
Beginn = WerteListe.getValue().getString();// + "," + WerteListe.getValue().getDateAccuracy();
|
||||
if (alleWerte.containsKey("Beginn")) {
|
||||
prozedurwerte.put("Beginn", alleWerte.get("Beginn").getString());
|
||||
}
|
||||
if (WerteListe.getKey().equals("Ende")) {
|
||||
Ende = WerteListe.getValue().getString();// + "," + WerteListe.getValue().getDateAccuracy();
|
||||
if (alleWerte.containsKey("Ende")) {
|
||||
prozedurwerte.put("Ende", alleWerte.get("Ende").getString());
|
||||
}
|
||||
if (alleWerte.containsKey("SubstanzenList")) {
|
||||
List<Map<String, String>> substanzList = alleWerte.get("SubstanzenList").getValue();
|
||||
for (var substanz : substanzList) {
|
||||
var substanzCodes = getSubstanzCode(substanz);
|
||||
substanzenCodesListe.add(substanzCodes);
|
||||
wirkstoffListe.add(substanzCodes.get("substance"));
|
||||
}
|
||||
// im Subformular (SubstanzenList) Substanzen auslesen
|
||||
if (WerteListe.getKey().equals("SubstanzenList")) {
|
||||
int Index = -1;
|
||||
// SubstanzenCodesListe enthält die Liste der SubstanzenCodes eines Subformulars
|
||||
ArrayList<Map<String, Map<String, String>>> Subformular = new ArrayList<>();
|
||||
Subformular = WerteListe.getValue().getValue();
|
||||
// Werte aus Subformular verarbeiten
|
||||
for (Map<String, Map<String, String>> SubformularWerte: Subformular) {
|
||||
|
||||
// SubstanzenCodes enthält den Code und den Namen einer Substanz
|
||||
Map<String, String> SubstanzenCodes = new HashMap<String, String>();
|
||||
// Index des Codes (Substanz)
|
||||
Index = Arrays.asList((SubformularWerte.keySet().toArray())).indexOf("Substanz");
|
||||
if (AtcCode.isAtcCode(SubformularWerte.values().toArray()[Index].toString())) {
|
||||
SubstanzenCodes.put("system", "ATC");
|
||||
} else {
|
||||
SubstanzenCodes.put("system", "other");
|
||||
}
|
||||
|
||||
SubstanzenCodes.put("code", (String) SubformularWerte.values().toArray()[Index]);
|
||||
// Index der Substanz (Substanz_shortDescription)
|
||||
Index = Arrays.asList((SubformularWerte.keySet().toArray())).indexOf("Substanz_shortDescription");
|
||||
SubstanzenCodes.put("substance", (String) SubformularWerte.values().toArray()[Index]);
|
||||
SubstanzenCodesListe.add(SubstanzenCodes);
|
||||
Wirkstoffe = Wirkstoffe + (String) SubformularWerte.values().toArray()[Index] + ", ";
|
||||
}
|
||||
}
|
||||
}
|
||||
ObjectMapper Obj = new ObjectMapper();
|
||||
prozedurwerte.put("Wirkstoffe", String.join(", ", wirkstoffListe));
|
||||
try {
|
||||
jsonStr = Obj.writeValueAsString(SubstanzenCodesListe);
|
||||
ObjectMapper mapper = new ObjectMapper();
|
||||
prozedurwerte.put("WirkstoffCodes", mapper.writeValueAsString(substanzenCodesListe));
|
||||
} catch (JsonProcessingException e) {
|
||||
// TODO Auto-generated catch block
|
||||
e.printStackTrace();
|
||||
logger.error("Kann 'WirkstoffCodes' nicht in JSON-String mappen", e);
|
||||
}
|
||||
Prozedurwerte.put("Beginn", Beginn);
|
||||
Prozedurwerte.put("Ende", Ende);
|
||||
Prozedurwerte.put("Beendigung", Beendigung);
|
||||
Prozedurwerte.put("Ergebnis", Ergebnis);
|
||||
Prozedurwerte.put("Wirkstoffe", Wirkstoffe.substring(0, Wirkstoffe.length()-2));
|
||||
Prozedurwerte.put("WirkstoffCodes", jsonStr);
|
||||
Rueckgabewerte.add(Prozedurwerte);
|
||||
|
||||
return prozedurwerte;
|
||||
}
|
||||
return Rueckgabewerte;
|
||||
|
||||
private static Map<String, String> getSubstanzCode(Map<String, String> substanz) {
|
||||
Map<String, String> substanzCode = new HashMap<>();
|
||||
if (substanz.containsKey("Substanz")) {
|
||||
if (AtcCode.isAtcCode(substanz.get("Substanz"))) {
|
||||
substanzCode.put("system", "ATC");
|
||||
} else {
|
||||
substanzCode.put("system", "other");
|
||||
}
|
||||
substanzCode.put("code", substanz.get("Substanz"));
|
||||
|
||||
}
|
||||
if (substanz.containsKey("Substanz_shortDescription")) {
|
||||
substanzCode.put("substance", substanz.get("Substanz_shortDescription"));
|
||||
}
|
||||
return substanzCode;
|
||||
}
|
||||
|
||||
public Object getProzedurenFromDiagnose(final Map<String, Object> input) {
|
||||
@ -223,13 +219,13 @@ public class DNPMHelper implements IProcedureAnalyzer{
|
||||
List<Object> Formulare = new ArrayList<Object>();
|
||||
String jsonStr = "";
|
||||
List<Procedure> Prozeduren = onkostarApi.getProceduresByPatientId(PatientId);
|
||||
for (Procedure Prozedur: Prozeduren ) {
|
||||
for (Procedure Prozedur : Prozeduren) {
|
||||
// Formular gehört zur aktuellen Diagnose und hat den angegebenen Namen
|
||||
if (Prozedur.getDiseaseIds().contains(DiagnoseId) && Prozedur.getFormName().contains(dataForm)) {
|
||||
// alle Werte auslesen
|
||||
Map<String, Item> Werte = Prozedur.getAllValues();
|
||||
Map<String, Object> Values = new HashMap<>();
|
||||
for (Map.Entry<String, Item> WerteListe: Werte.entrySet()) {
|
||||
for (Map.Entry<String, Item> WerteListe : Werte.entrySet()) {
|
||||
Values.put(WerteListe.getKey(), WerteListe.getValue());
|
||||
// System.out.println(WerteListe.getKey() + ": " + WerteListe.getValue());
|
||||
}
|
||||
@ -297,7 +293,7 @@ public class DNPMHelper implements IProcedureAnalyzer{
|
||||
String sql;
|
||||
|
||||
try {
|
||||
sql = "UPDATE prozedur SET beginndatum = '"+ strDate +"' WHERE id = '"+ rid +"' ";
|
||||
sql = "UPDATE prozedur SET beginndatum = '" + strDate + "' WHERE id = '" + rid + "' ";
|
||||
result = onkostarApi.getSessionFactory().getCurrentSession().createSQLQuery(sql);
|
||||
result.executeUpdate();
|
||||
return true;
|
||||
|
@ -12,6 +12,7 @@ import org.mockito.junit.jupiter.MockitoExtension;
|
||||
import java.sql.Date;
|
||||
import java.time.Instant;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
@ -64,22 +65,19 @@ public class DNPMHelperTest {
|
||||
|
||||
assertThat(actual).isNotNull();
|
||||
assertThat(actual).isExactlyInstanceOf(ArrayList.class);
|
||||
assertThat(actual).hasSize(1);
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
var actualList = (ArrayList<Map<String, Object>>) actual;
|
||||
assertThat(actualList).hasSize(1);
|
||||
|
||||
assertThat(actualList.get(0).get("Beginn"))
|
||||
assertThat(actual.get(0).get("Beginn"))
|
||||
.isEqualTo(Date.from(Instant.parse("2023-01-01T00:00:00Z")).toString());
|
||||
assertThat(actualList.get(0).get("Ende"))
|
||||
assertThat(actual.get(0).get("Ende"))
|
||||
.isEqualTo(Date.from(Instant.parse("2023-01-31T00:00:00Z")).toString());
|
||||
assertThat(actualList.get(0).get("Beendigung"))
|
||||
assertThat(actual.get(0).get("Beendigung"))
|
||||
.isEqualTo("E");
|
||||
assertThat(actualList.get(0).get("Ergebnis"))
|
||||
assertThat(actual.get(0).get("Ergebnis"))
|
||||
.isEqualTo("T");
|
||||
assertThat(actualList.get(0).get("Wirkstoffe"))
|
||||
assertThat(actual.get(0).get("Wirkstoffe"))
|
||||
.isEqualTo("Testsubstanz, cyclophosphamide");
|
||||
assertThat(actualList.get(0).get("WirkstoffCodes"))
|
||||
assertThat(actual.get(0).get("WirkstoffCodes"))
|
||||
.isEqualTo(
|
||||
"[" +
|
||||
"{\"system\":\"other\",\"code\":\"Testsubstanz\",\"substance\":\"Testsubstanz\"}," +
|
||||
@ -88,4 +86,11 @@ public class DNPMHelperTest {
|
||||
);
|
||||
}
|
||||
|
||||
@Test
|
||||
void testShouldReturnNullIfNoDiagnoseId() {
|
||||
var actual = dnpmHelper.getSystemischeTherapienFromDiagnose(new HashMap<>());
|
||||
|
||||
assertThat(actual).isNull();
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user