diff --git a/include/akte.class.php b/include/akte.class.php
index 727afa29b..d63393cc2 100644
--- a/include/akte.class.php
+++ b/include/akte.class.php
@@ -43,6 +43,8 @@ class akte extends basis_db
 	public $uid;	
 	public $ext_id;
 	public $dms_id;
+    public $nachgereicht; 
+    public $anmerkung; 
 	
 	/**
 	 * Konstruktor
@@ -91,6 +93,8 @@ class akte extends basis_db
 				$this->insertvon = $row->insertvon;
 				$this->uid = $row->uid;
 				$this->dms_id = $row->dms_id;
+                $this->anmerkung = $row->anmerkung; 
+                $this->nachgereicht = $this->db_parse_bool($row->nachgereicht); 
 				return true;		
 			}
 			else 
@@ -173,7 +177,7 @@ class akte extends basis_db
 		{
 			//Neuen Datensatz anlegen	
 			$qry = "BEGIN;INSERT INTO public.tbl_akte (person_id, dokument_kurzbz, inhalt, mimetype, erstelltam, gedruckt, titel, 
-					bezeichnung, updateamum, updatevon, insertamum, insertvon, ext_id, uid, dms_id) VALUES (".
+					bezeichnung, updateamum, updatevon, insertamum, insertvon, ext_id, uid, dms_id, nachgereicht, anmerkung ) VALUES (".
 			       $this->db_add_param($this->person_id, FHC_INTEGER).', '.
 			       $this->db_add_param($this->dokument_kurzbz).', '.
 			       $this->db_add_param($this->inhalt).', '.
@@ -188,7 +192,9 @@ class akte extends basis_db
 			       $this->db_add_param($this->insertvon).', '.
 			       $this->db_add_param($this->ext_id).', '.
 			       $this->db_add_param($this->uid).','.
-			       $this->db_add_param($this->dms_id).');';
+                    $this->db_add_param($this->dms_id, FHC_INTEGER).','.
+                    $this->db_add_param($this->nachgereicht, FHC_BOOLEAN).','.
+			       $this->db_add_param($this->anmerkung).');';
 			       
 		}
 		else 
@@ -207,7 +213,9 @@ class akte extends basis_db
 				  " updatevon=".$this->db_add_param($this->updatevon).",".
 				  " ext_id=".$this->db_add_param($this->ext_id).",".
 				  " uid=".$this->db_add_param($this->uid).",".
-				  " dms_id=".$this->db_add_param($this->dms_id, FHC_INTEGER).
+                  " dms_id=".$this->db_add_param($this->dms_id, FHC_INTEGER).",".
+                  " nachgereicht=".$this->db_add_param($this->nachgereicht, FHC_BOOLEAN).",".
+				  " anmerkung=".$this->db_add_param($this->anmerkung).
 				  " WHERE akte_id=".$this->db_add_param($this->akte_id, FHC_INTEGER);
 		}
 		
@@ -259,7 +267,7 @@ class akte extends basis_db
 	{
 		$qry = "SELECT 
 					akte_id, person_id, dokument_kurzbz, mimetype, erstelltam, gedruckt, 
-					titel, bezeichnung, updateamum, insertamum, updatevon, insertvon, uid, dms_id
+					titel, bezeichnung, updateamum, insertamum, updatevon, insertvon, uid, dms_id, anmerkung, nachgereicht
 				FROM public.tbl_akte WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER);
 		if($dokument_kurzbz!=null)
 			$qry.=" AND dokument_kurzbz=".$this->db_add_param($dokument_kurzbz);
@@ -286,6 +294,8 @@ class akte extends basis_db
 				$akten->insertvon = $row->insertvon;
 				$akten->uid = $row->uid;
 				$akten->dms_id = $row->dms_id;
+                $akten->nachgereicht = $this->db_parse_bool($row->nachgereicht); 
+                $akten->anmerkung = $row->anmerkung; 
 				
 				$this->result[] = $akten;
 			}
@@ -336,6 +346,8 @@ class akte extends basis_db
 				$akten->insertvon = $row->insertvon;
 				$akten->uid = $row->uid;
 				$akten->dms_id = $row->dms_id;
+                $akten->nachgereicht = $this->db_parse_bool($row->nachgereicht); 
+                $akten->anmerkung = $row->anmerkung; 
 				
 				$this->result[] = $akten;
 			}
diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 8b673e03b..c2ec82359 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -49,7 +49,10 @@ class prestudent extends person
 	public $anmerkung;
 	public $ext_id_prestudent;
 	public $dual=false;
-	
+    public $zgvdoktor_code; 
+    public $zgvdoktorort; 
+    public $zgvdoktordatum; 
+    
 	public $status_kurzbz;
 	public $studiensemester_kurzbz;
 	public $ausbildungssemester;
@@ -123,6 +126,9 @@ class prestudent extends person
 				$this->ext_id_prestudent = $row->ext_id;
 				$this->dual = $this->db_parse_bool($row->dual);
 				$this->ausstellungsstaat = $row->ausstellungsstaat;
+                $this->zgvdoktor_code = $row->zgvdoktor_code; 
+                $this->zgvdoktorort = $row->zgvdoktorort; 
+                $this->zgvdoktordatum = $row->zgvdoktordatum; 
 				
 				if(!person::load($row->person_id))
 					return false;
@@ -949,7 +955,7 @@ class prestudent extends person
 			return false;
 		}
 		
-		$qry = "SELECT * FROM public.tbl_prestudent WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER);
+		$qry = "SELECT * FROM public.tbl_prestudent WHERE person_id=".$this->db_add_param($person_id, FHC_INTEGER)." ORDER BY prestudent_id";
 		
 		if($this->db_query($qry))
 		{
@@ -983,6 +989,9 @@ class prestudent extends person
 				$obj->ext_id_prestudent = $row->ext_id;
 				$obj->dual = $this->db_parse_bool($row->dual);
 				$obj->ausstellungsstaat = $row->ausstellungsstaat;
+                $obj->zgvdoktor_code = $row->zgvdoktor_code; 
+                $obj->zgvdoktorort = $row->zgvdoktorort; 
+                $obj->zgvdoktordatum = $row->zgvdoktordatum; 
 				
 				$this->result[] = $obj;
 			}
diff --git a/include/zgv.class.php b/include/zgv.class.php
index 43e83f945..8b06a62f7 100755
--- a/include/zgv.class.php
+++ b/include/zgv.class.php
@@ -32,6 +32,10 @@ class zgv extends basis_db
     public $zgvmas_bez; 
     public $zgvmas_kurzbz; 
     
+    public $zgvdoktor_code; 
+    public $zgvdoktor_bez; 
+    public $zgvdoktor_kurzbz; 
+    
     public $result = array(); 
     
     public function __construct($zgv_code=null)
@@ -127,5 +131,30 @@ class zgv extends basis_db
         }
     }
     
+    public function getAllDoktor()
+    {
+        $qry="SELECT * FROM bis.tbl_zgvdoktor;";
+        
+        if($result = $this->db_query($qry))
+        {
+            while($row= $this->db_fetch_object($result))
+            {
+                $zgv_doktor = new zgv(); 
+                
+                $zgv_doktor->zgvdoktor_code = $row->zgvdoktor_code;
+                $zgv_doktor->zgvdoktor_bez = $row->zgvdoktor_bez; 
+                $zgv_doktor->zgvdoktor_kurzbz = $row->zgvdoktor_kurzbz; 
+                
+                $this->result[] = $zgv_doktor; 
+            }
+            
+        }
+        else
+        {
+            $this->erromsg = "Fehler bei der Abfrage aufgetreten"; 
+            return false; 
+        }
+    }
+    
 }
 ?>