diff --git a/db/nursingHome.db b/db/nursingHome.db
index c3e0182..e05cb45 100644
Binary files a/db/nursingHome.db and b/db/nursingHome.db differ
diff --git a/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java b/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
index d179ad5..53484a5 100644
--- a/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
+++ b/src/main/java/de/hitec/nhplus/fixtures/Fixtures.java
@@ -1,6 +1,7 @@
 package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.datastorage.ConnectionBuilder;
+import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
 
 import java.sql.Connection;
@@ -28,15 +29,17 @@ public class Fixtures {
             patientFixture.setupTable(connection);
             Map<String, Patient> patientsByName = patientFixture.load();
 
-            TreatmentFixture treatmentFixture = new TreatmentFixture(patientsByName);
+            NurseFixture nurseFixture = new NurseFixture();
+            nurseFixture.dropTable(connection);
+            nurseFixture.setupTable(connection);
+            Map<String, Nurse> nursesByName = nurseFixture.load();
+
+
+            TreatmentFixture treatmentFixture = new TreatmentFixture(patientsByName, nursesByName);
             treatmentFixture.dropTable(connection);
             treatmentFixture.setupTable(connection);
             treatmentFixture.load();
 
-            NurseFixture nurseFixture = new NurseFixture();
-            nurseFixture.dropTable(connection);
-            nurseFixture.setupTable(connection);
-            nurseFixture.load();
 
             MedicationFixture medicationFixture = new MedicationFixture();
             medicationFixture.dropTable(connection);
diff --git a/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java b/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
index cd2b7dc..26edb8a 100644
--- a/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
+++ b/src/main/java/de/hitec/nhplus/fixtures/TreatmentFixture.java
@@ -2,6 +2,7 @@ package de.hitec.nhplus.fixtures;
 
 import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
+import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.treatment.Treatment;
 import de.hitec.nhplus.treatment.database.TreatmentDao;
@@ -17,9 +18,11 @@ import static de.hitec.nhplus.utils.DateConverter.convertStringToLocalTime;
 
 public class TreatmentFixture implements Fixture<Treatment> {
     private final Map<String, Patient> patientsByName;
+    private final Map<String, Nurse> nursesByName;
 
-    public TreatmentFixture(Map<String, Patient> patientsByName) {
+    public TreatmentFixture(Map<String, Patient> patientsByName, Map<String, Nurse> nursesByName) {
         this.patientsByName = patientsByName;
+        this.nursesByName = nursesByName;
     }
 
     @Override
@@ -45,9 +48,13 @@ public class TreatmentFixture implements Fixture<Treatment> {
         Patient ahmet = patientsByName.get("Ahmet");
         Patient elisabeth = patientsByName.get("Elisabeth");
 
+        Nurse ole = nursesByName.get("Ole");
+        Nurse armin = nursesByName.get("Armin");
+
         treatments.add(new Treatment(
                 1,
                 seppl,
+                ole,
                 convertStringToLocalDate("2023-06-03"),
                 convertStringToLocalTime("11:00"),
                 convertStringToLocalTime("15:00"),
@@ -59,6 +66,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 2,
                 seppl,
+                armin,
                 convertStringToLocalDate("2023-06-05"),
                 convertStringToLocalTime("11:00"),
                 convertStringToLocalTime("12:30"),
@@ -70,6 +78,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 3,
                 martina,
+                ole,
                 convertStringToLocalDate("2023-06-04"),
                 convertStringToLocalTime("07:30"),
                 convertStringToLocalTime("08:00"),
@@ -79,6 +88,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 4,
                 seppl,
+                armin,
                 convertStringToLocalDate("2023-06-06"),
                 convertStringToLocalTime("15:10"),
                 convertStringToLocalTime("16:00"),
@@ -88,6 +98,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 8,
                 seppl,
+                ole,
                 convertStringToLocalDate("2023-06-08"),
                 convertStringToLocalTime("15:00"),
                 convertStringToLocalTime("16:00"),
@@ -97,6 +108,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 9,
                 martina,
+                armin,
                 convertStringToLocalDate("2023-06-07"),
                 convertStringToLocalTime("11:00"),
                 convertStringToLocalTime("11:30"),
@@ -106,6 +118,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 12,
                 hans,
+                armin,
                 convertStringToLocalDate("2023-06-08"),
                 convertStringToLocalTime("15:00"),
                 convertStringToLocalTime("15:30"),
@@ -115,6 +128,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 14,
                 ahmet,
+                ole,
                 convertStringToLocalDate("2023-08-24"),
                 convertStringToLocalTime("09:30"),
                 convertStringToLocalTime("10:15"),
@@ -123,6 +137,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 16,
                 elisabeth,
+                armin,
                 convertStringToLocalDate("2023-08-31"),
                 convertStringToLocalTime("13:30"),
                 convertStringToLocalTime("13:45"),
@@ -132,6 +147,7 @@ public class TreatmentFixture implements Fixture<Treatment> {
         treatments.add(new Treatment(
                 17,
                 elisabeth,
+                ole,
                 convertStringToLocalDate("2023-09-01"),
                 convertStringToLocalTime("16:00"),
                 convertStringToLocalTime("17:00"),
diff --git a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
index c0f01c3..117b380 100644
--- a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
@@ -2,6 +2,8 @@ package de.hitec.nhplus.treatment;
 
 import de.hitec.nhplus.Main;
 import de.hitec.nhplus.datastorage.DaoFactory;
+import de.hitec.nhplus.nurse.Nurse;
+import de.hitec.nhplus.nurse.database.NurseDao;
 import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.patient.database.PatientDao;
 import de.hitec.nhplus.treatment.database.TreatmentDao;
@@ -31,6 +33,9 @@ public class AllTreatmentController {
     @FXML
     private TableColumn<Treatment, String> columnPatientName;
 
+    @FXML
+    private TableColumn<Treatment, String> columnNurseName;
+
     @FXML
     private TableColumn<Treatment, String> columnDate;
 
@@ -46,6 +51,9 @@ public class AllTreatmentController {
     @FXML
     private ComboBox<String> comboBoxPatientSelection;
 
+    @FXML
+    public ComboBox<String> comboBoxNurseSelection;
+
     @FXML
     private Button buttonDelete;
 
@@ -53,19 +61,29 @@ public class AllTreatmentController {
     private TreatmentDao dao;
     private final ObservableList<String> patientSelection = FXCollections.observableArrayList();
     private ArrayList<Patient> patientList;
+    private final ObservableList<String> nurseSelection = FXCollections.observableArrayList();
+    private ArrayList<Nurse> nurseList;
 
     public void initialize() {
         readAllAndShowInTableView();
         comboBoxPatientSelection.setItems(patientSelection);
-        comboBoxPatientSelection.getSelectionModel().select(0);
+        comboBoxPatientSelection.getSelectionModel().select("alle");
+
+        comboBoxNurseSelection.setItems(nurseSelection);
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
         this.columnPatientName.setCellValueFactory(
-                cellData ->  {
+                cellData -> {
                     Patient patient = cellData.getValue().getPatient();
                     return new SimpleStringProperty(patient.getSurName() + ", " + patient.getFirstName());
                 }
         );
+        this.columnNurseName.setCellValueFactory(
+                cellData -> {
+                    Nurse nurse = cellData.getValue().getNurse();
+                    return new SimpleStringProperty(nurse.getSurName() + ", " + nurse.getFirstName());
+                }
+        );
         this.columnDate.setCellValueFactory(new PropertyValueFactory<>("date"));
         this.columnBegin.setCellValueFactory(new PropertyValueFactory<>("begin"));
         this.columnEnd.setCellValueFactory(new PropertyValueFactory<>("end"));
@@ -84,7 +102,6 @@ public class AllTreatmentController {
     }
 
     public void readAllAndShowInTableView() {
-        comboBoxPatientSelection.getSelectionModel().select(0);
         this.dao = DaoFactory.getInstance().createTreatmentDao();
         try {
             this.treatments.setAll(dao.readAll());
@@ -94,13 +111,19 @@ public class AllTreatmentController {
     }
 
     private void createComboBoxData() {
-        PatientDao dao = DaoFactory.getInstance().createPatientDAO();
+        PatientDao patientDAO = DaoFactory.getInstance().createPatientDAO();
+        NurseDao nurseDao = DaoFactory.getInstance().createNurseDAO();
         try {
-            patientList = (ArrayList<Patient>) dao.readAll();
+            patientList = (ArrayList<Patient>) patientDAO.readAll();
             this.patientSelection.add("alle");
             for (Patient patient : patientList) {
                 this.patientSelection.add(patient.getSurName());
             }
+
+            nurseList = (ArrayList<Nurse>) nurseDao.readAll();
+            for (Nurse nurse : nurseList) {
+                this.nurseSelection.add(nurse.getSurName());
+            }
         } catch (SQLException exception) {
             exception.printStackTrace();
         }
@@ -108,7 +131,7 @@ public class AllTreatmentController {
 
 
     @FXML
-    public void handleComboBox() {
+    public void handleComboBoxPatient() {
         String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
         this.treatments.clear();
         this.dao = DaoFactory.getInstance().createTreatmentDao();
@@ -121,17 +144,17 @@ public class AllTreatmentController {
             }
         }
 
-        Patient patient = searchInList(selectedPatient);
+        Patient patient = searchInPatientList(selectedPatient);
         if (patient != null) {
             try {
-                this.treatments.setAll(this.dao.readTreatmentsByPid(patient.getId()));
+                this.treatments.setAll(this.dao.readTreatmentsByPatient(patient.getId()));
             } catch (SQLException exception) {
                 exception.printStackTrace();
             }
         }
     }
 
-    private Patient searchInList(String surname) {
+    private Patient searchInPatientList(String surname) {
         for (Patient patient : this.patientList) {
             if (patient.getSurName().equals(surname)) {
                 return patient;
@@ -140,6 +163,15 @@ public class AllTreatmentController {
         return null;
     }
 
+    private Nurse searchInNurseList(String surname) {
+        for (Nurse nurse : this.nurseList) {
+            if (nurse.getSurName().equals(surname)) {
+                return nurse;
+            }
+        }
+        return null;
+    }
+
     @FXML
     public void handleDelete() {
         int index = this.tableView.getSelectionModel().getSelectedIndex();
@@ -154,32 +186,47 @@ public class AllTreatmentController {
 
     @FXML
     public void handleNewTreatment() {
-        try {
-            String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
-            Patient patient = searchInList(selectedPatient);
-            newTreatmentWindow(patient);
-        } catch (NullPointerException exception) {
+        String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
+        Patient patient = searchInPatientList(selectedPatient);
+
+        if(patient == null) {
             Alert alert = new Alert(Alert.AlertType.INFORMATION);
             alert.setTitle("Information");
             alert.setHeaderText("Patient für die Behandlung fehlt!");
             alert.setContentText("Wählen Sie über die Combobox einen Patienten aus!");
             alert.showAndWait();
+            return;
         }
+
+        String selectedNurse = this.comboBoxNurseSelection.getSelectionModel().getSelectedItem();
+        Nurse nurse = searchInNurseList(selectedNurse);
+
+        if(nurse == null) {
+            Alert alert = new Alert(Alert.AlertType.INFORMATION);
+            alert.setTitle("Information");
+            alert.setHeaderText("Pfleger für die Behandlung fehlt!");
+            alert.setContentText("Wählen Sie über die Combobox einen Pfleger aus!");
+            alert.showAndWait();
+            return;
+        }
+
+        newTreatmentWindow(patient, nurse);
     }
 
     @FXML
     public void handleMouseClick() {
         tableView.setOnMouseClicked(event ->
         {
-            if (event.getClickCount() == 2 && (tableView.getSelectionModel().getSelectedItem() != null)) {
-                int index = this.tableView.getSelectionModel().getSelectedIndex();
-                Treatment treatment = this.treatments.get(index);
-                treatmentWindow(treatment);
+            if (event.getClickCount() != 2 || (tableView.getSelectionModel().getSelectedItem() == null)) {
+                return;
             }
+            int index = this.tableView.getSelectionModel().getSelectedIndex();
+            Treatment treatment = this.treatments.get(index);
+            treatmentWindow(treatment, treatment.getNurse());
         });
     }
 
-    public void newTreatmentWindow(Patient patient) {
+    public void newTreatmentWindow(Patient patient, Nurse nurse) {
         try {
             FXMLLoader loader = new FXMLLoader(
                     Main.class.getResource("/de/hitec/nhplus/treatment/TreatmentModal.fxml")
@@ -193,7 +240,8 @@ public class AllTreatmentController {
                     this,
                     stage,
                     null,
-                    patient
+                    patient,
+                    nurse
             );
 
             stage.setScene(scene);
@@ -206,7 +254,7 @@ public class AllTreatmentController {
         }
     }
 
-    public void treatmentWindow(Treatment treatment) {
+    public void treatmentWindow(Treatment treatment, Nurse nurse) {
         try {
             FXMLLoader loader = new FXMLLoader(
                     Main.class.getResource("/de/hitec/nhplus/treatment/TreatmentModal.fxml")
@@ -221,7 +269,8 @@ public class AllTreatmentController {
                     this,
                     stage,
                     treatment,
-                    pDao.read(treatment.getPatient().getId())
+                    pDao.read(treatment.getPatient().getId()),
+                    nurse
             );
 
             stage.setScene(scene);
diff --git a/src/main/java/de/hitec/nhplus/treatment/Treatment.java b/src/main/java/de/hitec/nhplus/treatment/Treatment.java
index 4551560..e369119 100644
--- a/src/main/java/de/hitec/nhplus/treatment/Treatment.java
+++ b/src/main/java/de/hitec/nhplus/treatment/Treatment.java
@@ -1,5 +1,6 @@
 package de.hitec.nhplus.treatment;
 
+import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -13,15 +14,17 @@ import java.util.StringJoiner;
 public class Treatment {
     private SimpleIntegerProperty id;
     private final SimpleObjectProperty<Patient> patient;
+    private final SimpleObjectProperty<Nurse> nurse;
     private final SimpleObjectProperty<LocalDate> date;
     private final SimpleObjectProperty<LocalTime> begin;
     private final SimpleObjectProperty<LocalTime> end;
     private final SimpleStringProperty description;
     private final SimpleStringProperty remarks;
 
-    public Treatment(Patient patient, LocalDate date, LocalTime begin,
+    public Treatment(Patient patient, Nurse nurse, LocalDate date, LocalTime begin,
                      LocalTime end, String description, String remarks) {
         this.patient = new SimpleObjectProperty<>(patient);
+        this.nurse = new SimpleObjectProperty<>(nurse);
         this.date = new SimpleObjectProperty<>(date);
         this.begin = new SimpleObjectProperty<>(begin);
         this.end = new SimpleObjectProperty<>(end);
@@ -29,10 +32,11 @@ public class Treatment {
         this.remarks = new SimpleStringProperty(remarks);
     }
 
-    public Treatment(int id, Patient patient, LocalDate date, LocalTime begin,
+    public Treatment(int id, Patient patient, Nurse nurse, LocalDate date, LocalTime begin,
                      LocalTime end, String description, String remarks) {
         this.id = new SimpleIntegerProperty(id);
         this.patient = new SimpleObjectProperty<>(patient);
+        this.nurse = new SimpleObjectProperty<>(nurse);
         this.date = new SimpleObjectProperty<>(date);
         this.begin = new SimpleObjectProperty<>(begin);
         this.end = new SimpleObjectProperty<>(end);
@@ -48,6 +52,10 @@ public class Treatment {
         return patient.getValue();
     }
 
+    public Nurse getNurse() {
+        return nurse.getValue();
+    }
+
     public String getDate() {
         return date.getValue().toString();
     }
@@ -88,6 +96,10 @@ public class Treatment {
         return patient;
     }
 
+    public SimpleObjectProperty<Nurse> nurseProperty() {
+        return nurse;
+    }
+
     public SimpleObjectProperty<LocalDate> dateProperty() {
         return date;
     }
@@ -117,6 +129,7 @@ public class Treatment {
                 .add("TREATMENT")
                 .add("ID: " + this.getId())
                 .add("Patient: " + this.getPatient().getSurName() + ", " + this.getPatient().getFirstName())
+                .add("Nurse: " + this.getNurse().getSurName() + ", " + this.getNurse().getFirstName())
                 .add("Date: " + this.getDate())
                 .add("Begin: " + this.getBegin())
                 .add("End: " + this.getEnd())
diff --git a/src/main/java/de/hitec/nhplus/treatment/TreatmentModalController.java b/src/main/java/de/hitec/nhplus/treatment/TreatmentModalController.java
index af788f0..9948d5c 100644
--- a/src/main/java/de/hitec/nhplus/treatment/TreatmentModalController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/TreatmentModalController.java
@@ -1,5 +1,6 @@
 package de.hitec.nhplus.treatment;
 
+import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.patient.Patient;
 import de.hitec.nhplus.utils.DateConverter;
 import javafx.beans.value.ChangeListener;
@@ -14,6 +15,8 @@ import java.time.LocalTime;
 import static de.hitec.nhplus.utils.Validator.*;
 
 public class TreatmentModalController {
+    @FXML
+    private Label labelNurseName;
     @FXML
     private Label labelFirstName;
     @FXML
@@ -33,18 +36,27 @@ public class TreatmentModalController {
     private AllTreatmentController controller;
     private Stage stage;
     private Patient patient;
+    private Nurse nurse;
     private Treatment treatment;
     private boolean isNewTreatment = false;
 
-    public void initialize(AllTreatmentController controller, Stage stage, Treatment treatment, Patient patient) {
+    public void initialize(
+            AllTreatmentController controller,
+            Stage stage,
+            Treatment treatment,
+            Patient patient,
+            Nurse nurse
+    ) {
         this.controller = controller;
         this.stage = stage;
         this.patient = patient;
+        this.nurse = nurse;
         if (treatment == null) {
             isNewTreatment = true;
             LocalTime currentTime = LocalTime.now();
             this.treatment = new Treatment(
                     patient,
+                    nurse,
                     LocalDate.now(),
                     LocalTime.of(currentTime.getHour(), currentTime.getMinute()),
                     LocalTime.of(currentTime.getHour(), currentTime.getMinute()),
@@ -60,16 +72,16 @@ public class TreatmentModalController {
         ChangeListener<String> inputNewTreatmentTextValidationListener = (observableValue, oldText, newText) ->
         {
             boolean isValid = isValidDate(this.datePicker.getValue())
-                    && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
-                    && isValidDescription(this.textFieldDescription.getText());
+                              && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
+                              && isValidDescription(this.textFieldDescription.getText());
 
             this.buttonSave.setDisable(!isValid);
         };
         ChangeListener<LocalDate> inputNewTreatmentDateValidationListener = (observableValue, localDate, t1) ->
         {
             boolean isValid = isValidDate(this.datePicker.getValue())
-                    && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
-                    && isValidDescription(this.textFieldDescription.getText());
+                              && isValidTimeRange(this.textFieldBegin.getText(), this.textFieldEnd.getText())
+                              && isValidDescription(this.textFieldDescription.getText());
 
             this.buttonSave.setDisable(!isValid);
         };
@@ -98,6 +110,7 @@ public class TreatmentModalController {
     }
 
     private void showData() {
+        this.labelNurseName.setText(nurse.getSurName());
         this.labelFirstName.setText(patient.getFirstName());
         this.labelSurName.setText(patient.getSurName());
         LocalDate date = DateConverter.convertStringToLocalDate(treatment.getDate());
diff --git a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java
index 51ccde3..1a67596 100644
--- a/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java
+++ b/src/main/java/de/hitec/nhplus/treatment/database/TreatmentDao.java
@@ -2,6 +2,7 @@ package de.hitec.nhplus.treatment.database;
 
 import de.hitec.nhplus.datastorage.DaoFactory;
 import de.hitec.nhplus.datastorage.DaoImp;
+import de.hitec.nhplus.nurse.Nurse;
 import de.hitec.nhplus.treatment.Treatment;
 import de.hitec.nhplus.utils.DateConverter;
 
@@ -22,16 +23,17 @@ public class TreatmentDao extends DaoImp<Treatment> {
     protected PreparedStatement getCreateStatement(Treatment treatment) throws SQLException {
         final String SQL = """
                     INSERT INTO treatment
-                    (patientId, date, begin, end, description, remark)
-                    VALUES (?, ?, ?, ?, ?, ?)
+                    (patientId, nurseId, date, begin, end, description, remark)
+                    VALUES (?, ?, ?, ?, ?, ?, ?)
                 """;
         PreparedStatement statement = this.connection.prepareStatement(SQL);
         statement.setInt(1, treatment.getPatient().getId());
-        statement.setString(2, treatment.getDate());
-        statement.setString(3, treatment.getBegin());
-        statement.setString(4, treatment.getEnd());
-        statement.setString(5, treatment.getDescription());
-        statement.setString(6, treatment.getRemarks());
+        statement.setInt(2, treatment.getNurse().getId());
+        statement.setString(3, treatment.getDate());
+        statement.setString(4, treatment.getBegin());
+        statement.setString(5, treatment.getEnd());
+        statement.setString(6, treatment.getDescription());
+        statement.setString(7, treatment.getRemarks());
         return statement;
     }
 
@@ -48,11 +50,12 @@ public class TreatmentDao extends DaoImp<Treatment> {
         return new Treatment(
                 result.getInt(1),
                 DaoFactory.getInstance().createPatientDAO().read(result.getInt(2)),
-                DateConverter.convertStringToLocalDate(result.getString(3)),
-                DateConverter.convertStringToLocalTime(result.getString(4)),
+                DaoFactory.getInstance().createNurseDAO().read(result.getInt(3)),
+                DateConverter.convertStringToLocalDate(result.getString(4)),
                 DateConverter.convertStringToLocalTime(result.getString(5)),
-                result.getString(6),
-                result.getString(7)
+                DateConverter.convertStringToLocalTime(result.getString(6)),
+                result.getString(7),
+                result.getString(8)
         );
     }
 
@@ -71,15 +74,19 @@ public class TreatmentDao extends DaoImp<Treatment> {
         return list;
     }
 
-    private PreparedStatement getReadAllTreatmentsOfOnePatientByPid(int patientId) throws SQLException {
+    public List<Treatment> readTreatmentsByPatient(int patientId) throws SQLException {
         final String SQL = "SELECT * FROM treatment WHERE patientId = ?";
         PreparedStatement statement = this.connection.prepareStatement(SQL);
         statement.setInt(1, patientId);
-        return statement;
+        ResultSet result = statement.executeQuery();
+        return getListFromResultSet(result);
     }
 
-    public List<Treatment> readTreatmentsByPid(int patientId) throws SQLException {
-        ResultSet result = getReadAllTreatmentsOfOnePatientByPid(patientId).executeQuery();
+    public List<Treatment> readTreatmentsByNurse(int nurseId) throws SQLException {
+        final String SQL = "SELECT * FROM treatment WHERE nurseId = ?";
+        PreparedStatement statement = this.connection.prepareStatement(SQL);
+        statement.setInt(1, nurseId);
+        ResultSet result = statement.executeQuery();
         return getListFromResultSet(result);
     }
 
@@ -87,7 +94,6 @@ public class TreatmentDao extends DaoImp<Treatment> {
     protected PreparedStatement getUpdateStatement(Treatment treatment) throws SQLException {
         final String SQL = """
                    UPDATE treatment SET
-                   patientId = ?,
                    date = ?,
                    begin = ?,
                    end = ?,
@@ -96,13 +102,12 @@ public class TreatmentDao extends DaoImp<Treatment> {
                    WHERE id = ?
                 """;
         PreparedStatement statement = this.connection.prepareStatement(SQL);
-        statement.setInt(1, treatment.getPatient().getId());
-        statement.setString(2, treatment.getDate());
-        statement.setString(3, treatment.getBegin());
-        statement.setString(4, treatment.getEnd());
-        statement.setString(5, treatment.getDescription());
-        statement.setString(6, treatment.getRemarks());
-        statement.setInt(7, treatment.getId());
+        statement.setString(1, treatment.getDate());
+        statement.setString(2, treatment.getBegin());
+        statement.setString(3, treatment.getEnd());
+        statement.setString(4, treatment.getDescription());
+        statement.setString(5, treatment.getRemarks());
+        statement.setInt(6, treatment.getId());
         return statement;
     }
 
diff --git a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
index 0a6d5d0..99d5301 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/AllTreatmentView.fxml
@@ -28,6 +28,11 @@
                         minWidth="80.0"
                         text="Patient"
                 />
+                <TableColumn
+                        fx:id="columnNurseName"
+                        minWidth="80.0"
+                        text="Pflegekraft"
+                />
                 <TableColumn
                         fx:id="columnDate"
                         maxWidth="-1.0"
@@ -66,7 +71,11 @@
                     <ComboBox
                             fx:id="comboBoxPatientSelection"
                             prefWidth="200.0"
-                            onAction="#handleComboBox"
+                            onAction="#handleComboBoxPatient"
+                    />
+                    <ComboBox
+                            fx:id="comboBoxNurseSelection"
+                            prefWidth="200.0"
                     />
                     <Button
                             mnemonicParsing="false"
diff --git a/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml b/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
index a9fc262..9c6d8ac 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
+++ b/src/main/resources/de/hitec/nhplus/treatment/TreatmentModal.fxml
@@ -30,21 +30,33 @@
             <Label
                     GridPane.rowIndex="0"
                     GridPane.columnIndex="0"
-                    text="Vorname:"
+                    text="Pfleger:"
             />
             <Label
                     GridPane.rowIndex="0"
                     GridPane.columnIndex="1"
                     prefWidth="200"
+                    fx:id="labelNurseName" text="Pfleger Name"
+            />
+            <!-- Row 1 -->
+            <Label
+                    GridPane.rowIndex="1"
+                    GridPane.columnIndex="0"
+                    text="Vorname:"
+            />
+            <Label
+                    GridPane.rowIndex="1"
+                    GridPane.columnIndex="1"
+                    prefWidth="200"
                     fx:id="labelFirstName" text="Vorname"
             />
             <Label
-                    GridPane.rowIndex="0"
+                    GridPane.rowIndex="1"
                     GridPane.columnIndex="3"
                     text="Nachname:"
             />
             <Label
-                    GridPane.rowIndex="0"
+                    GridPane.rowIndex="1"
                     GridPane.columnIndex="4"
                     prefWidth="200"
                     fx:id="labelSurName"
diff --git a/src/main/resources/de/hitec/nhplus/treatment/database/Treatment.sql b/src/main/resources/de/hitec/nhplus/treatment/database/Treatment.sql
index 0fdee0d..75b7af1 100644
--- a/src/main/resources/de/hitec/nhplus/treatment/database/Treatment.sql
+++ b/src/main/resources/de/hitec/nhplus/treatment/database/Treatment.sql
@@ -2,10 +2,12 @@ CREATE TABLE treatment
 (
     id          INTEGER PRIMARY KEY AUTOINCREMENT,
     patientId   INTEGER NOT NULL,
+    nurseId     INTEGER NOT NULL ,
     date        TEXT    NOT NULL,
     begin       TEXT    NOT NULL,
     end         TEXT    NOT NULL,
     description TEXT    NOT NULL,
     remark      TEXT    NOT NULL,
-    FOREIGN KEY (patientId) REFERENCES patient (id) ON DELETE CASCADE
+    FOREIGN KEY (patientId) REFERENCES patient (id) ON DELETE CASCADE,
+    FOREIGN KEY (nurseId) REFERENCES nurse (id) ON DELETE SET NULL
 )
\ No newline at end of file