From a39247aae626a09373b50647de690524f1591619 Mon Sep 17 00:00:00 2001 From: Nils Dittberner Date: Wed, 25 Nov 2015 23:01:35 +0100 Subject: [PATCH] Mitarbeiter ID in ein eigenes Feld in Diagnose schrieben. --- src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java | 6 ++++-- src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java | 9 +++++++++ 2 files changed, 13 insertions(+), 2 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 045014d..b54c8b2 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/db/DBHandler.java @@ -612,12 +612,14 @@ public class DBHandler { private static Diagnose getDiagnose(ResultSet rs) throws SQLException { Diagnose diagnose = new Diagnose(); + int mitarbid = rs.getInt("arzt"); diagnose.setDiagID(rs.getString("diagid")); diagnose.setFreiText(rs.getString("freitext")); - diagnose.setArzt(new Mitarbeiter(rs.getInt("arzt"))); + diagnose.setArzt(new Mitarbeiter(mitarbid)); + diagnose.setMitarbid(mitarbid); diagnose.setDiagArt(DiagArt.parseString(rs.getString("diagart"))); - setVersionInformation(diagnose, rs); diagnose.setIcd10code(getIcd10Code(rs.getString("icd10code"), rs.getInt("icd10version"))); + setVersionInformation(diagnose, rs); return diagnose; } diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java index 763df49..86df831 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java @@ -11,9 +11,18 @@ public class Diagnose extends Version { private String diagID; private Icd10Code icd10code; private Mitarbeiter arzt; + private int mitarbid; private SimpleStringProperty freiText = new SimpleStringProperty(this, "freiText"); private DiagArt diagArt; + public int getMitarbid() { + return mitarbid; + } + + public void setMitarbid(int mitarbid) { + this.mitarbid = mitarbid; + } + public String getDiagID() { return diagID; }