diff --git a/src/controllers/patient_guarantor.ts b/src/controllers/patient_guarantor.ts
index 405a026..654364c 100644
--- a/src/controllers/patient_guarantor.ts
+++ b/src/controllers/patient_guarantor.ts
@@ -193,7 +193,7 @@ export class PatientGuarantorController {
 
             const param: any = await schema.validateAsync(req.body);
 
-            if (param.is_default || param.is_default === true) {
+            if (param.is_default === true) {
                 await OrmHelper.DB.getRepository(PatientGuarantor)
                     .update({ is_default: true }, { is_default: false, updated_by: req.auth?.data.name });
             }
@@ -208,6 +208,8 @@ export class PatientGuarantorController {
             data.agreement_desc = param.agreement_desc;
             data.patient_group = param.patient_group_id;
             data.faretype = param.faretype;
+            data.is_default = param.is_default;
+            data.is_full_paid = param.is_full_paid;
             data.maximal_liability = param.maximalliability;
             data.created_by = req.auth?.data.name;
             data.updated_by = req.auth?.data.name;
@@ -273,28 +275,9 @@ export class PatientGuarantorController {
 
             const data = await repo.findOneBy({ id: param.id });
 
-            if (data != null) {
-                data.guarantor_name = param.guarantor_name;
-                data.phone = param.phone;
-                data.province = param.province;
-                data.city = param.city;
-                data.zip_code = param.zip_code;
-                data.agreement_no = param.agreement_no;
-                data.agreement_desc = param.agreement_desc;
-                data.patient_group = param.patient_group_id;
-                data.faretype = param.faretype;
-                data.maximal_liability = param.maximalliability;
-                data.created_by = req.auth?.data.name;
-                data.updated_by = req.auth?.data.name;
+            if (!data) return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
 
-                await repo.save(data);
-
-                return ReturnHelper.successResponseAny(res, 200, Language.lang.success_update, data);
-            } else {
-                return ReturnHelper.errorResponse(res, 404, 401, Language.lang.failed_not_found, "");
-            }
-
-            if (param.is_default || param.is_default === true) {
+            if (param.is_default === true) {
                 await OrmHelper.DB.getRepository(PatientGuarantor)
                     .update({ is_default: true }, { is_default: false, updated_by: req.auth?.data.name });
             }
@@ -311,8 +294,8 @@ export class PatientGuarantorController {
             data.maximal_liability = param.maximalliability;
             data.is_default = param.is_default;
             data.is_full_paid = param.is_full_paid;
-            data.created_by = req.auth.data.name;
-            data.updated_by = req.auth.data.name;
+            data.created_by = req.auth?.data.name;
+            data.updated_by = req.auth?.data.name;
 
             await repo.save(data);