From 0acf9850659d7e5bb99fb26b99357f374d75e20f Mon Sep 17 00:00:00 2001
From: mahdahar <89adham@gmail.com>
Date: Tue, 21 Oct 2025 09:28:30 +0700
Subject: [PATCH] fix deathdate -> deathdatetime

---
 app/Database/Migrations/2025-09-02-070826_Patient_Reg.php | 4 ++--
 app/Models/Patient/PatientModel.php                       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

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 1d50415..024df2e 100644
--- a/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php
+++ b/app/Database/Migrations/2025-09-02-070826_Patient_Reg.php
@@ -79,14 +79,14 @@ 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],
-      'DeathDate' => ['type' => 'DATETIME', 'null' => true],
+      'DeathDateTime' => ['type' => 'DATETIME', 'null' => true],
       'LinkTo' => ['type' => 'VARCHAR', 'constraint' => 255, 'null' => true],
       'CreateDate' => ['type' => 'DATETIME', 'null' => true],
       'DelDate' => ['type' => 'DATETIME', 'null' => true]
     ]);
     $this->forge->addKey('InternalPID', true);
     $this->forge->addUniqueKey('PatientID');
-    $this->forge->addUniqueKey('AlternatePID');
+    $this->forge->addUniqueKey('AlternatePID'); 
     $this->forge->addUniqueKey('EmailAddress1');
     $this->forge->createTable('patient');
 
diff --git a/app/Models/Patient/PatientModel.php b/app/Models/Patient/PatientModel.php
index 491877b..31cbffa 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', 'DeathDate', 'LinkTo', 'CreateDate', 'DelDate' ]; 
+    'DeathIndicator', 'DeathDateTime', '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["DeathDate"]);
-    $patient["DeathDate"] = $this->formattedDate($patient["DeathDate"]);
+    $patient["Age"] = $this->calculateAgeFromBirthdate($patient["Birthdate"], $patient["DeathDateTime"]);
+    $patient["DeathDateTime"] = $this->formattedDate($patient["DeathDateTime"]);
     $patient["CreateDate"] = $this->formattedDate($patient["CreateDate"]);
     $patient["BirthdateConversion"] = $this->formatedDateForDisplay($patient["Birthdate"]);
     $patient["LinkTo"]    = $this->getLinkedPatients($patient['LinkTo']);