diff --git a/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php b/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php
index 024df2e..5c9f024 100644
--- a/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php
+++ b/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php
@@ -79,7 +79,7 @@ class CreatePatientRegTables extends Migration {
       'Ethnic'    => ['type' => 'INT', 'constraint' => 11, 'null' => true],
       'Citizenship'   => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
       'DeathIndicator'=> ['type' => 'INT', 'constraint' => 11, 'null' => true],
-      'DeathDateTime' => ['type' => 'DATETIME', 'null' => true],
+      'TimeOfDeath' => ['type' => 'DATETIME', 'null' => true],
       'LinkTo' => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
       'CreateDate' => ['type' => 'DATETIME', 'null' => true],
       'DelDate' => ['type' => 'DATETIME', 'null' => true]
diff --git a/app/Models/PatVisit/PatVisitModel.php b/app/Models/PatVisit/PatVisitModel.php
index 1aa1b8c..9e9a95c 100644
--- a/app/Models/PatVisit/PatVisitModel.php
+++ b/app/Models/PatVisit/PatVisitModel.php
@@ -26,10 +26,10 @@ class PatVisitModel extends BaseModel {
 
 	public function showByPatient($InternalPID) {
 		$rows = $this
-			//->join('patdiag pd', 'pd.InternalPVID=patvisit.InternalPVID', 'left')
-			//->join('patvisitadt pva', 'pd.InternalPVID=pva.InternalPVID', 'left')
-			//->join('location l', 'l.LocationID=pva.LocationID', 'left')
-			->where('InternalPID',$InternalPID)->findAll();
+			->join('patdiag pd', 'pd.InternalPVID=patvisit.InternalPVID', 'left')
+			->join('patvisitadt pva', 'pd.InternalPVID=pva.InternalPVID', 'left')
+			->join('location l', 'l.LocationID=pva.LocationID', 'left')
+			->where('patvisit.InternalPID',$InternalPID)->findAll();
 		return $rows;
 	}
 
diff --git a/app/Models/Patient/PatientModel.php b/app/Models/Patient/PatientModel.php
index a60cddf..98740bb 100644
--- a/app/Models/Patient/PatientModel.php
+++ b/app/Models/Patient/PatientModel.php
@@ -14,7 +14,7 @@ class PatientModel extends BaseModel {
   protected $primaryKey = 'InternalPID';
   protected $allowedFields = ['PatientID', 'AlternatePID', 'Prefix', 'NameFirst', 'NameMiddle', 'NameMaiden', 'NameLast', 'Suffix', 'NameAlias', 'Gender', 'Birthdate', 'PlaceOfBirth', 'Street_1', 'Street_2', 'Street_3', 
     'City', 'Province', 'ZIP', 'EmailAddress1', 'EmailAddress2', 'Phone', 'MobilePhone', 'Custodian', 'AccountNumber', 'Country', 'Race', 'MaritalStatus', 'Religion', 'Ethnic', 'Citizenship', 
-    'DeathIndicator', 'DeathDateTime', 'LinkTo', 'CreateDate', 'DelDate' ]; 
+    'DeathIndicator', 'TimeOfDeath', 'LinkTo', 'CreateDate', 'DelDate' ]; 
     
   protected $useTimestamps = true;
   protected $createdField = 'CreateDate';
@@ -215,8 +215,8 @@ class PatientModel extends BaseModel {
   }
 
   private function transformPatientData(array $patient): array {
-    $patient["Age"] = $this->calculateAgeFromBirthdate($patient["Birthdate"], $patient["DeathDateTime"]);
-    $patient["DeathDateTime"] = $this->formattedDate($patient["DeathDateTime"]);
+    $patient["Age"] = $this->calculateAgeFromBirthdate($patient["Birthdate"], $patient["TimeOfDeath"]);
+    $patient["TimeOfDeath"] = $this->formattedDate($patient["TimeOfDeath"]);
     $patient["CreateDate"] = $this->formattedDate($patient["CreateDate"]);
     $patient["BirthdateConversion"] = $this->formatedDateForDisplay($patient["Birthdate"]);
     $patient["LinkTo"]    = $this->getLinkedPatients($patient['LinkTo']);