mirror of
https://github.com/pcvolkmer/onkostar-plugin-dnpm.git
synced 2025-07-03 17:52:53 +00:00
Prüfung ob ProzedurID übergeben wurde hinzugefügt
This commit is contained in:
2
pom.xml
2
pom.xml
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>DNPMHelper</groupId>
|
<groupId>DNPMHelper</groupId>
|
||||||
<artifactId>DNPMHelper</artifactId>
|
<artifactId>DNPMHelper</artifactId>
|
||||||
<version>0.1.0</version>
|
<version>0.2.0-SNAPSHOT</version>
|
||||||
<name>DNPMHelper</name>
|
<name>DNPMHelper</name>
|
||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
|
@ -189,34 +189,35 @@ public class DNPMHelper implements IProcedureAnalyzer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public Object getEmpfehlung(final Map<String, Object> input) {
|
public Object getEmpfehlung(final Map<String, Object> input) {
|
||||||
// Auslesen der Parameter aus 'input'
|
var procedureID = input.get("ProcedureID");
|
||||||
int ProcedureID = (int) 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 {
|
try {
|
||||||
SessionFactory sessionFactory = onkostarApi.getSessionFactory();
|
SessionFactory sessionFactory = onkostarApi.getSessionFactory();
|
||||||
Session session = sessionFactory.getCurrentSession();
|
Session session = sessionFactory.getCurrentSession();
|
||||||
try {
|
var sql = "SELECT * FROM prozedur "
|
||||||
sql = "SELECT * FROM prozedur "
|
+ "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id "
|
||||||
+ "LEFT JOIN dk_mtb_einzelempfehlung em ON em.id = prozedur.id "
|
// TODO data_form_id immer 489?
|
||||||
+ "WHERE prozedur.hauptprozedur_id = " + ProcedureID + " AND prozedur.geloescht = 0 AND prozedur.data_form_id = 489 "
|
+ "WHERE prozedur.hauptprozedur_id = " + Integer.parseInt(procedureID.toString()) + " AND prozedur.geloescht = 0 AND prozedur.data_form_id = 489 "
|
||||||
+ "ORDER BY beginndatum";
|
+ "ORDER BY beginndatum";
|
||||||
|
|
||||||
SQLQuery query = session.createSQLQuery(sql)
|
SQLQuery query = session.createSQLQuery(sql)
|
||||||
.addScalar("id", StandardBasicTypes.STRING)
|
.addScalar("id", StandardBasicTypes.STRING)
|
||||||
.addScalar("genname", StandardBasicTypes.STRING)
|
.addScalar("genname", StandardBasicTypes.STRING)
|
||||||
.addScalar("geneid", StandardBasicTypes.STRING)
|
.addScalar("geneid", StandardBasicTypes.STRING)
|
||||||
.addScalar("geneidlink", StandardBasicTypes.STRING)
|
.addScalar("geneidlink", StandardBasicTypes.STRING)
|
||||||
.addScalar("empfehlung", StandardBasicTypes.STRING)
|
.addScalar("empfehlung", StandardBasicTypes.STRING)
|
||||||
.addScalar("beginndatum", StandardBasicTypes.STRING);
|
.addScalar("beginndatum", StandardBasicTypes.STRING);
|
||||||
|
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
List<String[]> rows = query.list();
|
List<String[]> rows = query.list();
|
||||||
return rows;
|
return rows;
|
||||||
} catch (Exception e) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
logger.error("Fehler bei Abfrage von Empfehlungen", e);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ import static org.mockito.Mockito.times;
|
|||||||
import static org.mockito.Mockito.verify;
|
import static org.mockito.Mockito.verify;
|
||||||
|
|
||||||
@ExtendWith(MockitoExtension.class)
|
@ExtendWith(MockitoExtension.class)
|
||||||
public class DNPMHelperTest {
|
class DNPMHelperTest {
|
||||||
|
|
||||||
private SystemtherapieService systemtherapieService;
|
private SystemtherapieService systemtherapieService;
|
||||||
|
|
||||||
@ -42,10 +42,17 @@ public class DNPMHelperTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
void testShouldReturnNullIfNoDiagnoseId() {
|
void testShouldReturnNullIfNoDiagnoseIdCallingGetSystemischeTherapienFromDiagnose() {
|
||||||
var actual = dnpmHelper.getSystemischeTherapienFromDiagnose(new HashMap<>());
|
var actual = dnpmHelper.getSystemischeTherapienFromDiagnose(new HashMap<>());
|
||||||
|
|
||||||
assertThat(actual).isNull();
|
assertThat(actual).isNull();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
void testShouldReturnNullIfNoProcedureIdCallingGetEmpfehlung() {
|
||||||
|
var actual = dnpmHelper.getEmpfehlung(new HashMap<>());
|
||||||
|
|
||||||
|
assertThat(actual).isNull();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user