From d0f543ccdc4a41ac8f5237b07c81cf04f9c70d70 Mon Sep 17 00:00:00 2001
From: taschi <nata.koch@yahoo.de>
Date: Sun, 22 Nov 2015 20:08:45 +0100
Subject: [PATCH] fix nachrichten ohne Diagnosen schicken

---
 .../de/uniluebeck/mi/projmi6/db/DBHandler.java     |  6 ++++-
 .../mi/projmi6/db/MySqlConnectionFactory.java      |  4 ++--
 .../de/uniluebeck/mi/projmi6/hapi/HL7Sender.java   | 26 +++++++++++++---------
 3 files changed, 22 insertions(+), 14 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 ebd6e20..3474a6a 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java
@@ -841,8 +841,12 @@ public class DBHandler {
         ResultSet rs = statement.executeQuery();
 
         List<Diagnose> diagnosen = new ArrayList<>();
+        Diagnose diagnose;
         while (rs.next()) {
-            diagnosen.add(getDiagnose(rs.getInt("diagid"), fall));
+            diagnose = getDiagnose(rs.getInt("diagid"), fall);
+            if( diagnose != null) {
+                diagnosen.add ( diagnose );
+            }
         }
 
         return diagnosen;
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/db/MySqlConnectionFactory.java b/src/main/java/de/uniluebeck/mi/projmi6/db/MySqlConnectionFactory.java
index e680c1c..e0c8938 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/db/MySqlConnectionFactory.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/db/MySqlConnectionFactory.java
@@ -5,10 +5,10 @@ import java.sql.DriverManager;
 import java.sql.SQLException;
 
 /**
- * MySQL Connection Factory.
+ * MySQL Connection Factory.141.83.20.84
  */
 public class MySqlConnectionFactory {
-    public static final String URL = "jdbc:mysql://141.83.20.84:3306/pmiw15g06_v01";
+    public static final String URL = "jdbc:mysql://127.0.0.1:3306/pmiw15g06_v01";
     public static final String USER = "pmiw15g06";
     public static final String PASS = "AX3yQSYJSH43PrSz";
     public static final String DRIVER = "com.mysql.jdbc.Driver";
diff --git a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
index 9499c5c..9312744 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java
@@ -22,6 +22,7 @@ import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.nio.channels.Pipe;
 import java.sql.SQLException;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -79,22 +80,24 @@ public class HL7Sender {
 
         //Diagnosen
         List<Diagnose> diagnosen = getDiagnosenByFall(fall);
-        diagnosen.add(fall.getHauptDiagnose());
+        if(fall.getHauptDiagnose () != null) {
+            diagnosen.add ( fall.getHauptDiagnose () );
+        }
         PV1 pv1Segment = adt.getPV1();
         pv1Segment.getPv12_PatientClass().parse("U");
-        if (!diagnosen.isEmpty()) {
+        if(!diagnosen.isEmpty () ) {
             int i = 1;
             DG1 dg1Segment;
             for (Diagnose diagnose : diagnosen) {
-                dg1Segment = adt.getDG1(i - 1);
-                dg1Segment.getDg11_SetIDDG1().parse(String.valueOf(i));
-                dg1Segment.getDg13_DiagnosisCodeDG1().getIdentifier().parse(diagnose.getIcd10code().getCode());
-                // dg1Segment.getDg116_DiagnosingClinician ()[0].parse ( diagnose.getArzt ().getEinweisenderArzt () );
-                dg1Segment.getDg14_DiagnosisDescription().parse(diagnose.getFreiText());
-                dg1Segment.getDg16_DiagnosisType().parse(diagnose.getDiagArt().toString());
-                i++;
-                //Segment 2 Verschluesselung ?
-            }
+                System.out.println (diagnose);
+                    dg1Segment = adt.getDG1 ( i - 1 );
+                    dg1Segment.getDg11_SetIDDG1 ().parse ( String.valueOf ( i ) );
+                    dg1Segment.getDg13_DiagnosisCodeDG1 ().getIdentifier ().parse ( diagnose.getIcd10code ().getCode () );
+                    // dg1Segment.getDg116_DiagnosingClinician ()[0].parse ( diagnose.getArzt ().getEinweisenderArzt () );
+                    dg1Segment.getDg14_DiagnosisDescription ().parse ( diagnose.getFreiText () );
+                    dg1Segment.getDg16_DiagnosisType ().parse ( diagnose.getDiagArt ().toString () );
+                    i++;
+              }
         }
 
         sendMessage(adt);
@@ -138,6 +141,7 @@ public class HL7Sender {
             try {
                 while (!(response instanceof ACK)) {
                     response = initiator.sendAndReceive(adt);
+                    System.out.println ("Sende nachricht ...");
                     Thread.sleep(5000);
                 }
             } catch (HL7Exception | LLPException | IOException | InterruptedException e) {