From bb7214e8ffe6911037a045938a5e18057f45972e Mon Sep 17 00:00:00 2001 From: Natascha Koch Date: Thu, 12 Nov 2015 18:04:04 +0100 Subject: [PATCH] Diagnose Klasse mit Enum Diagnose Art --- .../de/uniluebeck/mi/projmi6/model/DiagArt.java | 20 ++++++++++ .../de/uniluebeck/mi/projmi6/model/Diagnose.java | 44 ++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt.java diff --git a/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt.java b/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt.java new file mode 100644 index 0000000..0cd1a68 --- /dev/null +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/DiagArt.java @@ -0,0 +1,20 @@ +package de.uniluebeck.mi.projmi6.model; + +/** + * Created by 627933 on 12.11.15. + */ +public enum DiagArt { + + VERDACHT(1,"Verdacht"), + EINWEISUNG(2,"Einweisung"), + OPDIAG(3, "OP-Diag"), + ENTLASSUNG(4,"Entlassung"); + + private final int id; + private final String diagArt; + + DiagArt(int id, String diagArt) { + this.id = id; + this.diagArt = diagArt; + } +} 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 a56bfc4..9848339 100644 --- a/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java +++ b/src/main/java/de/uniluebeck/mi/projmi6/model/Diagnose.java @@ -1,7 +1,51 @@ package de.uniluebeck.mi.projmi6.model; +import javafx.beans.property.SimpleStringProperty; + /** * Created by 627933 on 12.11.15. */ public class Diagnose { + private Fall fall; + //ICDCODE + private Mitarbeiter arzt; + private SimpleStringProperty freiText = new SimpleStringProperty(this, "freiText"); + private Enum diagArt; + + + public Fall getFall() { + return fall; + } + + public void setFall(Fall fall) { + this.fall = fall; + } + + public Mitarbeiter getArzt() { + return arzt; + } + + public void setArzt(Mitarbeiter arzt) { + this.arzt = arzt; + } + + public String getFreiText() { + return freiText.get(); + } + + public SimpleStringProperty freiTextProperty() { + return freiText; + } + + public void setFreiText(String freiText) { + this.freiText.set(freiText); + } + + public Enum getDiagArt() { + return diagArt; + } + + public void setDiagArt(Enum diagArt) { + this.diagArt = diagArt; + } }