From a8768b83b0e33b7ce65c9d51127dd868261be1b4 Mon Sep 17 00:00:00 2001 From: Nils Dittberner Date: Wed, 25 Nov 2015 11:31:02 +0100 Subject: [PATCH 1/4] Schreibe ACK with AR to Database. --- src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java index 11cf843..9b4cf9d 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Receiver.java @@ -70,7 +70,14 @@ public class HL7Receiver implements ReceivingApplicat private Message generateACKWithAR(Message message, String s) throws HL7Exception { try { - return message.generateACK(AcknowledgmentCode.AR, new HL7Exception(s, ErrorCode.UNKNOWN_KEY_IDENTIFIER)); + Message returnMessage = message.generateACK(AcknowledgmentCode.AR, new HL7Exception(s, ErrorCode.UNKNOWN_KEY_IDENTIFIER)); + HL7LogEntry entry = new HL7LogEntry(); + entry.setMessage(returnMessage.encode()); + entry.setSource("127.0.0.1:1234"); // TODO: Naja... + entry.setTimestamp(LocalDateTime.now()); + entry.setDirection(HL7LogEntry.Direction.OUT); + HL7Utils.logHL7MessageToDatabase(entry); + return returnMessage; } catch (IOException e) { throw new HL7Exception(e); } From 4f5ce62d60b046d800256676f7a217cb710f762e Mon Sep 17 00:00:00 2001 From: taschi Date: Wed, 25 Nov 2015 11:31:06 +0100 Subject: [PATCH 2/4] javadox of hl7 sender --- src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java | 2 ++ 1 file changed, 2 insertions(+) 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 9fdaa5d..1a317aa 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java @@ -23,7 +23,9 @@ import java.util.Date; import java.util.List; /** + * Manages all HL7 sending tasks. This includes: creating a message, sending the message, * Created by taschi on 22.11.15. + * */ public class HL7Sender { From 077b5575b517b6b081f2b305ae63fd636a9598b4 Mon Sep 17 00:00:00 2001 From: taschi Date: Wed, 25 Nov 2015 11:32:31 +0100 Subject: [PATCH 3/4] javadox of hl7 sender --- src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 1a317aa..b8f4f34 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java @@ -34,7 +34,7 @@ public class HL7Sender { * * * @param fall to create the message from this content. patient and diagnosis are linked to fall - * @throws Exception + * @throws HL7Exception, IOException, SQLException */ public static void createMessageADT_A01(Fall fall) throws HL7Exception, IOException, SQLException { Patient patient = fall.getPatient(); @@ -95,7 +95,7 @@ public class HL7Sender { /** * Sending message handler. Calls function to send current message - * @param message + * @param message to send * @throws HL7Exception */ private static void sendMessage(Message message) throws HL7Exception { From f041ac1b1aa2f2019d48ce5b77ca7a8c5add0752 Mon Sep 17 00:00:00 2001 From: taschi Date: Wed, 25 Nov 2015 11:33:20 +0100 Subject: [PATCH 4/4] no warnings for hl7 sender --- src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 b8f4f34..c7f06be 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/hapi/HL7Sender.java @@ -128,7 +128,7 @@ public class HL7Sender { HL7LogEntry responseEntry = new HL7LogEntry(); messageEntry.setMessage(message.encode()); - messageEntry.setSource("127.0.0.1:1234"); // TODO: Kann man den lokal genutzen Port raus finden? + messageEntry.setSource("127.0.0.1:1234"); messageEntry.setDirection(HL7LogEntry.Direction.OUT); messageEntry.setTimestamp(LocalDateTime.now()); messageEntry.setTimestamp(HL7Utils.parseLocalDateTime(adt_a01.getMSH().getDateTimeOfMessage().getTime()));