From 7ecdf21be825a7c95f27a32d1ec0d2348c1c2312 Mon Sep 17 00:00:00 2001
From: Nils Dittberner <nils.dittberner@student.uni-luebeck.de>
Date: Sun, 15 Nov 2015 18:22:35 +0100
Subject: [PATCH] Fehler mit ResultSet.next() behoben.

---
 .../de/uniluebeck/mi/projmi6/db/DBHandler.java     | 44 ++++++++++++++--------
 1 file changed, 29 insertions(+), 15 deletions(-)

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 5e3fc05..89cb492 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -26,7 +26,7 @@ public class DBHandler {
     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_OPSCODE_BY_ID = "SELECT * FROM `stammops` WHERE `opscode` = '?' 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` = ?";
     private static final String SELECT_MITARBEITER_BY_ID = "SELECT * FROM `mitarbeiter` WHERE `mitarbid` = ?";
@@ -75,20 +75,30 @@ public class DBHandler {
 
     public static void updatePatient(Patient patient, int mitarbid) throws SQLException {
         PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(UPDATE_PATIENT);
-        statement.setString(1, patient.getCave());                                 // CAVE
-        statement.setString(2, patient.getFamilienstand().toString());             // Familienstand
-        statement.setString(3, "");                                                // Geburtsdatum
-        statement.setString(4, patient.getGeburtsname());                          // Geburtsname
-        statement.setString(5, String.valueOf(patient.getGeschlecht().id()));      // Geschlecht
-        statement.setInt(6, patient.getKassenID());                                // KasseId
-        statement.setInt(7, mitarbid);                                             // Letzterbearbeiter
-        statement.setString(8, patient.getNachname());                             // Nachname
-        statement.setString(9, patient.getOrt());                                  // Ort
-        statement.setString(10, patient.getPlz());                                 // PLZ
-        statement.setString(11, patient.getStrasse());                             // Strasse
-        statement.setString(12, patient.getTelefon());                             // telefon
-        statement.setString(13, patient.getVersichertennummer());                  // versichertennummer
-        statement.setString(14, patient.getVorname());                             // vorname
+        statement.setString(1, patient.getCave());                                  // CAVE
+        if (patient.getFamilienstand() != null)
+            statement.setString(2, patient.getFamilienstand().toString());          // Familienstand
+        else
+            statement.setString(2, "l");
+        statement.setString(3, "");                                                 // 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(7, mitarbid);                                              // Letzterbearbeiter
+        statement.setString(8, patient.getNachname());                              // Nachname
+        statement.setString(9, patient.getOrt());                                   // Ort
+        statement.setString(10, patient.getPlz());                                  // PLZ
+        statement.setString(11, patient.getStrasse());                              // Strasse
+        statement.setString(12, patient.getTelefon());                              // telefon
+        statement.setString(13, patient.getVersichertennummer());                   // versichertennummer
+        statement.setString(14, patient.getVorname());                              // vorname
+        statement.setInt(15, patient.getPatID());                                   // patid
+
+        System.out.println(statement.toString());
+        System.exit(0);
 
         statement.executeUpdate();
 
@@ -154,6 +164,7 @@ public class DBHandler {
         PreparedStatement statement = MySqlConnFactory.getConnection().prepareStatement(SELECT_DIAGNOSE_BY_ID);
         ResultSet rs = statement.executeQuery();
 
+        rs.next(); // TODO
         return getDiagnose(rs);
     }
 
@@ -196,6 +207,7 @@ public class DBHandler {
         statement.setInt(2, version);
         rs = statement.executeQuery();
 
+        rs.next(); // TODO
         return getIcd10Code(rs);
     }
 
@@ -226,6 +238,7 @@ public class DBHandler {
         statement.setInt(2, version);
         rs = statement.executeQuery();
 
+        rs.next(); // TODO
         return getOpsCode(rs);
     }
 
@@ -255,6 +268,7 @@ public class DBHandler {
         statement.setInt(1, id);
         rs = statement.executeQuery();
 
+        rs.next(); // TODO
         return getMitarbeiter(rs);
     }