From 522b0e150b725cbc24b29f39444c8b64d8336bf3 Mon Sep 17 00:00:00 2001
From: Ileana Krontsi <ileanakoralia.krontsi@student.uni-luebeck.de>
Date: Sun, 15 Nov 2015 16:18:06 +0100
Subject: [PATCH] DiagnoseController bearbeitet.

---
 .../mi/projmi6/controller/DiagnoseController.java         |  8 ++++----
 .../java/de/uniluebeck/mi/projmi6/model/Diagnose.java     | 15 ++++++++++++---
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
index 3500100..8733262 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/controller/DiagnoseController.java
@@ -96,11 +96,11 @@ public class DiagnoseController {
     }
 
     private void copyDiagnoseDataIntoFields(){
-        diagDiagnoseArzt.setText(diagnose.getArzt());
+        diagDiagnoseArzt.setE(diagnose.getArzt());
 
         diagFreitext.setText(diagnose.getFreitext());
         diagDiagnoseArt.setValue(diagnose.getDiagArt());
-        diagDiagnose.setValue()
+        diagDiagnose.setValue(diagnose.getIcd10Code());
 
         diagCreator.setText(Integer.toString(diagnose.getErsteller()));
         diagCreateTime.setText(diagnose.getErstellDatumZeit().toString());
@@ -112,8 +112,8 @@ public class DiagnoseController {
     private void copyFieldDataIntoDiagnose(Diagnose diagnose){
 
         diagnose.setArzt(diagDiagnoseArzt.getValue());
-        diagnose.freiTextProperty(diagFreitext.getText());
-        diagnose.getDiagArt(diagDiagnoseArt.getValue());
+        diagnose.setFreiText(diagFreitext.getText());
+        diagnose.setDiagArt(diagDiagnoseArt.getValue());
     }
 
     private void clearFields(){
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 b88c6d4..4917f12 100644
--- a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java
+++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java
@@ -8,9 +8,10 @@ import javafx.beans.property.SimpleStringProperty;
 public class Diagnose extends Version {
     private Fall fall;
     //ICDCODE
+    private Icd10Code icd10code;
     private Mitarbeiter arzt;
     private SimpleStringProperty freiText = new SimpleStringProperty(this, "freiText");
-    private Enum<DiagArt> diagArt;
+    private DiagArt diagArt;
 
 
     public Fall getFall() {
@@ -41,11 +42,19 @@ public class Diagnose extends Version {
         this.freiText.set(freiText);
     }
 
-    public Enum<DiagArt> getDiagArt() {
+    public DiagArt getDiagArt() {
         return diagArt;
     }
 
-    public void setDiagArt(Enum<DiagArt> diagArt) {
+    public void setDiagArt(DiagArt diagArt) {
         this.diagArt = diagArt;
     }
+
+    public Icd10Code getIcd10code() {
+        return icd10code;
+    }
+
+    public void setIcd10code(Icd10Code icd10code) {
+        this.icd10code = icd10code;
+    }
 }