1
0
mirror of https://github.com/pcvolkmer/onkostar-plugin-dnpm.git synced 2025-07-02 01:02:55 +00:00

Prüfung ob ProzedurID übergeben wurde hinzugefügt

This commit is contained in:
2023-03-25 22:54:46 +01:00
parent 734905485b
commit 9e56a52ac8
3 changed files with 32 additions and 24 deletions

View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>DNPMHelper</groupId>
<artifactId>DNPMHelper</artifactId>
<version>0.1.0</version>
<version>0.2.0-SNAPSHOT</version>
<name>DNPMHelper</name>
<properties>

View File

@ -189,34 +189,35 @@ public class DNPMHelper implements IProcedureAnalyzer {
}
public Object getEmpfehlung(final Map<String, Object> input) {
// Auslesen der Parameter aus 'input'
int ProcedureID = (int) input.get("ProcedureID");
var procedureID = input.get("ProcedureID");
if (null == procedureID || Integer.parseInt(procedureID.toString()) == 0) {
logger.error("Kein Parameter 'ProcedureID' angegeben, gebe 'null' zurück");
return null;
}
String sql;
try {
SessionFactory sessionFactory = onkostarApi.getSessionFactory();
Session session = sessionFactory.getCurrentSession();
try {
sql = "SELECT * FROM prozedur "
+ "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id "
+ "WHERE prozedur.hauptprozedur_id = " + ProcedureID + " AND prozedur.geloescht = 0 AND prozedur.data_form_id = 489 "
+ "ORDER BY beginndatum";
var sql = "SELECT * FROM prozedur "
+ "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id "
// TODO data_form_id immer 489?
+ "WHERE prozedur.hauptprozedur_id = " + Integer.parseInt(procedureID.toString()) + " AND prozedur.geloescht = 0 AND prozedur.data_form_id = 489 "
+ "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);
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<String[]> rows = query.list();
return rows;
} catch (Exception e) {
return null;
}
@SuppressWarnings("unchecked")
List<String[]> rows = query.list();
return rows;
} catch (Exception e) {
logger.error("Fehler bei Abfrage von Empfehlungen", e);
return null;
}
}

View File

@ -17,7 +17,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
@ExtendWith(MockitoExtension.class)
public class DNPMHelperTest {
class DNPMHelperTest {
private SystemtherapieService systemtherapieService;
@ -42,10 +42,17 @@ public class DNPMHelperTest {
}
@Test
void testShouldReturnNullIfNoDiagnoseId() {
void testShouldReturnNullIfNoDiagnoseIdCallingGetSystemischeTherapienFromDiagnose() {
var actual = dnpmHelper.getSystemischeTherapienFromDiagnose(new HashMap<>());
assertThat(actual).isNull();
}
@Test
void testShouldReturnNullIfNoProcedureIdCallingGetEmpfehlung() {
var actual = dnpmHelper.getEmpfehlung(new HashMap<>());
assertThat(actual).isNull();
}
}