diff --git a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
index ef0a51f..1a88167 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/pdf/service/PdfService.java
@@ -1179,57 +1179,57 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                         case "fill_8_21" -> commonField.setFna_b1_f_desc(fieldValue);
                         /* Page2 End */
                         /* Page3 Start */
-                        case "toggle_91" -> commonField.setFna_b1_a(formCode);
-                        case "fill_1_4" -> commonField.setFna_b1_a_amount(formCode);
-                        case "fill_1_4b" -> commonField.setFna_b1a_4_amount(formCode);
+                        case "toggle_91" -> commonField.setFna_b1_a(fieldValue);
+                        case "fill_1_4" -> commonField.setFna_b1_a_amount(fieldValue);
+                        case "fill_1_4b" -> commonField.setFna_b1a_4_amount(fieldValue);
                         
-                        case "toggle_93" -> commonField.setFna_b1b_1(formCode);
-                        case "toggle_94" -> commonField.setFna_b1b_3(formCode);
-
-                        case "fill_1_4c" -> commonField.setFna_b1_d_year(formCode);
-                        case "fill_1_4d" -> commonField.setFna_b1_d_year(formCode);
-                        case "fill_1_4e" -> commonField.setFna_b1_d_amount(formCode);
-
-                        case "toggle_4_2" -> commonField.setFna_b2_a(formCode);
-                        case "toggle_5" -> commonField.setFna_b2_b(formCode);
-                        case "toggle_6" -> commonField.setFna_b2_c(formCode);
-                        case "toggle_7" -> commonField.setFna_b2_d(formCode);
-                        case "toggle_8" -> commonField.setFna_b2_e(formCode);
-                        case "toggle_9" -> commonField.setFna_b2_f(formCode);
-                        case "toggle_10" -> commonField.setFna_b2_g(formCode);
+                        case "toggle_93" -> commonField.setFna_b1b_1(fieldValue);
+                        case "toggle_94" -> commonField.setFna_b1b_3(fieldValue);
+
+                        case "fill_1_4c" -> commonField.setFna_b1_d_year(fieldValue);
+                        case "fill_1_4d" -> commonField.setFna_b1_d_year(fieldValue);
+                        case "fill_1_4e" -> commonField.setFna_b1_d_amount(fieldValue);
+
+                        case "toggle_4_2" -> commonField.setFna_b2_a(fieldValue);
+                        case "toggle_5" -> commonField.setFna_b2_b(fieldValue);
+                        case "toggle_6" -> commonField.setFna_b2_c(fieldValue);
+                        case "toggle_7" -> commonField.setFna_b2_d(fieldValue);
+                        case "toggle_8" -> commonField.setFna_b2_e(fieldValue);
+                        case "toggle_9" -> commonField.setFna_b2_f(fieldValue);
+                        case "toggle_10" -> commonField.setFna_b2_g(fieldValue);
                         /* Page3 End */
                         /* Page4 Start */
-                        case "toggle_1_2" -> commonField.setFna_c3a_2_5(formCode);
-                        case "toggle_2_2" -> commonField.setFna_c3a_6_10(formCode);
-                        case "toggle_3_2" -> commonField.setFna_c3a_11_15(formCode);
-                        case "toggle_4_3" -> commonField.setFna_c3a_16_20(formCode);
-                        case "toggle_5_2" -> commonField.setFna_c3a_20(formCode);
+                        case "toggle_1_2" -> commonField.setFna_c3a_2_5(fieldValue);
+                        case "toggle_2_2" -> commonField.setFna_c3a_6_10(fieldValue);
+                        case "toggle_3_2" -> commonField.setFna_c3a_11_15(fieldValue);
+                        case "toggle_4_3" -> commonField.setFna_c3a_16_20(fieldValue);
+                        case "toggle_5_2" -> commonField.setFna_c3a_20(fieldValue);
                         case "toggle_6_2" -> commonField.setFna_c3a_life(fieldValue);
-                        case "toggle_6_2_sum" -> commonField.setFna_c3a_single_pay(formCode);
+                        case "toggle_6_2_sum" -> commonField.setFna_c3a_single_pay(fieldValue);
 
-                        case "fill_98_04" -> commonField.setFna_a_retire(formCode);
+                        case "fill_98_04" -> commonField.setFna_a_retire(fieldValue);
                         /* Page4 End */
                         /* Page5 Start */
                       
-                        case "toggle_1f" -> {commonField.setFna_c3b_income(formCode); commonField.setFna_c3b_salary(formCode);}
-                        case "toggle_1g" -> {commonField.setFna_c3b_saving(formCode); commonField.setFna_c3b_investments(formCode);}
-                        //case "toggle_1h" -> commonField.setFna_c3b_policy(formCode);
-                        case "toggle_1i56" -> commonField.setFna_c3b_others(formCode);
-                        case "Text3" -> commonField.setFna_c3b_desc(formCode);
+                        case "toggle_1f" -> {commonField.setFna_c3b_income(fieldValue); commonField.setFna_c3b_salary(fieldValue);}
+                        case "toggle_1g" -> {commonField.setFna_c3b_saving(fieldValue); commonField.setFna_c3b_investments(fieldValue);}
+                        //case "toggle_1h" -> commonField.setFna_c3b_policy(fieldValue);
+                        case "toggle_1i56" -> commonField.setFna_c3b_others(fieldValue);
+                        case "Text3" -> commonField.setFna_c3b_desc(fieldValue);
                         
-                        case "Check Box6" -> commonField.setFna_c1e_10(formCode);
-                        case "Check Box7" -> commonField.setFna_c1e_10_20(formCode);
-                        case "Check Box8" -> commonField.setFna_c1e_21_30(formCode);
-                        case "Check Box9" -> commonField.setFna_c1e_31_40(formCode);
-                        case "Check Box10" -> commonField.setFna_c1e_41_50(formCode);
-                        case "Check Box11" -> commonField.setFna_c1e_50(formCode);
-
-                        case "Check Box12" -> commonField.setFna_c2f_10(formCode);
-                        case "Check Box13" -> commonField.setFna_c2f_10_20(formCode);
-                        case "Check Box14" -> commonField.setFna_c2f_21_30(formCode);
-                        case "Check Box15" -> commonField.setFna_c2f_31_40(formCode);
-                        case "Check Box16" -> commonField.setFna_c2f_41_50(formCode);
-                        case "Check Box17" -> commonField.setFna_c2f_50(formCode);
+                        case "Check Box6" -> commonField.setFna_c1e_10(fieldValue);
+                        case "Check Box7" -> commonField.setFna_c1e_10_20(fieldValue);
+                        case "Check Box8" -> commonField.setFna_c1e_21_30(fieldValue);
+                        case "Check Box9" -> commonField.setFna_c1e_31_40(fieldValue);
+                        case "Check Box10" -> commonField.setFna_c1e_41_50(fieldValue);
+                        case "Check Box11" -> commonField.setFna_c1e_50(fieldValue);
+
+                        case "Check Box12" -> commonField.setFna_c2f_10(fieldValue);
+                        case "Check Box13" -> commonField.setFna_c2f_10_20(fieldValue);
+                        case "Check Box14" -> commonField.setFna_c2f_21_30(fieldValue);
+                        case "Check Box15" -> commonField.setFna_c2f_31_40(fieldValue);
+                        case "Check Box16" -> commonField.setFna_c2f_41_50(fieldValue);
+                        case "Check Box17" -> commonField.setFna_c2f_50(fieldValue);
                         /* Page5 End */