diff --git a/db/nursingHome.db b/db/nursingHome.db
index beb720f..8ef2588 100644
Binary files a/db/nursingHome.db and b/db/nursingHome.db differ
diff --git a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
index df8b368..fb88dcd 100644
--- a/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/AllTreatmentController.java
@@ -20,6 +20,7 @@ import javafx.stage.Stage;
 
 import java.io.IOException;
 import java.sql.SQLException;
+import java.time.LocalDate;
 import java.util.ArrayList;
 
 /**
@@ -109,6 +110,7 @@ public class AllTreatmentController {
                 );
 
         this.createComboBoxData();
+
     }
 
     /**
@@ -258,18 +260,6 @@ public class AllTreatmentController {
         }
     }
 
-    @FXML
-    public void handleDelete() {
-        int index = this.tableView.getSelectionModel().getSelectedIndex();
-        Treatment t = this.treatments.remove(index);
-        TreatmentDao dao = DaoFactory.getInstance().createTreatmentDao();
-        try {
-            dao.delete(t.getId());
-        } catch (SQLException exception) {
-            exception.printStackTrace();
-        }
-    }
-
     @FXML
     public void handleNewTreatment() {
         String selectedPatient = this.comboBoxPatientSelection.getSelectionModel().getSelectedItem();
@@ -333,4 +323,5 @@ public class AllTreatmentController {
         readAllAndShowInTableView();
     }
 
+
 }
diff --git a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
index 3594afd..cec5a76 100644
--- a/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
+++ b/src/main/java/de/hitec/nhplus/treatment/LockedTreatmentController.java
@@ -51,6 +51,7 @@ public class LockedTreatmentController {
      * that is called after the binding of all the fields.
      */
     public void initialize() {
+        handleDelete();
         this.readAllAndShowInTableView();
 
         this.columnId.setCellValueFactory(new PropertyValueFactory<>("id"));
@@ -101,11 +102,27 @@ public class LockedTreatmentController {
         readAllAndShowInTableView();
     }
 
+    @FXML
+    public void handleDelete() {
+        Treatment selecteditem;
+        LocalDate today = LocalDate.now();//Ändern!!!!!
+        LocalDate deleteDate;
+
+        for (int i = 0; i < treatments.size(); i++) {
+            selecteditem = treatments.get(i);
+            deleteDate = selecteditem.calculateDeleteDate();
+            if (today.isEqual(deleteDate) || today.isBefore(deleteDate)) {
+                try {
+                    treatmentDao.delete(selecteditem.getId());
+                    System.out.println("Wird gelöscht");
+                } catch (SQLException exception) {
+                    exception.printStackTrace();
+                }
+            }
+
+        }
+
+    }
+
 
 }
-
-
-/*
-Button zum entsperren
-Column fürs Datum, wann es gesperrt wird, ID(zum später löschen)
- */
\ No newline at end of file