mirror of
https://github.com/pcvolkmer/onkostar-plugin-dnpm.git
synced 2025-07-03 09:42:54 +00:00
Methode getVerweise() vereinfacht
This commit is contained in:
@ -18,7 +18,10 @@ import org.hibernate.type.StandardBasicTypes;
|
|||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.ArrayList;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
|
|
||||||
public class DNPMHelper implements IProcedureAnalyzer {
|
public class DNPMHelper implements IProcedureAnalyzer {
|
||||||
|
|
||||||
@ -90,13 +93,12 @@ public class DNPMHelper implements IProcedureAnalyzer {
|
|||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
int value = 0;
|
var verbundeneFormulare = new ArrayList<Map<String, String>>();
|
||||||
var VerbundeneFormulare = new ArrayList<Map<String, String>>();
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
SessionFactory sessionFactory = onkostarApi.getSessionFactory();
|
SessionFactory sessionFactory = onkostarApi.getSessionFactory();
|
||||||
Session session = sessionFactory.getCurrentSession();
|
Session session = sessionFactory.getCurrentSession();
|
||||||
try {
|
|
||||||
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 " +
|
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 " +
|
"FROM prozedur " +
|
||||||
"LEFT JOIN data_form_data_catalogue ON data_form_data_catalogue.data_form_id = prozedur.data_form_id " +
|
"LEFT JOIN data_form_data_catalogue ON data_form_data_catalogue.data_form_id = prozedur.data_form_id " +
|
||||||
@ -119,29 +121,27 @@ public class DNPMHelper implements IProcedureAnalyzer {
|
|||||||
query.setResultTransformer(Transformers.aliasToBean(VerweisVon.class));
|
query.setResultTransformer(Transformers.aliasToBean(VerweisVon.class));
|
||||||
List<VerweisVon> result = query.list();
|
List<VerweisVon> result = query.list();
|
||||||
try {
|
try {
|
||||||
for (VerweisVon var : result) {
|
int value = 0;
|
||||||
sql = var.getSQL();
|
for (VerweisVon verweisVon : result) {
|
||||||
|
sql = verweisVon.getSQL();
|
||||||
query = session.createSQLQuery(sql)
|
query = session.createSQLQuery(sql)
|
||||||
.addScalar("value", StandardBasicTypes.INTEGER);
|
.addScalar("value", StandardBasicTypes.INTEGER);
|
||||||
if (query.uniqueResult() != null) {
|
if (query.uniqueResult() != null) {
|
||||||
value = (Integer) query.uniqueResult();
|
value = (Integer) query.uniqueResult();
|
||||||
}
|
}
|
||||||
if (value == procedureId.get()) {
|
if (value == procedureId.get()) {
|
||||||
VerbundeneFormulare.add(Map.of("formular", var.getVerbundenesFormular()));
|
verbundeneFormulare.add(Map.of("formular", verweisVon.getVerbundenesFormular()));
|
||||||
value = 0;
|
value = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
// TODO Auto-generated catch block
|
logger.warn("Fehler beim Hinzufügen eines Formularverweises", e);
|
||||||
e.printStackTrace();
|
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
logger.error("Fehler beim Ermitteln der Formularverweise", e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
return verbundeneFormulare;
|
||||||
return null;
|
|
||||||
}
|
|
||||||
return VerbundeneFormulare;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Map<String, String>> getSystemischeTherapienFromDiagnose(final Map<String, Object> input) {
|
public List<Map<String, String>> getSystemischeTherapienFromDiagnose(final Map<String, Object> input) {
|
||||||
|
@ -228,6 +228,23 @@ class DNPMHelperTest {
|
|||||||
verify(onkostarApi, times(1)).getSessionFactory();
|
verify(onkostarApi, times(1)).getSessionFactory();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testShouldCreateSqlQueryWithPatientId() {
|
||||||
|
var sessionFactory = mock(SessionFactory.class);
|
||||||
|
var session = mock(Session.class);
|
||||||
|
var query = mock(SQLQuery.class);
|
||||||
|
|
||||||
|
when(onkostarApi.getSessionFactory()).thenReturn(sessionFactory);
|
||||||
|
when(sessionFactory.getCurrentSession()).thenReturn(session);
|
||||||
|
when(session.createSQLQuery(anyString())).thenReturn(query);
|
||||||
|
|
||||||
|
dnpmHelper.getVerweise(Map.of("ProcedureId", 1, "PatientId", 2));
|
||||||
|
|
||||||
|
var argumentCaptor = ArgumentCaptor.forClass(String.class);
|
||||||
|
verify(session, times(1)).createSQLQuery(argumentCaptor.capture());
|
||||||
|
assertThat(argumentCaptor.getValue()).contains("WHERE patient_id = 2 AND geloescht = 0");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user