diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php
index 88025c7..0ad4bdf 100644
--- a/app/Controllers/Patient.php
+++ b/app/Controllers/Patient.php
@@ -77,7 +77,7 @@ class Patient extends Controller {
                 ->join('ethnic', 'ethnic.EthnicID = patient.EthnicID', 'left')
                 ->join('patcom', 'patcom.InternalPID = patient.InternalPID', 'left')
                 ->join('patidt', 'patidt.InternalPID = patient.InternalPID', 'left')
-                ->join('patatt', 'patatt.InternalPID = patient.InternalPID', 'left')
+                ->join('patatt', 'patatt.InternalPID = patient.InternalPID and patatt.DelDate is null', 'left')
                 ->where('patient.InternalPID', (int) $InternalPID)
                 ->get()
                 ->getResultArray();
@@ -427,7 +427,9 @@ class Patient extends Controller {
                 }
                 $this->db->table('patatt')->upsertBatch($dataPatatt);
                 $addresses = array_column($dataPatatt, 'Address');
-                $this->db->table('patatt')->where('InternalPID', $InternalPID)->WhereNotIn('Address', $addresses)->delete();
+                $this->db->table('patatt')->where('InternalPID', $InternalPID)->WhereNotIn('Address', $addresses)->update(['DelDate' => date('Y-m-d H:i:s')]);
+            } else {
+                $this->db->table('patatt')->where('InternalPID', $InternalPID)->update(['DelDate' => date('Y-m-d H:i:s')]);
             }
 
             if(!empty($dataPatcom['Comment'])) {