diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php
index dd59e2e..95843f3 100644
--- a/app/Controllers/Patient.php
+++ b/app/Controllers/Patient.php
@@ -82,7 +82,17 @@ class Patient extends Controller {
             } else {
 
                 $patient["Age"] = $this->calculateAgeFromBirthdate($patient["Birthdate"]);
-                $patient["Birthdate"] = date("d-m-Y", strtotime($patient["Birthdate"]));
+                
+                $date = \DateTime::createFromFormat('Y-m-d H:i', $patient["Birthdate"]);
+                if ($date) {
+                    // Simpan versi format database
+                    $patient["Birthdate"] = $date->format('Y-m-d H:i');
+
+                    // Simpan versi format tampilan
+                    $patient["BirthdateConversion"] = $date->format('j M Y');
+                } else {
+                    $patient["BirthdateConversion"] = null; // Jika parsing gagal
+                }
                 
                 if ($patient['LinkTo'] != null) {
                     
@@ -249,7 +259,6 @@ class Patient extends Controller {
         }
     }
 
-
     // OK - Done
     // public function update($InternalPID = null) {