Merge branch 'master' of gogs.dittberner.it:nils/projmi

src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java

@@ -108,7 +108,7 @@ public class DBHandler {
     private static final String SELECT_DIAGNOSE_BY_FALLID = "SELECT * FROM `diagnose` WHERE `fallid` = ?";
     private static final String SELECT_ALL_KASSEN = "SELECT * FROM `kasse`";
     private static final String SELECT_KASSE_BY_KASSENID = "SELECT * FROM `kasse` WHERE `kasse`.`KassenID` = ?";
-    private static final String SELECT_STATHIST_BY_STATION = "SELECT * FROM `stationshistorie` WHERE `stationshistorie`.`Station` = ?";
+    private static final String SELECT_STATHIST_BY_FALLID = "SELECT * FROM `stationshistorie` WHERE `stationshistorie`.`fallid` = ?";
     private static final String SELECT_STATUBERITEMS_BY_STATION = "SELECT p.id AS patid," +
             "concat(p.nachname, ', ', p.vorname) AS patname," +
             "p.geburtsdatum AS dob," +
@@ -292,9 +292,9 @@ public class DBHandler {
         return item;
     }
 
-    public static List<StationsHistorie> getStationsHistorieByStation(String station) throws SQLException {
-        PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(SELECT_STATHIST_BY_STATION);
-        statement.setString(1, station);
+    public static List<StationsHistorie> getStationsHistorieByFall(Fall fall) throws SQLException {
+        PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(SELECT_STATHIST_BY_FALLID);
+        statement.setInt(1, fall.getFallID());
         ResultSet rs = statement.executeQuery();
 
         List<StationsHistorie> historie = new ArrayList<>();