diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
index 89cb492..a0b2708 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -2,10 +2,7 @@ package de.uniluebeck.mi.projmi6.db;
 
 import de.uniluebeck.mi.projmi6.model.*;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
+import java.sql.*;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.StringJoiner;
@@ -20,12 +17,16 @@ public class DBHandler {
     private static final String UPDATE_PATIENT = "UPDATE `patient` SET `CAVE`=?, `Familienstand`=?, " +
             "`Geburtsdatum`=?, `Geburtsname`=?, `Geschlecht`=?, `KassenID`=?, `LetzterBearbeiter`=?, `Nachname`=?, " +
             "`Ort`=?, `PLZ`=?, `Strasse`=?, `Telefon`=?, `Versichertennummer`=?, `Vorname`=? WHERE `ID`=?";
+    private static final String INSERT_PATIENT = "INSERT INTO `patient` (`CAVE`, `Ersteller`, `Familienstand`, " +
+            "`Geburtdatum`, `Geburtsname`,`Geschlecht`, `Hausnummer`, `KassenID`, `LetzterBearbeiter`, `Nachname`, " +
+            "`Ort`, `PLZ`, `Strasse`, `Telefon`,`Versichertennummer`, `Vorname`) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, " +
+            "?, ?, ?, ?, ?, ?, ?, ?, ?)";
     private static final String SELECT_ALL_STATIONEN = "SELECT * FROM `stammstation`";
     private static final String SELECT_FAELLE_BY_PATID = "SELECT * FROM `fall` WHERE `patientid` = ?";
     private static final String SELECT_DIAGNOSE_BY_ID = "SELECT * FROM `diagnose` WHERE `diagid` = ?";
     private static final String SELECT_ALL_ICD10CODES = "SELECT * FROM `stammicd10`";
     private static final String SELECT_ALL_OPSCODES = "SELECT * FROM `stammops`";
-    private static final String SELECT_ICD10CODE_BY_ID = "SELECT * FROM `stammicd10` WHERE `icd10code` = '?' AND `version` = ?";
+    private static final String SELECT_ICD10CODE_BY_ID = "SELECT * FROM `stammicd10` WHERE `icd10code` = ? AND `version` = ?";
     private static final String SELECT_OPSCODE_BY_ID = "SELECT * FROM `stammops` WHERE `opscode` = ? AND `version` = ?";
     private static final String SELECT_ALL_MITARBEITER = "SELECT * FROM `mitarbeiter`";
     private static final String SELECT_UNTERS_BY_FALLID = "SELECT * FROM `untersuchung` WHERE `fallid` = ?";
@@ -73,6 +74,7 @@ public class DBHandler {
         return patient;
     }
 
+    // TODO: Defaultwerte entfernen und so.
     public static void updatePatient(Patient patient, int mitarbid) throws SQLException {
         PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(UPDATE_PATIENT);
         statement.setString(1, patient.getCave());                                  // CAVE
@@ -80,13 +82,14 @@ public class DBHandler {
             statement.setString(2, patient.getFamilienstand().toString());          // Familienstand
         else
             statement.setString(2, "l");
-        statement.setString(3, "");                                                 // Geburtsdatum
+        statement.setDate(3, Date.valueOf(patient.getGeburtsdatum()));                                                 // Geburtsdatum
         statement.setString(4, patient.getGeburtsname());                           // Geburtsname
         if (patient.getGeschlecht() != null)
             statement.setString(5, String.valueOf(patient.getGeschlecht().id()));   // Geschlecht
         else
             statement.setString(5, "o");
-        statement.setInt(6, patient.getKassenID());                                 // KasseId
+        // statement.setInt(6, patient.getKassenID());                                 // KasseId
+        statement.setInt(6, 1);                                 // KasseId
         statement.setInt(7, mitarbid);                                              // Letzterbearbeiter
         statement.setString(8, patient.getNachname());                              // Nachname
         statement.setString(9, patient.getOrt());                                   // Ort
@@ -98,10 +101,13 @@ public class DBHandler {
         statement.setInt(15, patient.getPatID());                                   // patid
 
         System.out.println(statement.toString());
-        System.exit(0);
 
         statement.executeUpdate();
+    }
 
+    public static void insertPatient(Patient patient, int mitarbid) throws SQLException {
+        PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(INSERT_PATIENT);
+        // TODO
     }
 
     public static List<Station> getAllStationen() throws SQLException {
@@ -162,6 +168,7 @@ public class DBHandler {
 
     private static Diagnose getDiagnose(int id) throws SQLException {
         PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(SELECT_DIAGNOSE_BY_ID);
+        statement.setInt(1, id);
         ResultSet rs = statement.executeQuery();
 
         rs.next(); // TODO