diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php
index 0912999..6b5d9f8 100644
--- a/app/Controllers/Patient.php
+++ b/app/Controllers/Patient.php
@@ -215,7 +215,7 @@ class Patient extends Controller {
                 "Citizenship"    => ($input['Citizenship'] ?? '')      !== '' ? $input['Citizenship'] : null,
                 "DeathIndicator" => ($input['DeathIndicator'] ?? '')   !== '' ? (int)$input['DeathIndicator'] : null,
                 "DeathDateTime"  => ($input['DeathDateTime'] ?? '')    !== '' ? $input['DeathDateTime'] : null,
-                "Custodian"      => ($input['Custodian'] ?? '')        !== '' ? $input['Custodian'] : null,
+                "Custodian"      => ($input['Custodian'] ?? '')        !== '' ? (int)$input['Custodian'] : null,
                 "CreateDate"     => date('Y-m-d H:i:s'),
                 "DelDate"        => null,
                 "LinkTo"         => $LinkTo
@@ -390,7 +390,8 @@ class Patient extends Controller {
                 "Citizenship"    => ($input['Citizenship'] ?? null) === '' ? null : ($input['Citizenship'] ?? null),
                 "DeathIndicator" => ($input['DeathIndicator'] ?? null) === '' ? null : (isset($input['DeathIndicator']) ? (int)$input['DeathIndicator'] : null),
                 "DeathDateTime"  => ($input['DeathDateTime'] ?? null) === '' ? null : ($input['DeathDateTime'] ?? null),
-                "Custodian"      => ($input['Custodian'] ?? null) === '' ? null : ($input['Custodian'] ?? null),
+                // "Custodian"      => ($input['Custodian'] ?? null) === '' ? null : ($input['Custodian'] ?? null),
+                "Custodian"      => ($input['Custodian'] ?? null) === '' ? null : (isset($input['Custodian']) ? (int)$input['Custodian'] : null),
                 "LinkTo"         => $LinkTo,
             ];