From 581646b184b65e68a6fbaa505e86a6e56d720a16 Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Fri, 26 Sep 2025 18:58:34 +0800
Subject: [PATCH] no message

---
 .../commonField/entity/CommonField.java       |   33 -
 .../lioner/pdf/service/PdfService.java        | 2481 +++++++++--------
 .../template/service/TemplateService.java     |    2 +-
 3 files changed, 1346 insertions(+), 1170 deletions(-)

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java b/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
index be4a970..0c3a07f 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/commonField/entity/CommonField.java
@@ -419,15 +419,6 @@ public class CommonField extends BaseEntity<Long>{
     @Column
 	private String insuranceCompany3_3;
 
-    @Column
-	private String insuranceSumInsured1;
-
-    @Column
-	private String insuranceSumInsured2;
-
-    @Column
-	private String insuranceSumInsured3;
-
     @Column
 	private String insuranceLife1;
 
@@ -1761,30 +1752,6 @@ public class CommonField extends BaseEntity<Long>{
         this.insuranceCompany3_3 = insuranceCompany3_3;
     }
 
-    public String getInsuranceSumInsured1() {
-        return insuranceSumInsured1;
-    }
-
-    public void setInsuranceSumInsured1(String insuranceSumInsured1) {
-        this.insuranceSumInsured1 = insuranceSumInsured1;
-    }
-
-    public String getInsuranceSumInsured2() {
-        return insuranceSumInsured2;
-    }
-
-    public void setInsuranceSumInsured2(String insuranceSumInsured2) {
-        this.insuranceSumInsured2 = insuranceSumInsured2;
-    }
-
-    public String getInsuranceSumInsured3() {
-        return insuranceSumInsured3;
-    }
-
-    public void setInsuranceSumInsured3(String insuranceSumInsured3) {
-        this.insuranceSumInsured3 = insuranceSumInsured3;
-    }
-
     public String getInsuranceLife1() {
         return insuranceLife1;
     }
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 4440fa2..20699b6 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
@@ -424,8 +424,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
     private void IDA_textBox(PdfAcroForm form, CommonField commonField, Client client){
         logger.info("Processing IDA form (ID: 1)");
         setValueIfPresent(form, "fill_6", commonField.getName());
-        setValueIfPresent(form, "fill_6_1", commonField.getOthers().get("name1"));
-        setValueIfPresent(form, "fill_6_2", commonField.getOthers().get("name2"));
+        //setValueIfPresent(form, "fill_6_1", commonField.getOthers().get("name1"));
+        //setValueIfPresent(form, "fill_6_2", commonField.getOthers().get("name2"));
         setValueIfPresent(form, "fill_7", commonField.getNameChi());
         setValueIfPresent(form, "fill_11", commonField.getIdCard());
         setValueIfPresent(form, "fill_12", commonField.getCountryOfIssue());
@@ -473,8 +473,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         /* Page4 Start */
         setValueIfPresent(form, "toggle_1_3", commonField.getOthers().get("futureAddressYes"));
         setValueIfPresent(form, "toggle_2_2", commonField.getOthers().get("futureAddressNo"));
-        setValueIfPresent(form, "fill_1_4_1", commonField.getOthers().get("futureAddress1"));
-        setValueIfPresent(form, "fill_1_4_2", commonField.getOthers().get("futureAddress2"));
+        setValueIfPresent(form, "fill_1_4_1", commonField.getOthers().get("futureAddress"));
+        //setValueIfPresent(form, "fill_1_4_2", commonField.getOthers().get("futureAddress2"));
         setValueIfPresent(form, "fill_2_4", commonField.getOthers().get("futureAddressReasonHowLong"));
 
         setValueIfPresent(form, "fill_3_4", commonField.getOthers().get("travelCity1"));
@@ -508,7 +508,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_11_7", commonField.getInsuranceCompany1_1());
         setValueIfPresent(form, "fill_11_7_1", commonField.getInsuranceCompany1_2());
         setValueIfPresent(form, "fill_11_7_2", commonField.getInsuranceCompany1_3());
-        setValueIfPresent(form, "fill_12_7", commonField.getInsuranceSumInsured1());
+        setValueIfPresent(form, "fill_12_7_1", commonField.getOthers().get("insuranceSumInsured1_1"));
+        setValueIfPresent(form, "fill_12_7_2", commonField.getOthers().get("insuranceSumInsured1_2"));
+        setValueIfPresent(form, "fill_12_7_3", commonField.getOthers().get("insuranceSumInsured1_3"));
         setValueIfPresent(form, "toggle_3_5", commonField.getInsuranceLife1());
         setValueIfPresent(form, "toggle_4_4", commonField.getInsuranceSaving1());
         setValueIfPresent(form, "toggle_5_5", commonField.getInsuranceCritical1());
@@ -519,13 +521,17 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_13_7", commonField.getInsuranceCompany2_1());
         setValueIfPresent(form, "fill_13_7_1", commonField.getInsuranceCompany2_2());
         setValueIfPresent(form, "fill_13_7_2", commonField.getInsuranceCompany2_3());
-        setValueIfPresent(form, "fill_14_7", commonField.getInsuranceSumInsured2());
+        setValueIfPresent(form, "fill_14_7_1", commonField.getOthers().get("insuranceSumInsured2_1"));
+        setValueIfPresent(form, "fill_14_7_2", commonField.getOthers().get("insuranceSumInsured2_2"));
+        setValueIfPresent(form, "fill_14_7_3", commonField.getOthers().get("insuranceSumInsured2_3"));
         setValueIfPresent(form, "undefined_22", commonField.getInsuranceOtherDesc2());
         setValueIfPresent(form, "fill_3_7", commonField.getInsuranceYear2());
         setValueIfPresent(form, "fill_15_7", commonField.getInsuranceCompany3_1());
         setValueIfPresent(form, "fill_15_7_1", commonField.getInsuranceCompany3_2());
         setValueIfPresent(form, "fill_15_7_2", commonField.getInsuranceCompany3_3());
-        setValueIfPresent(form, "fill_16_7", commonField.getInsuranceSumInsured3());
+        setValueIfPresent(form, "fill_16_7_1", commonField.getOthers().get("insuranceSumInsured3_1"));
+        setValueIfPresent(form, "fill_16_7_2", commonField.getOthers().get("insuranceSumInsured3_2"));
+        setValueIfPresent(form, "fill_16_7_3", commonField.getOthers().get("insuranceSumInsured3_3"));
         setValueIfPresent(form, "undefined_23", commonField.getInsuranceOtherDesc3());
         setValueIfPresent(form, "fill_5_7", commonField.getInsuranceYear3());
 
@@ -543,7 +549,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_5_8_2", commonField.getCompanyNature2());
         /* Page8 End */
         /* Page9 Start */
-        setValueIfPresent(form, "fill_26_4", commonField.getFna_c1a_amount());
+        //setValueIfPresent(form, "fill_26_4", commonField.getFna_c1a_amount());
         setValueIfPresent(form, "totalAnnualIncome", commonField.getTotalAnnualIncome());
         
         setValueIfPresent(form, "total_asset", commonField.getFna_c2a_amount());
@@ -595,8 +601,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         }    
         
         setValueIfPresent(form, "Name of Client", commonField.getName());
-        setValueIfPresent(form, "Name of Client1", commonField.getOthers().get("name1"));
-        setValueIfPresent(form, "Name of Client2", commonField.getOthers().get("name2"));
+        //setValueIfPresent(form, "Name of Client1", commonField.getOthers().get("name1"));
+        //setValueIfPresent(form, "Name of Client2", commonField.getOthers().get("name2"));
 
     }
 
@@ -604,6 +610,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form2, "gender_m", commonField.getGenderMale());
         setValueIfPresent(form2, "gender_f", commonField.getGenderFemale());
 
+        //setValueIfPresent(form2, "fill_7", commonField.getNameChi());
+
         setValueIfPresent(form2, "edu_pri", commonField.getEduPri());
         setValueIfPresent(form2, "edu_sec", commonField.getEduSec());
         setValueIfPresent(form2, "edu_post_sec", commonField.getEduPostSec());
@@ -625,26 +633,26 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form2, "tobaccoNo", commonField.getTobarccoNo());
         /* Page5 End */
         /* Page7 Start */
-        if(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
+        //if(commonField.getOthers().get("insuranceSumInsured1_1") != null && !commonField.getOthers().get("insuranceSumInsured1_1").isBlank()){
             setValueIfPresent(form2, "toggle_3_5", commonField.getInsuranceLife1());
             setValueIfPresent(form2, "toggle_4_4", commonField.getInsuranceSaving1());
             setValueIfPresent(form2, "toggle_5_5", commonField.getInsuranceCritical1());
             setValueIfPresent(form2, "toggle_6_3", commonField.getInsuranceOther1());
-        }
+        //}
         
-        if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
+        //if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
             setValueIfPresent(form2, "toggle_9_3", commonField.getInsuranceLife2());
             setValueIfPresent(form2, "toggle_10_3", commonField.getInsuranceSaving2());
             setValueIfPresent(form2, "toggle_11_3", commonField.getInsuranceCritical2());
             setValueIfPresent(form2, "toggle_12_2", commonField.getInsuranceOther2());
-        }
+        //}
         
-        if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
+        //if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
             setValueIfPresent(form2, "toggle_15", commonField.getInsuranceLife3());
             setValueIfPresent(form2, "toggle_16_2", commonField.getInsuranceSaving3());
             setValueIfPresent(form2, "toggle_17_3", commonField.getInsuranceCritical3());
             setValueIfPresent(form2, "toggle_18_2", commonField.getInsuranceOther3());
-        }
+        //}
 
         setValueIfPresent(form2, "declinedYes", commonField.getDeclinedYes());
         setValueIfPresent(form2, "declinedNo", commonField.getDeclinedNo());
@@ -674,11 +682,11 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         //logger.info("Processing FNA form (ID: 2)");
         /* Page1 Start */
         setValueIfPresent(form, "fna_a_name", commonField.getName());
-        setValueIfPresent(form, "fna_a_name_1", commonField.getOthers().get("name1"));
-        setValueIfPresent(form, "fna_a_name_2", commonField.getOthers().get("name2"));
+        //setValueIfPresent(form, "fna_a_name_1", commonField.getOthers().get("name1"));
+        //setValueIfPresent(form, "fna_a_name_2", commonField.getOthers().get("name2"));
         setValueIfPresent(form, "fna_a_birth", commonField.getDateOfBirth());
         setValueIfPresent(form, "fna_a_id_card", commonField.getIdCard());
-        setValueIfPresent(form, "fna_a_occupation", commonField.getOccupation());
+        setValueIfPresent(form, "fna_a_occupation", commonField.getOccupationTitle());
         setValueIfPresent(form, "fna_a_primary", commonField.getEduPri());
         setValueIfPresent(form, "fna_a_secondary", commonField.getEduSec());
         setValueIfPresent(form, "fna_a_tertiary", commonField.getEduPostSec());
@@ -687,7 +695,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fna_a_contact", commonField.getContactNo());
         setValueIfPresent(form, "fna_a_dependents", commonField.getNoOfDependents());
 
-        setValueIfPresent(form, "fna_c1a_amount", commonField.getFna_c1a_amount());
+        setValueIfPresent(form, "fna_c1a_amount", commonField.getTotalAnnualIncome());
         setValueIfPresent(form, "fna_c1b_amount", commonField.getFna_c1b_amount());
         setValueIfPresent(form, "fna_c1c_1_amount", commonField.getFna_c1c_1_amount());
         setValueIfPresent(form, "fna_c1c_2_amount", commonField.getFna_c1c_2_amount());
@@ -843,19 +851,19 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         //logger.info("Processing HSBCFIN form (ID: 3)");
         /* Page1 Start */
         setValueIfPresent(form, "fill_3", commonField.getName());
-        setValueIfPresent(form, "fill_3_1", commonField.getOthers().get("name1"));
-        setValueIfPresent(form, "fill_3_2", commonField.getOthers().get("name2"));
+        //setValueIfPresent(form, "fill_3_1", commonField.getOthers().get("name1"));
+        //setValueIfPresent(form, "fill_3_2", commonField.getOthers().get("name2"));
         setValueIfPresent(form, "fill_4", commonField.getNameChi());
         setValueIfPresent(form, "fill_5", commonField.getGender());
         setValueIfPresent(form, "fill_6", commonField.getDateOfBirth());
-        setValueIfPresent(form, "fill_9", commonField.getOccupation());
+        setValueIfPresent(form, "fill_9", commonField.getOccupationTitle());
 
         setValueIfPresent(form, "fill_7", commonField.getMaritalStatus());
         setValueIfPresent(form, "fill_8", commonField.getNoOfDependents());
         setValueIfPresent(form, "fill_10", commonField.getContactNo());;
                                 
-        if(StringUtils.isNotEmpty(commonField.getFna_c1a_amount())){
-            setValueIfPresent(form, "fill_11",  commonField.getFna_c1a_amount() ); //annual 
+        if(StringUtils.isNotEmpty(commonField.getTotalAnnualIncome())){
+            setValueIfPresent(form, "fill_11",  commonField.getTotalAnnualIncome() ); //annual 
         }
         if(StringUtils.isNotEmpty(commonField.getFna_c1b_amount())){
             setValueIfPresent(form, "fill_12",  commonField.getFna_c1b_amount() ); //annual
@@ -961,6 +969,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
         //one way mapping now
         setValueIfPresent(form2, "toggle_1c", commonField.getFna_c3a_single_pay());
+
+        //one way mapping now
+        if("Yes".equals(commonField.getFna_c3b_salary()) && "Yes".equals(commonField.getFna_c3b_saving()) && "Yes".equals(commonField.getFna_c3b_investments())){
+            setValueIfPresent(form2, "toggle_1f", "Yes");
+            setValueIfPresent(form2, "toggle_1g", "Yes");            
+        }
+        
     }
 
     private void MLFNA_EN_textBox(PdfAcroForm form, CommonField commonField, Client client){
@@ -972,7 +987,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "part2_1f_desc", commonField.getFna_b1_f_other());
         /* Page1 End */
         /* Page2 Start */
-        setValueIfPresent(form, "part3_3_1", commonField.getFna_c1a_amount());
+        setValueIfPresent(form, "part3_3_1", commonField.getTotalAnnualIncome());
         setValueIfPresent(form, "part3_3_2", commonField.getFna_c1b_amount());
 
         setValueIfPresent(form, "part3_3_4", commonField.getFna_c2a_amount());
@@ -1076,7 +1091,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "address2", commonField.getOthers().get("address2"));
         setValueIfPresent(form, "contact", commonField.getContactNo());
         setValueIfPresent(form, "email", commonField.getEmail());
-        setValueIfPresent(form, "occupation", commonField.getOccupation());
+        setValueIfPresent(form, "occupation", commonField.getOccupationTitle());
 
         setValueIfPresent(form, "1amount", commonField.getFna_b1_d_amount());
         setValueIfPresent(form, "cb1f", commonField.getFna_b1_f_other());
@@ -1164,8 +1179,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         }    
         
         setValueIfPresent(form, "applicant_name", commonField.getName());
-        setValueIfPresent(form, "applicant_name1", commonField.getOthers().get("name1"));
-        setValueIfPresent(form, "applicant_name2", commonField.getOthers().get("name2"));
+        //setValueIfPresent(form, "applicant_name1", commonField.getOthers().get("name1"));
+        //setValueIfPresent(form, "applicant_name2", commonField.getOthers().get("name2"));
     }
     
     private void SLFNA_EN_checkBox(PDAcroForm form2, CommonField commonField){
@@ -1264,8 +1279,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "1_12_1", commonField.getOccupation());
         setValueIfPresent(form, "1_12_2", commonField.getOccupationTitle());
         
-        setValueIfPresent(form, "1_12_5", commonField.getFna_c1a_amount());
-        if(commonField.getFna_c1a_amount() != null && !commonField.getFna_c1a_amount().isBlank()){
+        setValueIfPresent(form, "1_12_5", commonField.getTotalAnnualIncome());
+        if(commonField.getTotalAnnualIncome() != null && !commonField.getTotalAnnualIncome().isBlank()){
             setValueIfPresent(form, "1_12_5_usd", "USD");
             setValueIfPresent(form, "1_12_5_pa", "P.A.");
         }
@@ -1334,21 +1349,27 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "4_1_name1_3", commonField.getInsuranceCompany1_3());
         setValueIfPresent(form, "4_1_year1", commonField.getInsuranceYear1());
         setValueIfPresent(form, "4_1_currency1", commonField.getInsuranceCurrency1());
-        setValueIfPresent(form, "4_1_sum1", commonField.getInsuranceSumInsured1());
+        setValueIfPresent(form, "4_1_sum1_1", commonField.getOthers().get("insuranceSumInsured1_1"));
+        setValueIfPresent(form, "4_1_sum1_2", commonField.getOthers().get("insuranceSumInsured1_2"));
+        setValueIfPresent(form, "4_1_sum1_3", commonField.getOthers().get("insuranceSumInsured1_3"));
         
         setValueIfPresent(form, "4_1_name2_1", commonField.getInsuranceCompany2_1());
         setValueIfPresent(form, "4_1_name2_2", commonField.getInsuranceCompany2_2());
         setValueIfPresent(form, "4_1_name2_3", commonField.getInsuranceCompany2_3());
         setValueIfPresent(form, "4_1_year2", commonField.getInsuranceYear2());
         setValueIfPresent(form, "4_1_currency2", commonField.getInsuranceCurrency2());
-        setValueIfPresent(form, "4_1_sum2", commonField.getInsuranceSumInsured2());
+        setValueIfPresent(form, "4_1_sum2_1", commonField.getOthers().get("insuranceSumInsured2_1"));
+        setValueIfPresent(form, "4_1_sum2_2", commonField.getOthers().get("insuranceSumInsured2_2"));
+        setValueIfPresent(form, "4_1_sum2_3", commonField.getOthers().get("insuranceSumInsured2_3"));
         
         setValueIfPresent(form, "4_1_name3_1", commonField.getInsuranceCompany3_1());
         setValueIfPresent(form, "4_1_name3_2", commonField.getInsuranceCompany3_2());
         setValueIfPresent(form, "4_1_name3_3", commonField.getInsuranceCompany3_3());
         setValueIfPresent(form, "4_1_year3", commonField.getInsuranceYear3());
         setValueIfPresent(form, "4_1_currency3", commonField.getInsuranceCurrency3());
-        setValueIfPresent(form, "4_1_sum3", commonField.getInsuranceSumInsured3());
+        setValueIfPresent(form, "4_1_sum3_1", commonField.getOthers().get("insuranceSumInsured3_1"));
+        setValueIfPresent(form, "4_1_sum3_2", commonField.getOthers().get("insuranceSumInsured3_2"));
+        setValueIfPresent(form, "4_1_sum3_3", commonField.getOthers().get("insuranceSumInsured3_3"));
         
     }
 
@@ -1510,6 +1531,11 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_15", commonField.getFirstName());
         setValueIfPresent(form, "fill_16", commonField.getGivenName());
 
+        if(form.getField("fill_15").getValueAsString().isBlank() 
+            && form.getField("fill_16").getValueAsString().isBlank() ){
+            setValueIfPresent(form, "fill_15", commonField.getName());
+        }
+
         setValueIfPresent(form, "fill_17", commonField.getNameChi());
         setValueIfPresent(form, "Text1", commonField.getIdCard());
         setValueIfPresent(form, "passportNo", commonField.getPassportNo());
@@ -1526,8 +1552,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
         setValueIfPresent(form, "address1", commonField.getOthers().get("address1"));
         setValueIfPresent(form, "address2", commonField.getOthers().get("address2"));
+                  
+        Map<String, String> d = getCountryAndPhoneNo(commonField.getContactNo());
+        if(d.get("countryCode") != null)
+            setValueIfPresent(form, "fill_12", d.get("countryCode"));
+        if(d.get("phoneNo") != null)
+            setValueIfPresent(form, "undefined_6",  d.get("phoneNo"));
 
-        setValueIfPresent(form, "fill_12", commonField.getContactNo());
         setValueIfPresent(form, "Text182", commonField.getEmail());
 
         setValueIfPresent(form, "Text174", commonField.getCompanyName());
@@ -1538,25 +1569,32 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_17_2", commonField.getOthers().get("companyAddress2"));
         /* Page2 End */
         /* Page3 Start */
-        setValueIfPresent(form, "undefined_51", commonField.getContactNo());
+        //setValueIfPresent(form, "undefined_51", commonField.getContactNo());
         /* Page3 End */
         /* Page12 Start */
         setValueIfPresent(form, "undefined_17ha_1", commonField.getInsuranceCompany1_1());
         setValueIfPresent(form, "undefined_17ha_2", commonField.getInsuranceCompany1_2());
-        setValueIfPresent(form, "undefined_17ha_3", commonField.getInsuranceCompany1_3());
-        setValueIfPresent(form, "undefined_17hk", commonField.getInsuranceSumInsured1());
+        //setValueIfPresent(form, "undefined_17ha_3", commonField.getInsuranceCompany1_3());
+        setValueIfPresent(form, "undefined_17hk_1", commonField.getOthers().get("insuranceSumInsured1_1"));
+        setValueIfPresent(form, "undefined_17hk_2", commonField.getOthers().get("insuranceSumInsured1_2"));
+        //setValueIfPresent(form, "undefined_17hk_3", commonField.getOthers().get("insuranceSumInsured1_3"));
+
         setValueIfPresent(form, "undefined_17hl", commonField.getInsuranceYear1());
 
         setValueIfPresent(form, "undefined_17hn_1", commonField.getInsuranceCompany2_1());
         setValueIfPresent(form, "undefined_17hn_2", commonField.getInsuranceCompany2_2());
-        setValueIfPresent(form, "undefined_17hn_3", commonField.getInsuranceCompany2_3());
-        setValueIfPresent(form, "undefined_17ho", commonField.getInsuranceSumInsured1());
+        //setValueIfPresent(form, "undefined_17hn_3", commonField.getInsuranceCompany2_3());
+        setValueIfPresent(form, "undefined_17ho_1", commonField.getOthers().get("insuranceSumInsured2_1"));
+        setValueIfPresent(form, "undefined_17ho_2", commonField.getOthers().get("insuranceSumInsured2_2"));
+        //setValueIfPresent(form, "undefined_17ho_3", commonField.getOthers().get("insuranceSumInsured2_3"));
         setValueIfPresent(form, "undefined_17hp", commonField.getInsuranceYear1());
         
         setValueIfPresent(form, "undefined_17hr_1", commonField.getInsuranceCompany3_1());
         setValueIfPresent(form, "undefined_17hr_2", commonField.getInsuranceCompany3_2());
-        setValueIfPresent(form, "undefined_17hr_3", commonField.getInsuranceCompany3_3());
-        setValueIfPresent(form, "undefined_17hsb", commonField.getInsuranceSumInsured1());
+        //setValueIfPresent(form, "undefined_17hr_3", commonField.getInsuranceCompany3_3());
+        setValueIfPresent(form, "undefined_17hsb_1", commonField.getOthers().get("insuranceSumInsured3_1"));
+        setValueIfPresent(form, "undefined_17hsb_2", commonField.getOthers().get("insuranceSumInsured3_2"));
+        //setValueIfPresent(form, "undefined_17hsb_3", commonField.getOthers().get("insuranceSumInsured3_3"));
         setValueIfPresent(form, "undefined_17ht", commonField.getInsuranceYear1());
         
         setValueIfPresent(form, "fill_2_6", commonField.getUltimateTotalLife());
@@ -1598,7 +1636,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "fill_78", commonField.getRealEstatePurchaseDate2());
         setValueIfPresent(form, "fill_82", commonField.getRealEstatePurchaseDate3());
 
-        setValueIfPresent(form, "Text26001", commonField.getBankruptNo());
+        setValueIfPresent(form, "Text26001", commonField.getBankruptDesc());
         /* Page14 End */
         setValueIfPresent(form, "fill_4_12", commonField.getFna_a_retire());
         
@@ -1620,6 +1658,28 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         /* Page1 End */
         
         /* Page2 Start */
+        Map<String, String> d = getCountryAndPhoneNo(commonField.getContactNo());
+        if(d.get("countryCode") != null){
+            switch((String)d.get("countryCode")){
+                case "+852" ->
+                    setValueIfPresent(form2, "Check Box12_2", "Yes");
+                case "+1" ->
+                    setValueIfPresent(form2, "Check Box13_2", "Yes");
+                case "+86" ->
+                    setValueIfPresent(form2, "Check Box14_2", "Yes");
+            }
+
+            /*
+            if("+852".equals((String)d.get("countryCode")))
+                setValueIfPresent(form2, "Check Box12_2", "Yes");
+            else if("+1".equals((String)d.get("countryCode")))
+                setValueIfPresent(form2, "Check Box13_2", "Yes");
+            else if("+86".equals((String)d.get("countryCode")))
+                setValueIfPresent(form2, "Check Box14_2", "Yes");
+            */
+
+        }
+
         setValueIfPresent(form2, "Check Box175", commonField.getEmployedSelf());
         setValueIfPresent(form2, "Check Box177", commonField.getEmployed());
         setValueIfPresent(form2, "Check Box179", commonField.getPartTime());
@@ -1632,7 +1692,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         /* Page12 Start */
         setValueIfPresent(form2, "Check Box74b", commonField.getDeclinedYes());
         setValueIfPresent(form2, "Check Box74_1a", commonField.getDeclinedNo());
-        
+
+        setValueIfPresent(form2, "Check Box74bc", commonField.getOthers().get("futureAddressYes"));
+        setValueIfPresent(form2, "Check Box74_1ah", commonField.getOthers().get("futureAddressNo"));        
         /* Page12 End */
         /* Page14 Start */
         setValueIfPresent(form2, "Check Box65f", commonField.getOwn_income());
@@ -1641,12 +1703,21 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form2, "Check Box65b", commonField.getBankruptYes());
         setValueIfPresent(form2, "Check Box83", commonField.getBankruptNo());
         /* Page14 End */
+        /* Page27 Start */
+        setValueIfPresent(form2, "toggle_7_47", commonField.getFna_c3a_single_pay());
+        /* Page27 End */
     }
 
     private void MLB03S_textBox(PdfAcroForm form, CommonField commonField, Client client){
         /* Page1 Start */
         setValueIfPresent(form, "SurName1", commonField.getFirstName());
         setValueIfPresent(form, "GivenName1", commonField.getGivenName());
+        
+        if(form.getField("SurName1").getValueAsString().isBlank() 
+            && form.getField("GivenName1").getValueAsString().isBlank() ){
+            setValueIfPresent(form, "SurName1", commonField.getName());
+        }
+
         setValueIfPresent(form, "ChineseName1", commonField.getNameChi());
 
         setValueIfPresent(form, "DD1", commonField.getDdDateOfBirth());
@@ -1758,6 +1829,12 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         /* Page1 Start */
         setValueIfPresent(form, "surname", commonField.getFirstName());
         setValueIfPresent(form, "given_name", commonField.getGivenName());
+
+         if(form.getField("surname").getValueAsString().isBlank() 
+            && form.getField("given_name").getValueAsString().isBlank()){
+            setValueIfPresent(form, "surname", commonField.getName());
+        }
+
         setValueIfPresent(form, "ChineseName1", commonField.getNameChi());
 
         setValueIfPresent(form, "ch1_4_m", commonField.getGenderMale());
@@ -1890,17 +1967,23 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "4_1_year2", commonField.getInsuranceYear2());
         setValueIfPresent(form, "4_1_year3", commonField.getInsuranceYear3());
 
-        setValueIfPresent(form, "4_1_sum1", commonField.getInsuranceSumInsured1());
-        setValueIfPresent(form, "4_1_sum2", commonField.getInsuranceSumInsured2());
-        setValueIfPresent(form, "4_1_sum3", commonField.getInsuranceSumInsured3());
+        setValueIfPresent(form, "4_1_sum1_1", commonField.getOthers().get("insuranceSumInsured1_1"));
+        setValueIfPresent(form, "4_1_sum1_2", commonField.getOthers().get("insuranceSumInsured1_2"));
+        setValueIfPresent(form, "4_1_sum1_3", commonField.getOthers().get("insuranceSumInsured1_3"));
+        setValueIfPresent(form, "4_1_sum2_1", commonField.getOthers().get("insuranceSumInsured2_1"));
+        setValueIfPresent(form, "4_1_sum2_2", commonField.getOthers().get("insuranceSumInsured2_2"));
+        setValueIfPresent(form, "4_1_sum2_3", commonField.getOthers().get("insuranceSumInsured2_3"));
+        setValueIfPresent(form, "4_1_sum3_1", commonField.getOthers().get("insuranceSumInsured3_1"));
+        setValueIfPresent(form, "4_1_sum3_2", commonField.getOthers().get("insuranceSumInsured3_2"));
+        setValueIfPresent(form, "4_1_sum3_3", commonField.getOthers().get("insuranceSumInsured3_3"));
         
-        if(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
+        //if(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
             setValueIfPresent(form, "ch4_1_life", "On");
             setValueIfPresent(form, "ch4_1_accident", "On");
             setValueIfPresent(form, "ch4_1_critical", "On");
             setValueIfPresent(form, "ch4_1_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife1())){
             setValueIfPresent(form, "ch4_1_life", "Off");
         }
@@ -1908,13 +1991,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             setValueIfPresent(form, "ch4_1_critical", "Off");
         }
 
-        if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
+        //if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
             setValueIfPresent(form, "ch4_2_life", "On");
             setValueIfPresent(form, "ch4_2_accident", "On");
             setValueIfPresent(form, "ch4_2_critical", "On");
             setValueIfPresent(form, "ch4_2_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife2())){
             setValueIfPresent(form, "ch4_2_life", "Off");
         }
@@ -1922,13 +2005,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             setValueIfPresent(form, "ch4_2_critical", "Off");
         }
 
-        if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
+        //if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
             setValueIfPresent(form, "ch4_3_life", "On");
             setValueIfPresent(form, "ch4_3_accident", "On");
             setValueIfPresent(form, "ch4_3_critical", "On");
             setValueIfPresent(form, "ch4_3_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife3())){
             setValueIfPresent(form, "ch4_3_life", "Off");
         }
@@ -1960,8 +2043,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         /* Page7 Start */
         setValueIfPresent(form, "ch5_1c_yes", commonField.getOthers().get("futureAddressYes"));
         setValueIfPresent(form, "ch5_1c_no", commonField.getOthers().get("futureAddressNo"));
-        setValueIfPresent(form, "5_1c_address_1", commonField.getOthers().get("futureAddress1"));
-        setValueIfPresent(form, "5_1c_address_2", commonField.getOthers().get("futureAddress2"));
+        setValueIfPresent(form, "5_1c_address_1", commonField.getOthers().get("futureAddress"));
+        //setValueIfPresent(form, "5_1c_address_2", commonField.getOthers().get("futureAddress2"));
         setValueIfPresent(form, "5_1c_reason", commonField.getOthers().get("futureAddressReason"));
         setValueIfPresent(form, "5_1c_how_long", commonField.getOthers().get("futureAddressHowLong"));
         if(StringUtils.trimToNull(commonField.getOthers().get("futureAddressReason")) != null 
@@ -2147,13 +2230,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
  
         /* Page3 End */
         /* Page6 Start */
-        if(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
+        //f(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
             setValueIfPresent(form2, "ch4_1_life", "On");
             setValueIfPresent(form2, "ch4_1_accident", "On");
             setValueIfPresent(form2, "ch4_1_critical", "On");
             setValueIfPresent(form2, "ch4_1_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife1())){
             setValueIfPresent(form2, "ch4_1_life", "Off");
         }
@@ -2161,13 +2244,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             setValueIfPresent(form2, "ch4_1_critical", "Off");
         }
 
-        if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
+        //if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
             setValueIfPresent(form2, "ch4_2_life", "On");
             setValueIfPresent(form2, "ch4_2_accident", "On");
             setValueIfPresent(form2, "ch4_2_critical", "On");
             setValueIfPresent(form2, "ch4_2_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife2())){
             setValueIfPresent(form2, "ch4_2_life", "Off");
         }
@@ -2175,13 +2258,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             setValueIfPresent(form2, "ch4_2_critical", "Off");
         }
 
-        if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
+        //if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
             setValueIfPresent(form2, "ch4_3_life", "On");
             setValueIfPresent(form2, "ch4_3_accident", "On");
             setValueIfPresent(form2, "ch4_3_critical", "On");
             setValueIfPresent(form2, "ch4_3_hospital", "On");
             
-        }
+        //}
         if("Yes".equals(commonField.getInsuranceLife3())){
             setValueIfPresent(form2, "ch4_3_life", "Off");
         }
@@ -2317,1040 +2400,28 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
                 String formCode = (String)template.get("remarks");
 
                 if ("IDA".equals(formCode)) {
-                   //logger.info("IDA ");
-
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "fill_6" -> commonField.setName(fieldValue);
-                        case "fill_7" -> commonField.setNameChi(fieldValue);
-                        case "fill_11" -> commonField.setIdCard(fieldValue);
-                        case "fill_12" -> commonField.setCountryOfIssue(fieldValue);
-                        case "fill_13" -> commonField.setPassportNo(fieldValue);
-                        case "fill_14_date" -> commonField.getOthers().put("passportExpiryDate", fieldValue);
-                        case "fill_15" -> commonField.setPlaceOfBirth(fieldValue);
-                        case "fill_16" -> commonField.setCountryOfCitizenship(fieldValue);
-
-                        case "gender_m" -> {
-                            commonField.setGenderMale(fieldValue); 
-                            if("Yes".equals(fieldValue)) {
-                                commonField.setGender("M");
-                            }
-                        }
-                        case "gender_f" -> {
-                            commonField.setGenderFemale(fieldValue); 
-                            if("Yes".equals(fieldValue)) {
-                                commonField.setGender("F");
-                            }
-                        }
-
-                        case "date_dd" -> commonField.setDdDateOfBirth(fieldValue);
-                        case "date_mm" -> commonField.setMmDateOfBirth(fieldValue);
-                        case "date_yyyy" -> commonField.setYyyyDateOfBirth(fieldValue);
-
-                        case "fill_17" -> commonField.setContactNo(fieldValue);
-                        case "fill_18" -> commonField.setEmail(fieldValue);
-                        case "fill_19" -> commonField.getOthers().put("address1", fieldValue);
-                        case "fill_19_1" -> commonField.getOthers().put("address2", fieldValue);
-                        case "fill_23" -> commonField.getOthers().put("crAddress1", fieldValue);
-                        case "fill_23_1" -> commonField.getOthers().put("crAddress2", fieldValue);
-                                                
-                        case "edu_pri" -> commonField.setEduPri(fieldValue);
-                        case "edu_sec" -> commonField.setEduSec(fieldValue);
-                        case "edu_post_sec" -> commonField.setEduPostSec(fieldValue);
-                        /* Page1 End */
-                        /* Page2 Start */
-                        case "own_income" -> commonField.setOwn_income(fieldValue);
-                        case "savings" -> commonField.setSavings(fieldValue);
-                        case "premium_financing" -> commonField.setPremium_financing(fieldValue);
-                        case "others_funds" -> commonField.setOthers_funds(fieldValue);
-                        case "others_funds_desc" -> commonField.setOthers_funds_desc(fieldValue);
-
-                        
-                        case "fill_1_2" -> {
-                            commonField.getOthers().put("relateFatherRelation", "Father");
-                            commonField.getOthers().put("relateFatherName", fieldValue);
-                        }
-                        case "fill_2_2" -> commonField.getOthers().put("relateFatherAge", fieldValue);
-                        case "fill_6_2" -> {
-                            commonField.getOthers().put("relateMotherRelation", "Mother");
-                            commonField.getOthers().put("relateMotherName", fieldValue);
-                        }
-                        case "fill_7_2" -> commonField.getOthers().put("relateMotherAge", fieldValue);
-                        case "fill_11_2" -> {
-                            commonField.getOthers().put("relateSpouseRelation", "Spouse");
-                            commonField.getOthers().put("relateSpouseName", fieldValue);
-                        }
-                        case "fill_12_2" -> commonField.getOthers().put("relateSpouseAge", fieldValue);
-                        case "fill_16_2" -> {
-                            commonField.getOthers().put("relateSonRelation", "Son");
-                            commonField.getOthers().put("relateSonName", fieldValue);
-                        }
-                        case "fill_17_2" -> commonField.getOthers().put("relateSonAge", fieldValue);
-                        case "fill_21_2" -> {
-                            commonField.getOthers().put("relateSonRelation", "Daughter");
-                            commonField.getOthers().put("relateSonName", fieldValue);
-                        }
-                        case "fill_22_2" -> commonField.getOthers().put("relateSonAge", fieldValue);
-                        case "fill_26" -> {
-                            commonField.getOthers().put("relateBotherRelation", "Bother");
-                            commonField.getOthers().put("relateBotherName", fieldValue);
-                        }
-                        case "fill_27" -> commonField.getOthers().put("relateBotherAge", fieldValue);
-                        case "fill_31" -> {
-                            commonField.getOthers().put("relateSisterRelation", "Sister");
-                            commonField.getOthers().put("relateSisterName", fieldValue);
-                        }
-                        case "fill_32" -> commonField.getOthers().put("relateSisterAge", fieldValue);
-                        
-
-                        /* Page2 End */
-                        /* Page3 Start */
-                        case "toggle_3_2" -> commonField.setBankruptYes(fieldValue);
-                        case "toggle_6_2" -> commonField.setBankruptNo(fieldValue);
-                        case "fill_18_1" -> commonField.setBankruptNo(fieldValue);
-
-                        case "fill_3_3" -> commonField.getOthers().put("travelCity1",fieldValue);
-                        case "fill_6_3" -> commonField.getOthers().put("travelCity2",fieldValue);
-                        case "fill_9_3" -> commonField.getOthers().put("travelCity3",fieldValue);
-                        case "fill_5_3" -> commonField.getOthers().put("travelPurpose1",fieldValue);
-                        case "fill_7_3" -> commonField.getOthers().put("travelPurpose2",fieldValue);
-                        case "fill_10_3" -> commonField.getOthers().put("travelPurpose3",fieldValue);
-                        case "fill_4_3" -> commonField.getOthers().put("travelFrequency1",fieldValue);
-                        case "fill_8_3" -> commonField.getOthers().put("travelFrequency2",fieldValue);
-                        case "fill_11_3" -> commonField.getOthers().put("travelFrequency3",fieldValue);
-
-                        /* Page3 End */
-                        /* Page4 Start */
-                        case "toggle_1_3" -> commonField.getOthers().put("futureAddressYes", fieldValue);
-                        case "toggle_2_2" -> commonField.getOthers().put("futureAddressNo", fieldValue);
-                        case "fill_1_4_1" -> commonField.getOthers().put("futureAddress1", fieldValue);
-                        case "fill_1_4_2" -> commonField.getOthers().put("futureAddress2", fieldValue);
-                        case "fill_2_4" -> commonField.getOthers().put("futureAddressReasonHowLong", fieldValue);
-
-                        case "toggle_3_3" -> commonField.getOthers().put("futureAddressReturnYes", fieldValue);
-                        case "toggle_4_3" -> commonField.getOthers().put("futureAddressReturnNo", fieldValue);
-                        case "toggle_5_3" -> commonField.getOthers().put("futureAddressReturnNa", fieldValue);
-
-                        case "fill_3_4" -> commonField.getOthers().put("travelNextCity1", fieldValue);
-                        case "fill_6_4" -> commonField.getOthers().put("travelNextCity2", fieldValue);
-                        case "fill_9_4" -> commonField.getOthers().put("travelNextCity3", fieldValue);
-                        case "fill_5_4" -> commonField.getOthers().put("travelNextPurpose1", fieldValue);
-                        case "fill_8_4" -> commonField.getOthers().put("travelNextPurpose2", fieldValue);
-                        case "fill_11_4" -> commonField.getOthers().put("travelNextPurpose3", fieldValue);
-                        case "fill_4_4" -> commonField.getOthers().put("travelNextFrequency1", fieldValue);
-                        case "fill_7_4" -> commonField.getOthers().put("travelNextFrequency2", fieldValue);
-                        case "fill_10_4" -> commonField.getOthers().put("travelNextFrequency3", fieldValue);
-
-                        /* Page4 End */
-                        /* Page5 Start */                        
-                        case "toggle_3_4" -> commonField.getOthers().put("pendingChargeYes", fieldValue);
-                        case "undefined_11" -> commonField.getOthers().put("pendingChargeNo", fieldValue);
-
-                        case "tobaccoYes" -> commonField.setTobarccoYes(fieldValue);
-                        case "tobaccoNo" -> commonField.setTobarccoNo(fieldValue);
-                        
-                        case "hazardousActivity" -> commonField.setHazardousActivity(fieldValue);
-                        
-
-                        /* Page5 End */
-                        /* Page6 Start */
-                        case "fill_8_country_1" -> commonField.setTaxResidency1(fieldValue);
-                        case "fill_1_6" -> commonField.setTaxPin1(fieldValue);
-                        case "fill_2_6" -> commonField.setTaxReason1(fieldValue);
-                        case "fill_3_6" -> commonField.setTaxReasonB1(fieldValue);
-                        case "fill_8_country_2" -> commonField.setTaxResidency2(fieldValue);
-                        case "fill_4_5" -> commonField.setTaxPin2(fieldValue);
-                        case "fill_5_6" -> commonField.setTaxReason2(fieldValue);
-                        case "fill_6_6" -> commonField.setTaxReasonB2(fieldValue);
-                        case "fill_8_country_3" -> commonField.setTaxResidency3(fieldValue);
-                        case "fill_7_6" -> commonField.setTaxPin3(fieldValue);
-                        case "fill_8_6" -> commonField.setTaxReason3(fieldValue);
-                        case "fill_9_6" -> commonField.setTaxReasonB3(fieldValue);
-                        /* Page7 Start */
-                        case "fill_11_7" -> commonField.setInsuranceCompany1_1(fieldValue);
-                        case "fill_11_7_1" -> commonField.setInsuranceCompany1_2(fieldValue);
-                        case "fill_11_7_2" -> commonField.setInsuranceCompany1_3(fieldValue);
-                        case "fill_12_7" -> {
-                            commonField.setInsuranceSumInsured1(fieldValue);
-
-                            if(commonField.getInsuranceSumInsured1() != null && !commonField.getInsuranceSumInsured1().isBlank()){
-                                commonField.setInsuranceCurrency1("USD");
-                            }
-                        }
-                        case "toggle_3_5" -> commonField.setInsuranceLife1(fieldValue);
-                        case "toggle_4_4" -> commonField.setInsuranceSaving1(fieldValue);
-                        case "toggle_5_5" -> commonField.setInsuranceCritical1(fieldValue);
-                        case "toggle_6_3" -> commonField.setInsuranceOther1(fieldValue);
-                        case "undefined_21" -> commonField.setInsuranceOtherDesc1(fieldValue);
-                        case "fill_1_7" -> commonField.setInsuranceYear1(fieldValue);
-
-                        case "fill_13_7" -> commonField.setInsuranceCompany2_1(fieldValue);
-                        case "fill_13_7_1" -> commonField.setInsuranceCompany2_2(fieldValue);
-                        case "fill_13_7_2" -> commonField.setInsuranceCompany2_3(fieldValue);
-                        case "fill_14_7" -> {
-                            commonField.setInsuranceSumInsured2(fieldValue);
-
-                            if(commonField.getInsuranceSumInsured2() != null && !commonField.getInsuranceSumInsured2().isBlank()){
-                                commonField.setInsuranceCurrency2("USD");
-                            }
-                        }
-                        case "toggle_9_3" -> commonField.setInsuranceLife2(fieldValue);
-                        case "toggle_10_3" -> commonField.setInsuranceSaving2(fieldValue);
-                        case "toggle_11_3" -> commonField.setInsuranceCritical2(fieldValue);
-                        case "toggle_12_2" -> commonField.setInsuranceOther2(fieldValue);
-                        case "undefined_22" -> commonField.setInsuranceOtherDesc2(fieldValue);
-                        case "fill_3_7" -> commonField.setInsuranceYear2(fieldValue);
-
-
-                        case "fill_15_7" -> commonField.setInsuranceCompany3_1(fieldValue);
-                        case "fill_15_7_1" -> commonField.setInsuranceCompany3_2(fieldValue);
-                        case "fill_15_7_2" -> commonField.setInsuranceCompany3_3(fieldValue);
-                        case "fill_16_7" -> {
-                            commonField.setInsuranceSumInsured3(fieldValue);
-
-                            if(commonField.getInsuranceSumInsured3() != null && !commonField.getInsuranceSumInsured3().isBlank()){
-                                commonField.setInsuranceCurrency3("USD");
-                            }
-                        }
-                        case "toggle_15" -> commonField.setInsuranceLife3(fieldValue);
-                        case "toggle_16_2" -> commonField.setInsuranceSaving3(fieldValue);
-                        case "toggle_17_3" -> commonField.setInsuranceCritical3(fieldValue);
-                        case "toggle_18_2" -> commonField.setInsuranceOther3(fieldValue);
-                        case "undefined_23" -> commonField.setInsuranceOtherDesc3(fieldValue);
-                        case "fill_5_7" -> commonField.setInsuranceYear3(fieldValue);
-
-                        case "ultimateTotalLife" -> commonField.setUltimateTotalLife(fieldValue);
-
-                        case "declinedYes" -> commonField.setDeclinedYes(fieldValue);
-                        case "declinedNo" -> commonField.setDeclinedNo(fieldValue);
-                        case "declinedDesc" -> commonField.setDeclinedDesc(fieldValue);
-
-                        case "replaceInsuranceYes" -> commonField.setReplaceInsuranceYes(fieldValue);
-                        case "replaceInsuranceNo" -> commonField.setReplaceInsuranceNo(fieldValue);
-                        
-                        /* Page7 End */
-                        /* Page8 Start */
-                        case "employed" -> commonField.setEmployed(fieldValue);
-                        case "homemaker" -> commonField.setHomemaker(fieldValue);
-                        case "student" -> commonField.setStudent(fieldValue);
-                        case "investor" -> commonField.setInvestor(fieldValue);
-                        case "retired" -> commonField.setRetired(fieldValue);
-
-                        case "fill_3_8" -> commonField.setOccupationTitle(fieldValue);
-                        case "fill_4_6_1" -> commonField.setCompanyName(fieldValue);
-                        case "fill_4_6_2" -> commonField.getOthers().put("companyAddress1", fieldValue);
-                        case "fill_4_6_3" -> commonField.getOthers().put("companyAddress2", fieldValue);
-                        case "fill_5_8_1" -> commonField.setCompanyNature1(fieldValue);
-                        case "fill_5_8_2" -> commonField.setCompanyNature2(fieldValue);
-
-                        case "toggle_6_4" -> commonField.getOthers().put("businessOwnerYes", fieldValue);
-                        case "fill_22_5" -> commonField.getOthers().put("businessOwnerPercent", fieldValue);
-                        case "fill_25_3" -> commonField.getOthers().put("businessOwnerNoEmployee", fieldValue);
-
-                        /* Page8 End */
-                        /* Page9 Start */
-                        case "fill_26_4" -> commonField.setFna_c1a_amount(fieldValue);
-                        case "totalAnnualIncome" -> commonField.setTotalAnnualIncome(fieldValue);
-                        
-                        case "totalLiquidAsset" -> commonField.setFna_c2a_amount(fieldValue);
-                        case "totalLiquidLia" -> commonField.setFna_c2b_amount(fieldValue);
-
-                        case "incomeSalary" -> commonField.setIncomeSalary(fieldValue);
-                        case "incomeSalaryLastYear" -> commonField.setIncomeSalaryLastYear(fieldValue);
-                        case "incomeBonus" -> commonField.setIncomeBonus(fieldValue);
-                        case "incomeBonusLastYear" -> commonField.setIncomeBonusLastYear(fieldValue);
-                        case "incomeOther" -> commonField.setIncomeOther(fieldValue);
-                        case "incomeOtherLastYear" -> commonField.setIncomeOtherLastYear(fieldValue);
-                        case "incomeInterest" -> commonField.setIncomeInterest(fieldValue);
-                        case "incomeInterestLastYear" -> commonField.setIncomeInterestLastYear(fieldValue);
-                        case "incomeDividents" -> commonField.setIncomeDividents(fieldValue);
-                        case "incomeDividentsLastYear" -> commonField.setIncomeDividentsLastYear(fieldValue);
-                        case "incomeRentals" -> commonField.setIncomeRentals(fieldValue);
-                        case "incomeRentalsLastYear" -> commonField.setIncomeRentalsLastYear(fieldValue);
-                        case "assetCash" -> commonField.setAssetCash(fieldValue);
-                        case "assetInvestment" -> commonField.setAssetInvestment(fieldValue);
-                        case "assetRealEstate" -> commonField.setAssetRealEstate(fieldValue);
-                        case "assetNetBusinessInterest" -> commonField.setAssetNetBusinessInterest(fieldValue);
-                        case "assetProperties" -> commonField.setAssetProperties(fieldValue);
-                        case "liaLoan" -> commonField.setLiaLoan(fieldValue);
-                        case "liaMargin" -> commonField.setLiaMargin(fieldValue);
-                        case "liaLoanGurantee" -> commonField.setLiaLoanGurantee(fieldValue);
-                        case "liaMortgage" -> commonField.setLiaMortgage(fieldValue);
-                        case "liaOther" -> commonField.setLiaOther(fieldValue);
-
-                        case "fill_30_4" -> commonField.getOthers().put("realEstateAddress1_1", fieldValue);
-                        case "fill_30_4_1" -> commonField.getOthers().put("realEstateAddress1_2", fieldValue);
-                        case "fill_35_2" -> commonField.getOthers().put("realEstateAddress2_1", fieldValue);
-                        case "fill_35_2_1" -> commonField.getOthers().put("realEstateAddress2_2", fieldValue);
-                        case "fill_40_2" -> commonField.getOthers().put("realEstateAddress3_1", fieldValue);
-                        case "fill_40_2_1" -> commonField.getOthers().put("realEstateAddress3_2", fieldValue);
-                        case "fill_31_4" -> commonField.setRealEstatePurchaseDate1(fieldValue);
-                        case "fill_36_2" -> commonField.setRealEstatePurchaseDate2(fieldValue);
-                        case "fill_41_2" -> commonField.setRealEstatePurchaseDate3(fieldValue);
-
-                        /* Page9 End */
-
-                        /* Page10 Start */
-                        case "toggle_3_7" -> commonField.getOthers().put("sourceIncome", fieldValue);
-                        case "toggle_4_6" -> commonField.getOthers().put("sourceBusiness", fieldValue);
-                        case "toggle_6_5" -> commonField.getOthers().put("sourceInvestment", fieldValue);
-                        case "undefined_33" -> commonField.getOthers().put("sourceInheritance", fieldValue);
-                        case "toggle_7_5" -> commonField.getOthers().put("sourceOther", fieldValue);
-                        case "fill_2_9" -> commonField.getOthers().put("sourceOtherDesc", fieldValue);
-                        /* Page10 End */
-                    }
-
-                    /* Special logic Start */
-                    //test the concat 
-                    if( ("date_dd".equals(fieldName) || "date_mm".equals(fieldName) || "date_yyyy".equals(fieldName) ) 
-                        && StringUtils.isNotEmpty(commonField.getDdDateOfBirth()) && StringUtils.isNotEmpty(commonField.getMmDateOfBirth()) && StringUtils.isNotEmpty(commonField.getYyyyDateOfBirth()) ) {
-                        commonField.setDateOfBirth(commonField.getDdDateOfBirth() + "/" +  commonField.getMmDateOfBirth()  + "/" + commonField.getYyyyDateOfBirth());
-                    }
-
-                    if( ("toggle_17_2".equals(fieldName) ) ){
-                        if("Yes".equals(acroForm.getField("toggle_17_2").getValueAsString()) ||"Yes".equals(acroForm.getField("toggle_18").getValueAsString())||"Yes".equals(acroForm.getField("toggle_19").getValueAsString())
-                            || "Yes".equals(acroForm.getField("toggle_20").getValueAsString()) ||"Yes".equals(acroForm.getField("toggle_21").getValueAsString())||"Yes".equals(acroForm.getField("toggle_22").getValueAsString())
-                            || "Yes".equals(acroForm.getField("toggle_23").getValueAsString()) ||"Yes".equals(acroForm.getField("undefined_20").getValueAsString())){
-                                commonField.getOthers().put("hazard", "Yes");
-                            }
-                    }
-                        
-                    /* Special logic End */
+                   IDA(fieldName, fieldValue, commonField, acroForm);
                 }
 
                 if("FNA".equals(formCode)){
-                    //logger.info("FNA ");
-
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "fna_a_name" -> commonField.setName(fieldValue);
-                        case "fna_a_name_1" -> commonField.getOthers().put("name1", fieldValue);
-                        case "fna_a_name_2" -> commonField.getOthers().put("name2", fieldValue);
-
-                        case "fna_a_birth" -> commonField.setDateOfBirth(fieldValue);
-                        case "fna_a_id_card" -> commonField.setIdCard(fieldValue);
-                        case "fna_a_occupation" -> commonField.setOccupation(fieldValue);
-
-                        case "fna_a_life_0" -> commonField.setFna_a_life_0(fieldValue);
-                        case "fna_a_life_less_5" -> commonField.setFna_a_life_less_5(fieldValue);
-                        case "fna_a_life_above_5" -> commonField.setFna_a_life_above_5(fieldValue);
-                        
-                        case "fna_a_primary" -> commonField.setEduPri(fieldValue);
-                        case "fna_a_secondary" -> commonField.setEduSec(fieldValue);
-                        case "fna_a_tertiary" -> commonField.setEduPostSec(fieldValue);
-
-                        case "fna_a_marital" -> commonField.setMaritalStatus(fieldValue);
-                        case "fna_a_contact" -> commonField.setContactNo(fieldValue);
-                        case "fna_a_dependents" -> commonField.setNoOfDependents(fieldValue);
-
-                        case "fna_c1a_amount" -> commonField.setFna_c1a_amount(fieldValue);
-                        case "fna_c1b_amount" -> commonField.setFna_c1b_amount(fieldValue);
-                        case "fna_c1c_1_amount" -> commonField.setFna_c1c_1_amount(fieldValue);
-                        case "fna_c1c_2_amount" -> commonField.setFna_c1c_2_amount(fieldValue);
-                        case "fna_c1c_3_amount" -> commonField.setFna_c1c_3_amount(fieldValue);
-                        case "fna_c1d_amount" -> commonField.setFna_c1d_amount(fieldValue);
-                        case "fna_c2a_amount" -> commonField.setFna_c2a_amount(fieldValue);
-
-                        case "fna_c2a_cash" -> commonField.setFna_c2a_cash(fieldValue);
-                        case "fna_c2a_market_account" -> commonField.setFna_c2a_market_account(fieldValue);
-                        case "fna_c2a_bank_account" -> commonField.setFna_c2a_bank_account(fieldValue);
-                        case "fna_c2a_stocks" -> commonField.setFna_c2a_stocks(fieldValue);
-                        case "fna_c2a_bonds" -> commonField.setFna_c2a_bonds(fieldValue);
-                        case "fna_c2a_us" -> commonField.setFna_c2a_us(fieldValue);
-                        case "fna_c2a_others" -> commonField.setFna_c2a_others(fieldValue);
-                        case "fna_c2a_desc" -> commonField.setFna_c2a_desc(fieldValue);
-                        
-                        case "fna_c2b_amount" -> commonField.setFna_c2b_amount(fieldValue);
-                        case "fna_c2c_amount" -> commonField.setFna_c2c_amount(fieldValue);
-                        case "fna_c2d_amount" -> commonField.setFna_c2d_amount(fieldValue);
-                        case "fna_c2e_amount" -> commonField.setFna_c2e_amount(fieldValue);
-                        case "fna_b1_a" -> commonField.setFna_b1_a(fieldValue);
-                        case "fna_b1_a_amount" -> commonField.setFna_b1_a_amount(fieldValue);
-                        case "fna_b1_b" -> commonField.setFna_b1_b(fieldValue);
-                        case "fna_b1a_4_amount" -> commonField.setFna_b1a_4_amount(fieldValue);
-                        case "fna_b1b_1" -> commonField.setFna_b1b_1(fieldValue);
-                        case "fna_b1b_2" -> commonField.setFna_b1b_2(fieldValue);
-                        case "fna_b1b_3" -> commonField.setFna_b1b_3(fieldValue);
-                        case "fna_b1_c" -> commonField.setFna_b1_c(fieldValue);
-                        case "fna_b1_d" -> commonField.setFna_b1_d(fieldValue);
-                        case "fna_b1_d_year" -> commonField.setFna_b1_d_year(fieldValue);
-                        case "fna_b1_d_amount" -> commonField.setFna_b1_d_amount(fieldValue);
-
-                        /* Page1 End */
-                        /* Page2 Start */
-                        case "fna_b1_e" -> commonField.setFna_b1_e(fieldValue);
-                        case "fna_b1_f" -> commonField.setFna_b1_f(fieldValue);
-                        case "fna_b1_f_other" -> commonField.setFna_b1_f_other(fieldValue);
-                        case "fna_b1_f_desc" -> commonField.setFna_b1_f_desc(fieldValue);
-                        case "fna_b2_a" -> commonField.setFna_b2_a(fieldValue);
-                        case "fna_b2_b" -> commonField.setFna_b2_b(fieldValue);
-                        case "fna_b2_c" -> commonField.setFna_b2_c(fieldValue);
-                        case "fna_b2_d" -> commonField.setFna_b2_d(fieldValue);
-                        case "fna_b2_e" -> commonField.setFna_b2_e(fieldValue);
-                        case "fna_b2_f" -> commonField.setFna_b2_f(fieldValue);
-                        case "fna_b2_g" -> commonField.setFna_b2_g(fieldValue);
-                        /* Page2 End */
-                        /* Page3 Start */
-                       case "fna_c1e_10" -> commonField.setFna_c1e_10(fieldValue);
-                        case "fna_c1e_10_20" -> commonField.setFna_c1e_10_20(fieldValue);
-                        case "fna_c1e_21_30" -> commonField.setFna_c1e_21_30(fieldValue);
-                        case "fna_c1e_31_40" -> commonField.setFna_c1e_31_40(fieldValue);
-                        case "fna_c1e_41_50" -> commonField.setFna_c1e_41_50(fieldValue);
-                        case "fna_c1e_50" -> commonField.setFna_c1e_50(fieldValue);                        
-                        /* Page3 End */
-                        /* Page4 Start */
-                        case "fna_c2f_10" -> commonField.setFna_c2f_10(fieldValue);
-                        case "fna_c2f_10_20" -> commonField.setFna_c2f_10_20(fieldValue);
-                        case "fna_c2f_21_30" -> commonField.setFna_c2f_21_30(fieldValue);
-                        case "fna_c2f_31_40" -> commonField.setFna_c2f_31_40(fieldValue);
-                        case "fna_c2f_41_50" -> commonField.setFna_c2f_41_50(fieldValue);
-                        case "fna_c2f_50" -> commonField.setFna_c2f_50(fieldValue);
-                        /* Page4 End */
-                        /* Page5 End */
-                        case "fna_c3a_2_5" -> commonField.setFna_c3a_2_5(fieldValue);
-                        case "fna_c3a_6_10" -> commonField.setFna_c3a_6_10(fieldValue);
-                        case "fna_c3a_11_15" -> commonField.setFna_c3a_11_15(fieldValue);
-                        case "fna_c3a_16_20" -> commonField.setFna_c3a_16_20(fieldValue);
-                        case "fna_c3a_20" -> commonField.setFna_c3a_20(fieldValue);
-                        case "fna_c3a_life" -> commonField.setFna_c3a_life(fieldValue);
-                        case "fna_c3a_single_pay" -> commonField.setFna_c3a_single_pay(fieldValue);
-                        case "fna_a_retire" -> commonField.setFna_a_retire(fieldValue);
-                        case "fna_c3b_salary" -> commonField.setFna_c3b_salary(fieldValue);
-                        case "fna_c3b_income" -> commonField.setFna_c3b_income(fieldValue);
-                        case "fna_c3b_saving" -> commonField.setFna_c3b_saving(fieldValue);
-                        case "fna_c3b_investments" -> commonField.setFna_c3b_investments(fieldValue);
-                        case "fna_c3b_policy" -> commonField.setFna_c3b_policy(fieldValue);
-                        case "fna_c3b_others" -> commonField.setFna_c3b_others(fieldValue);
-                        case "fna_c3b_desc" -> commonField.setFna_c3b_desc(fieldValue);
-
-                        case "fna_c3c_yes" -> commonField.setFna_c3c_yes(fieldValue);
-                        case "fna_c3c_no" -> commonField.setFna_c3c_no(fieldValue);
-                        /* Page5 End */
-                        /* Page6 Start */
-                        case "fna_d_1" -> commonField.setFna_d_1(fieldValue);
-                        case "fna_d_2" -> commonField.setFna_d_2(fieldValue);
-                        case "fna_d_3" -> commonField.setFna_d_3(fieldValue);
-                        case "fna_d_desc" -> commonField.setFna_d_desc(fieldValue);
-
-                        case "fna_d_b1_1" -> commonField.getOthers().put("recObj1", fieldValue);
-                        case "fna_d_b1_2" -> commonField.getOthers().put("recObj2", fieldValue);
-                        case "fna_d_b1_3" -> commonField.getOthers().put("recObj3", fieldValue);
-                        case "fna_d_b1_4" -> commonField.getOthers().put("recObj4", fieldValue);
-                        case "fna_d_b1_5" -> commonField.getOthers().put("recObj5", fieldValue);
-                        case "fna_d_b1_6" -> commonField.getOthers().put("recObj6", fieldValue);
-
-                        case "fna_d_name_1" -> commonField.getOthers().put("recProd1_1", fieldValue);
-                        case "fna_d_name_1_2" -> commonField.getOthers().put("recProd1_2", fieldValue);
-                        case "fna_d_name_2" -> commonField.getOthers().put("recProd2_1", fieldValue);
-                        case "fna_d_name_2_2" -> commonField.getOthers().put("recProd2_2", fieldValue);
-                        case "fna_d_name_3" -> commonField.getOthers().put("recProd3_2", fieldValue);
-                        case "fna_d_name_3_2" -> commonField.getOthers().put("recProd3_2", fieldValue);
-                        case "fna_d_name_4" -> commonField.getOthers().put("recProd4_1", fieldValue);
-                        case "fna_d_name_4_2" -> commonField.getOthers().put("recProd4_2", fieldValue);
-                        case "fna_d_name_5" -> commonField.getOthers().put("recProd5_1", fieldValue);
-                        case "fna_d_name_5_2" -> commonField.getOthers().put("recProd5_2", fieldValue);
-                        case "fna_d_name_6" -> commonField.getOthers().put("recProd6_1", fieldValue);
-                        case "fna_d_name_6_2" -> commonField.getOthers().put("recProd6_2", fieldValue);
-                        
-                        case "fna_d_product_1" -> commonField.getOthers().put("recSelect1_1", fieldValue);
-                        case "fna_d_product_1_2" -> commonField.getOthers().put("recSelect1_2", fieldValue);
-                        case "fna_d_product_2" -> commonField.getOthers().put("recSelect2_1", fieldValue);
-                        case "fna_d_product_2_2" -> commonField.getOthers().put("recSelect2_2", fieldValue);
-                        case "fna_d_product_3" -> commonField.getOthers().put("recSelect3_1", fieldValue);
-                        case "fna_d_product_3_2" -> commonField.getOthers().put("recSelect3_2", fieldValue);
-                        case "fna_d_product_4" -> commonField.getOthers().put("recSelect4_1", fieldValue);
-                        case "fna_d_product_4_2" -> commonField.getOthers().put("recSelect4_2", fieldValue);
-                        case "fna_d_product_5" -> commonField.getOthers().put("recSelect5_1", fieldValue);
-                        case "fna_d_product_5_2" -> commonField.getOthers().put("recSelect5_2", fieldValue);
-                        case "fna_d_product_6" -> commonField.getOthers().put("recSelect6_1", fieldValue);
-                        case "fna_d_product_6_2" -> commonField.getOthers().put("recSelect6_2", fieldValue);
-                        /* Page6 End */
-                    }
+                    FNA(fieldName, fieldValue, commonField, acroForm);
                 }
 
                 if("HSBCFIN".equals(formCode)){
-                    //logger.info("HSBCFIN ");
-                    
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "fill_3" -> commonField.setName(fieldValue);
-                        case "fill_3_1" -> commonField.getOthers().put("name1", fieldValue);
-                        case "fill_3_2" -> commonField.getOthers().put("name2", fieldValue);
-                        case "fill_4" -> commonField.setNameChi(fieldValue);
-                        case "fill_5" -> commonField.setGender(fieldValue);
-                        case "fill_6" -> commonField.setDateOfBirth(fieldValue);
-
-                        case "fill_7" -> commonField.setMaritalStatus(fieldValue);
-                        case "fill_8" -> commonField.setNoOfDependents(fieldValue);
-                        case "fill_9" -> commonField.setOccupation(fieldValue);
-                        case "fill_10" -> commonField.setContactNo(fieldValue);
-
-                        case "toggle_1" -> commonField.setEduPri(fieldValue);
-                        case "toggle_2" -> commonField.setEduSec(fieldValue);
-                        case "toggle_3" -> commonField.setEduPostSec(fieldValue);
-                        
-                        //case "fill_11" -> {commonField.setFna_c1a_amount(fieldValue);} //commonField.setAnnualIncome(fieldValue); 
-                        case "fill_11" -> {
-                            if(fieldValue != null){
-                                //convert to annual income
-                                commonField.setFna_c1a_amount( String.valueOf(Math.round(NumberUtils.toDouble(fieldValue)/12)) );
-                            }
-                        }
-
-                        case "fill_12" -> {
-                            if(fieldValue != null){
-                                //convert to annual income
-                                commonField.setFna_c1b_amount( String.valueOf(Math.round(NumberUtils.toDouble(fieldValue)/12)) );
-                            }
-                        }
-                        
-                        case "fill_12a" -> commonField.setFna_c1c_3_amount(fieldValue);
-                        case "fill_13" -> commonField.setFna_c1c_1_amount(fieldValue);
-                        case "fill_14" -> commonField.setFna_c1c_2_amount(fieldValue);
-                        case "fill_16" -> commonField.setFna_c1d_amount(fieldValue);
-                        /* Page1 End */
-                        /* Page2 Start */
-                        case "fill_01" -> commonField.setFna_c2a_amount(fieldValue);
-                        case "fill_02" -> commonField.setFna_c2b_amount(fieldValue);
-                        case "fill_03" -> commonField.setFna_c2c_amount(fieldValue);
-                        case "fill_04" -> commonField.setFna_c2d_amount(fieldValue);
-                        case "fill_05" -> commonField.setFna_c2e_amount(fieldValue);
-                        
-                        case "Financial Protection" -> commonField.setFna_b1_a(fieldValue);
-                        case "Preparation" -> commonField.setFna_b1_b(fieldValue);
-                        case "Providing" -> commonField.setFna_b1_c(fieldValue);
-                        case "Saving" -> commonField.setFna_b1_d(fieldValue);
-                        case "Investment" -> commonField.setFna_b1_e(fieldValue);
-                        case "Others" -> commonField.setFna_b1_f(fieldValue);
-                        case "fill_8_2" -> commonField.setFna_b1_f_other(fieldValue);
-                        case "fill_8_21" -> commonField.setFna_b1_f_desc(fieldValue);
-                        /* Page2 End */
-                        /* Page3 Start */
-                        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(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(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(fieldValue);
-
-                        case "fill_98_04" -> commonField.setFna_a_retire(fieldValue);
-                        /* Page4 End */
-                        /* Page5 Start */
-                      
-                        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(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 */
-
-
-                        
-
-                    }
+                    HSBCFIN(fieldName, fieldValue, commonField, acroForm);
                 }
 
-                if("MLFNA_EN".equals(formCode)){                     
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "part1" -> commonField.setName(fieldValue);
-                        case "part2_1a" -> commonField.setFna_b1_a(fieldValue);
-                        case "part2_1a_amount" -> commonField.setFna_b1_a_amount(fieldValue);
-
-                        case "part2_1b" -> commonField.setFna_b1_c(fieldValue);
-
-                        case "part2_1c" -> commonField.setFna_b1_d(fieldValue);
-                        case "part2_1c_amount" -> commonField.setFna_b1_d_amount(fieldValue);                        
-
-                        case "part2_1d" -> commonField.setFna_b1_e(fieldValue);
-
-                        /* exported year? only can one way from FNA b1 d year
-                        case "part2_1c_a" -> commonField.setFna_b2_a(fieldValue);
-                        case "part2_1c_b" -> commonField.setFna_b2_b(fieldValue);
-                        case "part2_1c_c" -> commonField.setFna_b2_c(fieldValue);
-                        case "part2_1c_d" -> commonField.setFna_b2_d(fieldValue);
-                        case "part2_1c_e" -> commonField.setFna_b2_e(fieldValue);
-                        case "part2_1c_f" -> commonField.setFna_b2_f(fieldValue);
-                        case "part2_1c_g" -> commonField.setFna_b2_g(fieldValue);
-                         */
-
-                        case "part2_1d_1" -> commonField.setFna_b1b_1(fieldValue);
-                        case "part2_1d_2" -> commonField.setFna_b1b_2(fieldValue);
-                        case "part2_1d_3" -> commonField.setFna_b1b_3(fieldValue);
-
-                        case "part2_1e" -> commonField.setFna_b1_b(fieldValue);
-
-                        case "part2_1f" -> commonField.setFna_b1_f(fieldValue);
-                        case "part2_1f_desc" -> commonField.setFna_b1_f_other(fieldValue);
-
-                        
-                        case "a Business Earning" -> commonField.setFna_c3b_salary(fieldValue);
-                        case "b Others Please specify" -> commonField.setFna_c3b_income(fieldValue);
-                        case "Check Box15" -> commonField.setFna_c3b_investments(fieldValue);
-                        case "Check Box16" -> commonField.setFna_c3b_others(fieldValue);                        
-                        case "undefined_6" -> commonField.setFna_c3b_desc(fieldValue);
-                        
-                        case "part2_2_a" -> commonField.setFna_b2_a(fieldValue);
-                        case "part2_2_b" -> commonField.setFna_b2_b(fieldValue);
-                        case "part2_2_c" -> commonField.setFna_b2_c(fieldValue);
-                        case "part2_2_d" -> commonField.setFna_b2_d(fieldValue);
-                        case "part2_2_e" -> commonField.setFna_b2_e(fieldValue);
-                        case "part2_2_f" -> commonField.setFna_b2_f(fieldValue);
-                        case "part2_2_g" -> commonField.setFna_b2_g(fieldValue);
-                        /* Page1 End */
-                        /* Page2 Start */
-                        case "part3_3_1" -> commonField.setFna_c1a_amount(fieldValue); //need to /7.78
-                        case "part3_3_2" -> commonField.setFna_c1b_amount(fieldValue); //need to /7.78
-
-                        case "part3_3_4" -> commonField.setFna_c2a_amount(fieldValue); //need to /7.78
-
-                        case "part3_3_5_2a" -> commonField.setFna_c3b_saving(fieldValue);
-                        case "part3_3_5_2b" -> commonField.setFna_c3b_investments(fieldValue);
-                        case "part3_3_5_2c" -> commonField.setFna_c3b_others(fieldValue);
-                        case "part3_3_5_2c_other" -> commonField.setFna_c3b_desc(fieldValue);
-
-                        case "part3_3_6_yes" -> commonField.setFna_c3c_yes(fieldValue);
-                        case "part3_3_6_no" -> commonField.setFna_c3c_no(fieldValue);
-
-                        case "part3_3_6_2" -> commonField.setFna_c1c_3_amount(fieldValue); //monthly!
-
-                        /* Page2 End */
-                        /* Page3 Start */
-                        case "part3_4_4_1a" -> commonField.setFna_c3a_2_5(fieldValue); 
-                        case "part3_4_4_1b" -> commonField.setFna_c3a_6_10(fieldValue); 
-                        case "part3_4_4_1c" -> commonField.setFna_c3a_11_15(fieldValue); 
-                        case "part3_4_4_1d" -> commonField.setFna_c3a_16_20(fieldValue); 
-                        //case "part3_4_4_1e" -> commonField.setFna_c3a_life(fieldValue); 
-                        case "part3_4_4_1f" -> commonField.setFna_c3a_life(fieldValue); 
-                   
-                        case "part3_4_single_pay" -> commonField.setFna_c3a_single_pay(fieldValue); 
-
-                        /* Page3 End */
-
-                    }
+                if("MLFNA_EN".equals(formCode)){    
+                    MLFNA_EN(fieldName, fieldValue, commonField, acroForm);                 
                 }
                 //
 
                 if ("SLFNA_EN".equals(formCode)) {
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "name" -> commonField.setName(fieldValue);
-                        case "date_of_birth" -> commonField.setDateOfBirth(fieldValue);
-                        case "occupation" -> commonField.setOccupation(fieldValue);
-                        case "address1" -> commonField.getOthers().put("address1", fieldValue);
-                        case "address2" -> commonField.getOthers().put("address2", fieldValue);
-                        case "contact" -> commonField.setContactNo(fieldValue);
-                        case "email" -> commonField.setEmail(fieldValue);
-
-                        case "chh1" -> commonField.setEduPri(fieldValue);
-                        case "chh2" -> commonField.setEduSec(fieldValue);
-                        case "chh3" -> commonField.setEduPostSec(fieldValue);
-                        case "chh4" -> commonField.setEduPostSec(fieldValue); //duplicate now
-
-                        case "chh5" -> commonField.setFna_a_life_0(fieldValue);
-                        case "chh6" -> commonField.setFna_a_life_less_5(fieldValue);
-                        case "chh7" -> commonField.setFna_a_life_above_5(fieldValue);
-
-                        case "cb1a" -> commonField.setFna_b1_a(fieldValue);
-                        case "cb1b" -> commonField.setFna_b1_b(fieldValue);
-                        case "cb1c" -> commonField.setFna_b1_c(fieldValue);
-                        case "cb1d" -> commonField.setFna_b1_d(fieldValue);
-                        case "1amount" -> commonField.setFna_b1_d_amount(fieldValue);
-                        case "cb1e" -> commonField.setFna_b1_e(fieldValue);
-                        case "cb1f" -> commonField.setFna_b1_f_other(fieldValue);
-
-                        case "cb10" -> commonField.setFna_b1b_1(fieldValue);
-                        case "cb11" -> commonField.setFna_b1b_2(fieldValue);
-                        case "cb12" -> commonField.setFna_b1b_3(fieldValue);
-                        
-                        case "cb13" -> commonField.setFna_b2_a(fieldValue);
-                        case "cb14" -> commonField.setFna_b2_b(fieldValue);
-                        case "cb15" -> commonField.setFna_b2_c(fieldValue);
-                        case "cb16" -> commonField.setFna_b2_d(fieldValue);
-                        case "cb17" -> commonField.setFna_b2_e(fieldValue);
-                        case "cb18" -> commonField.setFna_b2_f(fieldValue);
-                        case "cb19" -> commonField.setFna_b2_g(fieldValue);
-                        /* Page1 End */
-
-                        /* Page2 Start */                        
-                        case "cb4a1" -> commonField.setFna_c1d_amount(fieldValue); //need to set the check box when get                        
-
-                        case "4a1" -> commonField.setFna_c1d_amount(fieldValue);                        
-                        case "4b1" -> commonField.setFna_c2a_amount(fieldValue);
-                        
-                        case "cb4b1" -> commonField.setFna_c2a_cash(fieldValue);
-                        case "cb4b2" -> commonField.setFna_c2a_bank_account(fieldValue);
-                        case "cb4b3" -> commonField.setFna_c2a_market_account(fieldValue);
-                        case "cb4b4" -> commonField.setFna_c2a_stocks(fieldValue);
-                        case "cb4b5" -> commonField.setFna_c2a_bonds(fieldValue);
-                        case "cb4b6" -> commonField.setFna_c2a_us(fieldValue);
-                        case "cb4b7" -> commonField.setFna_c2a_others(fieldValue);
-                        case "4b2" -> commonField.setFna_c2a_desc(fieldValue);
-
-                        case "4b3" -> commonField.setFna_c2b_amount(fieldValue);
-
-                        case "cb4c1" -> commonField.setFna_c3a_2_5(fieldValue);
-                        case "cb4c2" -> commonField.setFna_c3a_6_10(fieldValue);
-                        case "cb4c3" -> commonField.setFna_c3a_11_15(fieldValue);
-                        case "cb4c4" -> commonField.setFna_c3a_16_20(fieldValue);
-                        case "cb4c5" -> commonField.setFna_c3a_life(fieldValue);
-                        case "cb4c6" -> commonField.setFna_c3a_single_pay(fieldValue);
-
-                        case "cb4d1" -> commonField.setFna_c1e_10(fieldValue);
-                        case "cb4d2" -> commonField.setFna_c1e_10_20(fieldValue);
-                        case "cb4d3" -> commonField.setFna_c1e_21_30(fieldValue);
-                        case "cb4d4" -> commonField.setFna_c1e_31_40(fieldValue);
-                        case "cb4d5" -> commonField.setFna_c1e_41_50(fieldValue);
-                        case "cb4d6" -> commonField.setFna_c1e_50(fieldValue);
-
-                        case "cb4e1" -> commonField.setFna_c3b_salary(fieldValue);
-                        case "cb4e2" -> commonField.setFna_c3b_income(fieldValue);
-                        case "cb4e3" -> commonField.setFna_c3b_investments(fieldValue);
-                        case "cb4e4" -> commonField.setFna_c3b_saving(fieldValue);
-                        case "cb4e5" -> commonField.setFna_c3b_others(fieldValue);
-                        case "4e" -> commonField.setFna_c3b_desc(fieldValue);
-
-                        case "cb4h1" -> commonField.setFna_c3c_yes(fieldValue);
-                        case "cb4h2" -> commonField.setFna_c3c_no(fieldValue);
-                        
-                        /* Page2 End */
-
-
-                        /* Page4 Start */
-                        case "cb6a1" -> commonField.setFna_d_1(fieldValue);
-                        case "cb6a2" -> commonField.setFna_d_3(fieldValue);
-                        case "6a2_other1" -> commonField.setFna_d_desc(fieldValue);
-
-                        case "5obj1" -> commonField.getOthers().put("recObj1", fieldValue);
-                        case "5obj2" -> commonField.getOthers().put("recObj2", fieldValue);
-                        case "5obj3" -> commonField.getOthers().put("recObj3", fieldValue);
-                        case "5obj4" -> commonField.getOthers().put("recObj4", fieldValue);
-                        case "5obj5" -> commonField.getOthers().put("recObj5", fieldValue);
-                        case "5obj6" -> commonField.getOthers().put("recObj6", fieldValue);
-
-                        case "5name1_1" -> commonField.getOthers().put("recProd1_1", fieldValue);
-                        case "5name1_2" -> commonField.getOthers().put("recProd1_2", fieldValue);
-                        case "5name2_1" -> commonField.getOthers().put("recProd2_1", fieldValue);
-                        case "5name2_2" -> commonField.getOthers().put("recProd2_2", fieldValue);
-                        case "5name3_1" -> commonField.getOthers().put("recProd3_2", fieldValue);
-                        case "5name3_2" -> commonField.getOthers().put("recProd3_2", fieldValue);
-                        case "5name4_1" -> commonField.getOthers().put("recProd4_1", fieldValue);
-                        case "5name4_2" -> commonField.getOthers().put("recProd4_2", fieldValue);
-                        case "5name5_1" -> commonField.getOthers().put("recProd5_1", fieldValue);
-                        case "5name5_2" -> commonField.getOthers().put("recProd5_2", fieldValue);
-                        case "5name6_1" -> commonField.getOthers().put("recProd6_1", fieldValue);
-                        case "5name6_2" -> commonField.getOthers().put("recProd6_2", fieldValue);
-                        
-                        case "5slected1_1" -> commonField.getOthers().put("recSelect1_1", fieldValue);
-                        case "5slected1_2" -> commonField.getOthers().put("recSelect1_2", fieldValue);
-                        case "5slected2_1" -> commonField.getOthers().put("recSelect2_1", fieldValue);
-                        case "5slected2_2" -> commonField.getOthers().put("recSelect2_2", fieldValue);
-                        case "5slected3_1" -> commonField.getOthers().put("recSelect3_1", fieldValue);
-                        case "5slected3_2" -> commonField.getOthers().put("recSelect3_2", fieldValue);
-                        case "5slected4_1" -> commonField.getOthers().put("recSelect4_1", fieldValue);
-                        case "5slected4_2" -> commonField.getOthers().put("recSelect4_2", fieldValue);
-                        case "5slected5_1" -> commonField.getOthers().put("recSelect5_1", fieldValue);
-                        case "5slected5_2" -> commonField.getOthers().put("recSelect5_2", fieldValue);
-                        case "5slected6_1" -> commonField.getOthers().put("recSelect6_1", fieldValue);
-                        case "5slected6_2" -> commonField.getOthers().put("recSelect6_2", fieldValue);
-                        /* Page4 End */
-
-                    }
-
-                    /* Special logic Start */
-                    
-                    /* Special logic End */
+                    SLFNA_EN(fieldName, fieldValue, commonField, acroForm);
                 }
 
                 if ("SLAPP".equals(formCode)) {
-                    switch (fieldName) {
-                        /* Page1 Start */
-                        case "1_2_name_ch" -> commonField.setNameChi(fieldValue);
-                        
-                        case "ch1_4_m" -> commonField.setGenderMale(fieldValue);
-                        case "ch1_4_f" -> commonField.setGenderFemale(fieldValue);
-
-                        case "1_6_dd" -> commonField.setDdDateOfBirth(fieldValue);
-                        case "1_6_mm" -> commonField.setMmDateOfBirth(fieldValue);
-                        case "1_6_yyyy" -> commonField.setYyyyDateOfBirth(fieldValue);
-
-                        case "1_7_country" -> commonField.setPlaceOfBirth(fieldValue);
-                        case "1_8" -> commonField.setCountryOfCitizenship(fieldValue);
-                        
-                        //if set countryOfIssue = HK
-                        //tick th 1_10_2 if have value
-                        case "1_10_id_num" -> {
-                            commonField.setIdCard(fieldValue);
-                            commonField.setCountryOfIssue("HK");
-                        }
-
-                        //tick the 1_10_6 if have value
-                        case "1_10_passport_num" -> commonField.setPassportNo(fieldValue);
-
-                        case "1_12_1" -> commonField.setOccupation(fieldValue);
-                        case "1_12_2" -> commonField.setOccupationTitle(fieldValue);
-
-                        case "1_12_5" -> commonField.setFna_c1a_amount(fieldValue);
-                        case "1_12_6" -> commonField.setCompanyName(fieldValue);
-                        
-                        case "1_12_7_1" -> commonField.getOthers().put("companyAddress1", fieldValue);
-                        case "1_12_7_2" -> commonField.getOthers().put("companyAddress2", fieldValue);
-
-                        case "1_12_8_1" -> commonField.setCompanyNature1(fieldValue);
-                        case "1_12_8_2" -> commonField.setCompanyNature2(fieldValue);
-
-                        /*
-                        case "ch1_13_rm" -> commonField.setCrAddressRoom(fieldValue);
-                        case "ch1_13_floor" -> commonField.setCrAddressFloor(fieldValue);
-                        case "ch1_13_block" -> commonField.setCrAddressBlock(fieldValue);
-                        case "ch1_13_building" -> commonField.setCrAddressBuilding(fieldValue);
-                        case "ch1_13_street" -> commonField.setCrAddressStreet(fieldValue);
-                        case "ch1_13_country" -> commonField.setCrAddressCountry(fieldValue);
-                        case "1_13_zip" -> commonField.setCrAddressPostalCode(fieldValue);
-                        
-                        case "ch1_13_corr_rm" -> commonField.setCorAddressRoom(fieldValue);
-                        case "ch1_13_corr_floor" -> commonField.setCorAddressFloor(fieldValue);
-                        case "ch1_13_corr_block" -> commonField.setCorAddressBlock(fieldValue);
-                        case "ch1_13_corr_building" -> commonField.setCorAddressBuilding(fieldValue);
-                        case "ch1_13_corr_street" -> commonField.setCorAddressStreet(fieldValue);
-                        case "ch1_13_corr_zip" -> commonField.setCorAddressPostalCode(fieldValue);
-                         */
-                        case "ch1_13_rm" -> commonField.getOthers().put("crAddressRoom", fieldValue);
-                        case "ch1_13_floor" -> commonField.getOthers().put("crAddressFloor", fieldValue);
-                        case "ch1_13_block" -> commonField.getOthers().put("crAddressBlock", fieldValue);
-                        case "ch1_13_building" -> commonField.getOthers().put("crAddressBuilding", fieldValue);
-                        case "ch1_13_street" -> commonField.getOthers().put("crAddressStreet", fieldValue);
-                        case "ch1_13_country" -> commonField.getOthers().put("crAddressCountry", fieldValue);
-                        case "1_13_zip" -> commonField.getOthers().put("crAddressPostalCode", fieldValue);
-                        case "ch1_13_hk" -> commonField.getOthers().put("crAddressHk", fieldValue);
-                        case "ch1_13_kln" -> commonField.getOthers().put("crAddressKln", fieldValue);
-                        case "ch1_13_nt" -> commonField.getOthers().put("crAddressNt", fieldValue);
-
-                        case "ch1_13_corr_rm" -> commonField.getOthers().put("corAddressRoom", fieldValue);
-                        case "ch1_13_corr_floor" -> commonField.getOthers().put("corAddressFloor", fieldValue);
-                        case "ch1_13_corr_block" -> commonField.getOthers().put("corAddressBlock", fieldValue);
-                        case "ch1_13_corr_building" -> commonField.getOthers().put("corAddressBuilding", fieldValue);
-                        case "ch1_13_corr_street" -> commonField.getOthers().put("corAddressStreet", fieldValue);
-                        case "ch1_13_corr_country" -> commonField.getOthers().put("corAddressCountry", fieldValue);
-                        case "ch1_13_corr_zip" -> commonField.getOthers().put("corAddressPostalCode", fieldValue);
-                        case "ch1_13_corr_hk" -> commonField.getOthers().put("corAddressHk", fieldValue);
-                        case "ch1_13_corr_kln" -> commonField.getOthers().put("corAddressKln", fieldValue);
-                        case "ch1_13_corr_nt" -> commonField.getOthers().put("corAddressNt", fieldValue);
-
-                        case "1_13_tel_mobile" -> commonField.setContactNo(fieldValue);
-
-                        case "1_14d_tax1" -> commonField.setTaxResidency1(fieldValue);
-                        case "1_14d_tax_num1" -> commonField.setTaxPin1(fieldValue);
-                        case "ch1_14d_reason1_a" -> commonField.setTaxReason1("A");
-                        case "ch1_14d_reason1_b" -> commonField.setTaxReason1("B");
-                        case "ch1_14d_reason1_c" -> commonField.setTaxReason1("C");
-                        case "1_14d_explain1" -> commonField.setTaxReasonB1(fieldValue);
-
-                        case "1_14d_tax2" -> commonField.setTaxResidency2(fieldValue);
-                        case "1_14d_tax_num2" -> commonField.setTaxPin2(fieldValue);
-                        case "ch1_14d_reason2_a" -> commonField.setTaxReason2("A");
-                        case "ch1_14d_reason2_b" -> commonField.setTaxReason2("B");
-                        case "ch1_14d_reason2_c" -> commonField.setTaxReason2("C");
-                        case "1_14d_explain2" -> commonField.setTaxReasonB2(fieldValue);
-
-                        case "1_14d_tax3" -> commonField.setTaxResidency3(fieldValue);
-                        case "1_14d_tax_num3" -> commonField.setTaxPin3(fieldValue);
-                        case "ch1_14d_reason3_a" -> commonField.setTaxReason3("A");
-                        case "ch1_14d_reason3_b" -> commonField.setTaxReason3("B");
-                        case "ch1_14d_reason3_c" -> commonField.setTaxReason3("C");
-                        case "1_14d_explain3" -> commonField.setTaxReasonB3(fieldValue);
-
-                        case "ch2_5_1p" -> commonField.setEduPri(fieldValue);
-                        case "ch2_5_1s" -> commonField.setEduSec(fieldValue);
-                        case "ch2_5_1m" -> commonField.setEduPostSec(fieldValue);
-                        case "ch2_5_1u" -> commonField.setEduUni(fieldValue);
-
-                        case "ch2_5_2w" -> commonField.setFna_a_life_0(fieldValue);
-                        case "ch2_5_2_less5" -> commonField.setFna_a_life_less_5(fieldValue);
-                        case "ch2_5_2_5above" -> commonField.setFna_a_life_above_5(fieldValue);
-                        
-                        case "4_1_name1_1" -> commonField.setInsuranceCompany1_1(fieldValue);
-                        case "4_1_name1_2" -> commonField.setInsuranceCompany1_2(fieldValue);
-                        case "4_1_name1_3" -> commonField.setInsuranceCompany1_3(fieldValue);
-                        case "4_1_year1" -> commonField.setInsuranceYear1(fieldValue);
-                        case "4_1_currency1" -> commonField.setInsuranceCurrency1(fieldValue);
-                        case "4_1_sum1" -> commonField.setInsuranceSumInsured1(fieldValue);
-                        case "ch4_1_life" -> {
-                            if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife1("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife1("Off");
-                            }
-                            
-                        }
-                        case "ch4_1_accident" -> {
-                            if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther1("Yes");
-                                    commonField.setInsuranceOtherDesc1("Accident");
-                                }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-                        case "ch4_1_critical" -> {
-                            if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical1("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical1("Off");
-                            }
-                            
-                        }
-                        case "ch4_1_hospital" -> {
-                            if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther1("Yes");
-                                    commonField.setInsuranceOtherDesc1("Hospital");
-                                }else if("On".equals(fieldValue)){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-                        
-                        case "4_1_name2_1" -> commonField.setInsuranceCompany2_1(fieldValue);
-                        case "4_1_name2_2" -> commonField.setInsuranceCompany2_2(fieldValue);
-                        case "4_1_name2_3" -> commonField.setInsuranceCompany2_3(fieldValue);
-                        case "4_1_year2" -> commonField.setInsuranceYear2(fieldValue);
-                        case "4_1_currency2" -> commonField.setInsuranceCurrency2(fieldValue);
-                        case "4_1_sum2" -> commonField.setInsuranceSumInsured2(fieldValue);
-                        case "ch4_2_life" -> {
-                            if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife2("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife2("Off");
-                            }
-                            
-                        }
-                        case "ch4_2_accident" -> {
-                            if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther2("Yes");
-                                    commonField.setInsuranceOtherDesc2("Accident");
-                                }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-                        case "ch4_2_critical" -> {
-                            if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical2("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical2("Off");
-                            }
-                            
-                        }
-                        case "ch4_2_hospital" -> {
-                            if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther2("Yes");
-                                    commonField.setInsuranceOtherDesc2("Hospital");
-                                }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-
-                        case "4_1_name3_1" -> commonField.setInsuranceCompany3_1(fieldValue);
-                        case "4_1_name3_2" -> commonField.setInsuranceCompany3_2(fieldValue);
-                        case "4_1_name3_3" -> commonField.setInsuranceCompany3_3(fieldValue);
-                        case "4_1_year3" -> commonField.setInsuranceYear3(fieldValue);
-                        case "4_1_currency3" -> commonField.setInsuranceCurrency3(fieldValue);
-                        case "4_1_sum3" -> commonField.setInsuranceSumInsured3(fieldValue);
-                        case "ch4_3_life" -> {
-                            if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife3("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
-                                    commonField.setInsuranceLife3("Off");
-                            }
-                            
-                        }
-                        case "ch4_3_accident" -> {
-                            if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther3("Yes");
-                                    commonField.setInsuranceOtherDesc3("Accident");
-                                }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-                        case "ch4_3_critical" -> {
-                            if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical3("Yes");
-                                else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
-                                    commonField.setInsuranceCritical3("Off");
-                            }
-                            
-                        }
-                        case "ch4_3_hospital" -> {
-                            if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
-                                if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
-                                    commonField.setInsuranceOther3("Yes");
-                                    commonField.setInsuranceOtherDesc3("Hospital");
-                                }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
-                                    //commonField.setInsuranceOther1("Off");
-                                    //commonField.setInsuranceOtherDesc1("");
-                                }
-                            }
-                            
-                        }
-                    }
+                    SLAPP(fieldName, fieldValue, commonField, acroForm);
                 }
 
                 if ("HSBCA31".equals(formCode)) {
@@ -3377,68 +2448,1154 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         //logger.info("closed");
     }
 
-    private void HSBCA31(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+    private void IDA(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
         switch (fieldName) {
             /* Page1 Start */
-            case "fill_15" -> commonField.setFirstName(fieldValue);
-            case "fill_16" -> commonField.setGivenName(fieldValue);
-            
-            case "fill_17" -> commonField.setNameChi(fieldValue);
-            
-            case "Text1" -> commonField.setIdCard(fieldValue);
-            case "passportNo" -> commonField.setPassportNo(fieldValue);
-            case "Text12" -> commonField.setCountryOfIssue(fieldValue);
-            case "fill_18" -> commonField.setDateOfBirth(fieldValue);
-            case "Checkk Box6" -> commonField.setGenderMale(fieldValue);
-            case "Check kBox7" -> commonField.setGenderFemale(fieldValue);
+            case "fill_6" -> commonField.setName(fieldValue);
+            case "fill_7" -> commonField.setNameChi(fieldValue);
+            case "fill_11" -> commonField.setIdCard(fieldValue);
+            case "fill_12" -> commonField.setCountryOfIssue(fieldValue);
+            case "fill_13" -> commonField.setPassportNo(fieldValue);
+            case "fill_14_date" -> commonField.getOthers().put("passportExpiryDate", fieldValue);
+            case "fill_15" -> commonField.setPlaceOfBirth(fieldValue);
+            case "fill_16" -> commonField.setCountryOfCitizenship(fieldValue);
 
-            case "fill_19" -> commonField.setCountryOfCitizenship(fieldValue);
-            case "fill_20" -> commonField.setPlaceOfBirth(fieldValue);
+            case "gender_m" -> {
+                commonField.setGenderMale(fieldValue); 
+                if("Yes".equals(fieldValue)) {
+                    commonField.setGender("M");
+                }
+            }
+            case "gender_f" -> {
+                commonField.setGenderFemale(fieldValue); 
+                if("Yes".equals(fieldValue)) {
+                    commonField.setGender("F");
+                }
+            }
+
+            case "date_dd" -> commonField.setDdDateOfBirth(fieldValue);
+            case "date_mm" -> commonField.setMmDateOfBirth(fieldValue);
+            case "date_yyyy" -> commonField.setYyyyDateOfBirth(fieldValue);
+
+            case "fill_17" -> commonField.setContactNo(fieldValue);
+            case "fill_18" -> commonField.setEmail(fieldValue);
+            case "fill_19" -> commonField.getOthers().put("address1", fieldValue);
+            case "fill_19_1" -> commonField.getOthers().put("address2", fieldValue);
+            case "fill_23" -> commonField.getOthers().put("crAddress1", fieldValue);
+            case "fill_23_1" -> commonField.getOthers().put("crAddress2", fieldValue);
+                                    
+            case "edu_pri" -> commonField.setEduPri(fieldValue);
+            case "edu_sec" -> commonField.setEduSec(fieldValue);
+            case "edu_post_sec" -> commonField.setEduPostSec(fieldValue);
             /* Page1 End */
             /* Page2 Start */
-            case "Text16_1" -> commonField.getOthers().put("crAddress1", fieldValue);
-            case "Text16_2" -> commonField.getOthers().put("crAddress2", fieldValue);
+            case "own_income" -> commonField.setOwn_income(fieldValue);
+            case "savings" -> commonField.setSavings(fieldValue);
+            case "premium_financing" -> commonField.setPremium_financing(fieldValue);
+            case "others_funds" -> commonField.setOthers_funds(fieldValue);
+            case "others_funds_desc" -> commonField.setOthers_funds_desc(fieldValue);
 
-            case "address1" -> commonField.getOthers().put("address1", fieldValue);
-            case "address2" -> commonField.getOthers().put("address2", fieldValue);
-
-            case "fill_12" -> commonField.setContactNo(fieldValue);
-            case "Text182" -> commonField.setEmail(fieldValue);
-            case "Check Box175" -> commonField.setEmployedSelf(fieldValue);
-            case "Check Box177" -> commonField.setEmployed(fieldValue);
-            case "Check Box179" -> commonField.setPartTime(fieldValue);
-            case "Check Box181" -> commonField.setEmployedNon(fieldValue);
-            case "Check Box176" -> commonField.setStudent(fieldValue);
-            case "Check Box178" -> commonField.setHomemaker(fieldValue);
-            case "Check Box180" -> commonField.setRetired(fieldValue);
+            
+            case "fill_1_2" -> {
+                commonField.getOthers().put("relateFatherRelation", "Father");
+                commonField.getOthers().put("relateFatherName", fieldValue);
+            }
+            case "fill_2_2" -> commonField.getOthers().put("relateFatherAge", fieldValue);
+            case "fill_6_2" -> {
+                commonField.getOthers().put("relateMotherRelation", "Mother");
+                commonField.getOthers().put("relateMotherName", fieldValue);
+            }
+            case "fill_7_2" -> commonField.getOthers().put("relateMotherAge", fieldValue);
+            case "fill_11_2" -> {
+                commonField.getOthers().put("relateSpouseRelation", "Spouse");
+                commonField.getOthers().put("relateSpouseName", fieldValue);
+            }
+            case "fill_12_2" -> commonField.getOthers().put("relateSpouseAge", fieldValue);
+            case "fill_16_2" -> {
+                commonField.getOthers().put("relateSonRelation", "Son");
+                commonField.getOthers().put("relateSonName", fieldValue);
+            }
+            case "fill_17_2" -> commonField.getOthers().put("relateSonAge", fieldValue);
+            case "fill_21_2" -> {
+                commonField.getOthers().put("relateSonRelation", "Daughter");
+                commonField.getOthers().put("relateSonName", fieldValue);
+            }
+            case "fill_22_2" -> commonField.getOthers().put("relateSonAge", fieldValue);
+            case "fill_26" -> {
+                commonField.getOthers().put("relateBotherRelation", "Bother");
+                commonField.getOthers().put("relateBotherName", fieldValue);
+            }
+            case "fill_27" -> commonField.getOthers().put("relateBotherAge", fieldValue);
+            case "fill_31" -> {
+                commonField.getOthers().put("relateSisterRelation", "Sister");
+                commonField.getOthers().put("relateSisterName", fieldValue);
+            }
+            case "fill_32" -> commonField.getOthers().put("relateSisterAge", fieldValue);
+            
 
-            case "Text174" -> commonField.setCompanyName(fieldValue);
-            case "Text173_1" -> commonField.setCompanyNature1(fieldValue);
-            case "Text173_2" -> commonField.setCompanyNature2(fieldValue);
-            case "fill_16_2" -> commonField.setOccupationTitle(fieldValue);
-            case "fill_17_1" -> commonField.getOthers().put("companyAddress1", fieldValue);
-            case "fill_17_2" -> commonField.getOthers().put("companyAddress2", fieldValue);
             /* Page2 End */
             /* Page3 Start */
-            case "undefined_51" -> commonField.setContactNo(fieldValue);
-            /* Page3 End */
-            /* Page12 Start */
-            case "undefined_17ha_1" -> commonField.setInsuranceCompany1_1(fieldValue);
-            case "undefined_17ha_2" -> commonField.setInsuranceCompany1_2(fieldValue);
-            case "undefined_17ha_3" -> commonField.setInsuranceCompany1_3(fieldValue);
-            case "undefined_17hk" -> commonField.setInsuranceSumInsured1(fieldValue);
-            case "undefined_17hl" -> commonField.setInsuranceYear1(fieldValue);
+            case "toggle_3_2" -> commonField.setBankruptYes(fieldValue);
+            case "toggle_6_2" -> commonField.setBankruptNo(fieldValue);
+            case "fill_18_1" -> commonField.setBankruptNo(fieldValue);
+
+            case "fill_3_3" -> commonField.getOthers().put("travelCity1",fieldValue);
+            case "fill_6_3" -> commonField.getOthers().put("travelCity2",fieldValue);
+            case "fill_9_3" -> commonField.getOthers().put("travelCity3",fieldValue);
+            case "fill_5_3" -> commonField.getOthers().put("travelPurpose1",fieldValue);
+            case "fill_7_3" -> commonField.getOthers().put("travelPurpose2",fieldValue);
+            case "fill_10_3" -> commonField.getOthers().put("travelPurpose3",fieldValue);
+            case "fill_4_3" -> commonField.getOthers().put("travelFrequency1",fieldValue);
+            case "fill_8_3" -> commonField.getOthers().put("travelFrequency2",fieldValue);
+            case "fill_11_3" -> commonField.getOthers().put("travelFrequency3",fieldValue);
 
-            case "undefined_17hn_1" -> commonField.setInsuranceCompany2_1(fieldValue);
-            case "undefined_17hn_2" -> commonField.setInsuranceCompany2_2(fieldValue);
-            case "undefined_17hn_3" -> commonField.setInsuranceCompany2_3(fieldValue);
-            case "undefined_17ho" -> commonField.setInsuranceSumInsured1(fieldValue);
-            case "undefined_17hp" -> commonField.setInsuranceYear1(fieldValue);
+            /* Page3 End */
+            /* Page4 Start */
+            case "toggle_1_3" -> commonField.getOthers().put("futureAddressYes", fieldValue);
+            case "toggle_2_2" -> commonField.getOthers().put("futureAddressNo", fieldValue);
+            case "fill_1_4_1" -> commonField.getOthers().put("futureAddress", fieldValue);
+            //case "fill_1_4_2" -> commonField.getOthers().put("futureAddress2", fieldValue);
+            case "fill_2_4" -> commonField.getOthers().put("futureAddressReasonHowLong", fieldValue);
+
+            case "toggle_3_3" -> commonField.getOthers().put("futureAddressReturnYes", fieldValue);
+            case "toggle_4_3" -> commonField.getOthers().put("futureAddressReturnNo", fieldValue);
+            case "toggle_5_3" -> commonField.getOthers().put("futureAddressReturnNa", fieldValue);
+
+            case "fill_3_4" -> commonField.getOthers().put("travelNextCity1", fieldValue);
+            case "fill_6_4" -> commonField.getOthers().put("travelNextCity2", fieldValue);
+            case "fill_9_4" -> commonField.getOthers().put("travelNextCity3", fieldValue);
+            case "fill_5_4" -> commonField.getOthers().put("travelNextPurpose1", fieldValue);
+            case "fill_8_4" -> commonField.getOthers().put("travelNextPurpose2", fieldValue);
+            case "fill_11_4" -> commonField.getOthers().put("travelNextPurpose3", fieldValue);
+            case "fill_4_4" -> commonField.getOthers().put("travelNextFrequency1", fieldValue);
+            case "fill_7_4" -> commonField.getOthers().put("travelNextFrequency2", fieldValue);
+            case "fill_10_4" -> commonField.getOthers().put("travelNextFrequency3", fieldValue);
+
+            /* Page4 End */
+            /* Page5 Start */                        
+            case "toggle_3_4" -> commonField.getOthers().put("pendingChargeYes", fieldValue);
+            case "undefined_11" -> commonField.getOthers().put("pendingChargeNo", fieldValue);
+
+            case "tobaccoYes" -> commonField.setTobarccoYes(fieldValue);
+            case "tobaccoNo" -> commonField.setTobarccoNo(fieldValue);
+            
+            case "hazardousActivity" -> commonField.setHazardousActivity(fieldValue);
+            
+
+            /* Page5 End */
+            /* Page6 Start */
+            case "fill_8_country_1" -> commonField.setTaxResidency1(fieldValue);
+            case "fill_1_6" -> commonField.setTaxPin1(fieldValue);
+            case "fill_2_6" -> commonField.setTaxReason1(fieldValue);
+            case "fill_3_6" -> commonField.setTaxReasonB1(fieldValue);
+            case "fill_8_country_2" -> commonField.setTaxResidency2(fieldValue);
+            case "fill_4_5" -> commonField.setTaxPin2(fieldValue);
+            case "fill_5_6" -> commonField.setTaxReason2(fieldValue);
+            case "fill_6_6" -> commonField.setTaxReasonB2(fieldValue);
+            case "fill_8_country_3" -> commonField.setTaxResidency3(fieldValue);
+            case "fill_7_6" -> commonField.setTaxPin3(fieldValue);
+            case "fill_8_6" -> commonField.setTaxReason3(fieldValue);
+            case "fill_9_6" -> commonField.setTaxReasonB3(fieldValue);
+            /* Page7 Start */
+            case "fill_11_7" -> commonField.setInsuranceCompany1_1(fieldValue);
+            case "fill_11_7_1" -> commonField.setInsuranceCompany1_2(fieldValue);
+            case "fill_11_7_2" -> commonField.setInsuranceCompany1_3(fieldValue);
+            case "fill_12_7_1" -> {
+                commonField.getOthers().put("insuranceSumInsured1_1", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured1_1") != null && !commonField.getOthers().get("insuranceSumInsured1_1").isBlank()){
+                    commonField.setInsuranceCurrency1("USD");
+                }
+            }
+            case "fill_12_7_2" -> {
+                commonField.getOthers().put("insuranceSumInsured1_2", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured1_2") != null && !commonField.getOthers().get("insuranceSumInsured1_2").isBlank()){
+                    commonField.setInsuranceCurrency1("USD");
+                }
+            }
+            case "fill_12_7_3" -> {
+                commonField.getOthers().put("insuranceSumInsured1_3", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured1_3") != null && !commonField.getOthers().get("insuranceSumInsured1_3").isBlank()){
+                    commonField.setInsuranceCurrency1("USD");
+                }
+            }
+            case "toggle_3_5" -> commonField.setInsuranceLife1(fieldValue);
+            case "toggle_4_4" -> commonField.setInsuranceSaving1(fieldValue);
+            case "toggle_5_5" -> commonField.setInsuranceCritical1(fieldValue);
+            case "toggle_6_3" -> commonField.setInsuranceOther1(fieldValue);
+            case "undefined_21" -> commonField.setInsuranceOtherDesc1(fieldValue);
+            case "fill_1_7" -> commonField.setInsuranceYear1(fieldValue);
+
+            case "fill_13_7" -> commonField.setInsuranceCompany2_1(fieldValue);
+            case "fill_13_7_1" -> commonField.setInsuranceCompany2_2(fieldValue);
+            case "fill_13_7_2" -> commonField.setInsuranceCompany2_3(fieldValue);
+            case "fill_14_7_1" -> {
+                commonField.getOthers().put("insuranceSumInsured2_1", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured2_1") != null && !commonField.getOthers().get("insuranceSumInsured2_1").isBlank()){
+                    commonField.setInsuranceCurrency2("USD");
+                }
+            }
+            case "fill_14_7_2" -> {
+                commonField.getOthers().put("insuranceSumInsured2_2", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured2_2") != null && !commonField.getOthers().get("insuranceSumInsured2_2").isBlank()){
+                    commonField.setInsuranceCurrency2("USD");
+                }
+            }
+            case "fill_14_7_3" -> {
+                commonField.getOthers().put("insuranceSumInsured2_3", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured2_3") != null && !commonField.getOthers().get("insuranceSumInsured2_3").isBlank()){
+                    commonField.setInsuranceCurrency2("USD");
+                }
+            }
+            case "toggle_9_3" -> commonField.setInsuranceLife2(fieldValue);
+            case "toggle_10_3" -> commonField.setInsuranceSaving2(fieldValue);
+            case "toggle_11_3" -> commonField.setInsuranceCritical2(fieldValue);
+            case "toggle_12_2" -> commonField.setInsuranceOther2(fieldValue);
+            case "undefined_22" -> commonField.setInsuranceOtherDesc2(fieldValue);
+            case "fill_3_7" -> commonField.setInsuranceYear2(fieldValue);
+
+
+            case "fill_15_7" -> commonField.setInsuranceCompany3_1(fieldValue);
+            case "fill_15_7_1" -> commonField.setInsuranceCompany3_2(fieldValue);
+            case "fill_15_7_2" -> commonField.setInsuranceCompany3_3(fieldValue);
+            case "fill_16_7_1" -> {
+                commonField.getOthers().put("insuranceSumInsured3_1", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured3_1") != null && !commonField.getOthers().get("insuranceSumInsured3_1").isBlank()){
+                    commonField.setInsuranceCurrency3("USD");
+                }
+            }
+            case "fill_16_7_2" -> {
+                commonField.getOthers().put("insuranceSumInsured3_2", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured3_2") != null && !commonField.getOthers().get("insuranceSumInsured3_2").isBlank()){
+                    commonField.setInsuranceCurrency3("USD");
+                }
+            }
+            case "fill_16_7_3" -> {
+                commonField.getOthers().put("insuranceSumInsured2_3", fieldValue);
+
+                if(commonField.getOthers().get("insuranceSumInsured3_3") != null && !commonField.getOthers().get("insuranceSumInsured3_3").isBlank()){
+                    commonField.setInsuranceCurrency3("USD");
+                }
+            }
+            case "toggle_15" -> commonField.setInsuranceLife3(fieldValue);
+            case "toggle_16_2" -> commonField.setInsuranceSaving3(fieldValue);
+            case "toggle_17_3" -> commonField.setInsuranceCritical3(fieldValue);
+            case "toggle_18_2" -> commonField.setInsuranceOther3(fieldValue);
+            case "undefined_23" -> commonField.setInsuranceOtherDesc3(fieldValue);
+            case "fill_5_7" -> commonField.setInsuranceYear3(fieldValue);
+
+            case "ultimateTotalLife" -> commonField.setUltimateTotalLife(fieldValue);
+
+            case "declinedYes" -> commonField.setDeclinedYes(fieldValue);
+            case "declinedNo" -> commonField.setDeclinedNo(fieldValue);
+            case "declinedDesc" -> commonField.setDeclinedDesc(fieldValue);
+
+            case "replaceInsuranceYes" -> commonField.setReplaceInsuranceYes(fieldValue);
+            case "replaceInsuranceNo" -> commonField.setReplaceInsuranceNo(fieldValue);
+            
+            /* Page7 End */
+            /* Page8 Start */
+            case "employed" -> commonField.setEmployed(fieldValue);
+            case "homemaker" -> commonField.setHomemaker(fieldValue);
+            case "student" -> commonField.setStudent(fieldValue);
+            case "investor" -> commonField.setInvestor(fieldValue);
+            case "retired" -> commonField.setRetired(fieldValue);
+
+            case "fill_3_8" -> commonField.setOccupationTitle(fieldValue);
+            case "fill_4_6_1" -> commonField.setCompanyName(fieldValue);
+            case "fill_4_6_2" -> commonField.getOthers().put("companyAddress1", fieldValue);
+            case "fill_4_6_3" -> commonField.getOthers().put("companyAddress2", fieldValue);
+            case "fill_5_8_1" -> commonField.setCompanyNature1(fieldValue);
+            case "fill_5_8_2" -> commonField.setCompanyNature2(fieldValue);
+
+            case "toggle_6_4" -> commonField.getOthers().put("businessOwnerYes", fieldValue);
+            case "fill_22_5" -> commonField.getOthers().put("businessOwnerPercent", fieldValue);
+            case "fill_25_3" -> commonField.getOthers().put("businessOwnerNoEmployee", fieldValue);
+
+            /* Page8 End */
+            /* Page9 Start */
+            //case "fill_26_4" -> commonField.setFna_c1a_amount(fieldValue);
+            case "totalAnnualIncome" -> commonField.setTotalAnnualIncome(fieldValue);
+            
+            case "totalLiquidAsset" -> commonField.setFna_c2a_amount(fieldValue);
+            case "totalLiquidLia" -> commonField.setFna_c2b_amount(fieldValue);
+
+            case "incomeSalary" -> commonField.setIncomeSalary(fieldValue);
+            case "incomeSalaryLastYear" -> commonField.setIncomeSalaryLastYear(fieldValue);
+            case "incomeBonus" -> commonField.setIncomeBonus(fieldValue);
+            case "incomeBonusLastYear" -> commonField.setIncomeBonusLastYear(fieldValue);
+            case "incomeOther" -> commonField.setIncomeOther(fieldValue);
+            case "incomeOtherLastYear" -> commonField.setIncomeOtherLastYear(fieldValue);
+            case "incomeInterest" -> commonField.setIncomeInterest(fieldValue);
+            case "incomeInterestLastYear" -> commonField.setIncomeInterestLastYear(fieldValue);
+            case "incomeDividents" -> commonField.setIncomeDividents(fieldValue);
+            case "incomeDividentsLastYear" -> commonField.setIncomeDividentsLastYear(fieldValue);
+            case "incomeRentals" -> commonField.setIncomeRentals(fieldValue);
+            case "incomeRentalsLastYear" -> commonField.setIncomeRentalsLastYear(fieldValue);
+            case "assetCash" -> commonField.setAssetCash(fieldValue);
+            case "assetInvestment" -> commonField.setAssetInvestment(fieldValue);
+            case "assetRealEstate" -> commonField.setAssetRealEstate(fieldValue);
+            case "assetNetBusinessInterest" -> commonField.setAssetNetBusinessInterest(fieldValue);
+            case "assetProperties" -> commonField.setAssetProperties(fieldValue);
+            case "liaLoan" -> commonField.setLiaLoan(fieldValue);
+            case "liaMargin" -> commonField.setLiaMargin(fieldValue);
+            case "liaLoanGurantee" -> commonField.setLiaLoanGurantee(fieldValue);
+            case "liaMortgage" -> commonField.setLiaMortgage(fieldValue);
+            case "liaOther" -> commonField.setLiaOther(fieldValue);
+
+            case "fill_30_4" -> commonField.getOthers().put("realEstateAddress1_1", fieldValue);
+            case "fill_30_4_1" -> commonField.getOthers().put("realEstateAddress1_2", fieldValue);
+            case "fill_35_2" -> commonField.getOthers().put("realEstateAddress2_1", fieldValue);
+            case "fill_35_2_1" -> commonField.getOthers().put("realEstateAddress2_2", fieldValue);
+            case "fill_40_2" -> commonField.getOthers().put("realEstateAddress3_1", fieldValue);
+            case "fill_40_2_1" -> commonField.getOthers().put("realEstateAddress3_2", fieldValue);
+            case "fill_31_4" -> commonField.setRealEstatePurchaseDate1(fieldValue);
+            case "fill_36_2" -> commonField.setRealEstatePurchaseDate2(fieldValue);
+            case "fill_41_2" -> commonField.setRealEstatePurchaseDate3(fieldValue);
+
+            /* Page9 End */
+
+            /* Page10 Start */
+            case "toggle_3_7" -> commonField.getOthers().put("sourceIncome", fieldValue);
+            case "toggle_4_6" -> commonField.getOthers().put("sourceBusiness", fieldValue);
+            case "toggle_6_5" -> commonField.getOthers().put("sourceInvestment", fieldValue);
+            case "undefined_33" -> commonField.getOthers().put("sourceInheritance", fieldValue);
+            case "toggle_7_5" -> commonField.getOthers().put("sourceOther", fieldValue);
+            case "fill_2_9" -> commonField.getOthers().put("sourceOtherDesc", fieldValue);
+            /* Page10 End */
+        }
+
+        /* Special logic Start */
+        //test the concat 
+        if( ("date_dd".equals(fieldName) || "date_mm".equals(fieldName) || "date_yyyy".equals(fieldName) ) 
+            && StringUtils.isNotEmpty(commonField.getDdDateOfBirth()) && StringUtils.isNotEmpty(commonField.getMmDateOfBirth()) && StringUtils.isNotEmpty(commonField.getYyyyDateOfBirth()) ) {
+            commonField.setDateOfBirth(commonField.getDdDateOfBirth() + "/" +  commonField.getMmDateOfBirth()  + "/" + commonField.getYyyyDateOfBirth());
+        }
+
+        if( ("toggle_17_2".equals(fieldName) ) ){
+            if("Yes".equals(acroForm.getField("toggle_17_2").getValueAsString()) ||"Yes".equals(acroForm.getField("toggle_18").getValueAsString())||"Yes".equals(acroForm.getField("toggle_19").getValueAsString())
+                || "Yes".equals(acroForm.getField("toggle_20").getValueAsString()) ||"Yes".equals(acroForm.getField("toggle_21").getValueAsString())||"Yes".equals(acroForm.getField("toggle_22").getValueAsString())
+                || "Yes".equals(acroForm.getField("toggle_23").getValueAsString()) ||"Yes".equals(acroForm.getField("undefined_20").getValueAsString())){
+                    commonField.getOthers().put("hazard", "Yes");
+                }
+        }
+            
+        /* Special logic End */
+    } 
+
+    private void FNA(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "fna_a_name" -> commonField.setName(fieldValue);
+            //case "fna_a_name_1" -> commonField.getOthers().put("name1", fieldValue);
+            //case "fna_a_name_2" -> commonField.getOthers().put("name2", fieldValue);
+
+            case "fna_a_birth" -> commonField.setDateOfBirth(fieldValue);
+            case "fna_a_id_card" -> commonField.setIdCard(fieldValue);
+            case "fna_a_occupation" -> commonField.setOccupationTitle(fieldValue);
+
+            case "fna_a_life_0" -> commonField.setFna_a_life_0(fieldValue);
+            case "fna_a_life_less_5" -> commonField.setFna_a_life_less_5(fieldValue);
+            case "fna_a_life_above_5" -> commonField.setFna_a_life_above_5(fieldValue);
+            
+            case "fna_a_primary" -> commonField.setEduPri(fieldValue);
+            case "fna_a_secondary" -> commonField.setEduSec(fieldValue);
+            case "fna_a_tertiary" -> commonField.setEduPostSec(fieldValue);
+
+            case "fna_a_marital" -> commonField.setMaritalStatus(fieldValue);
+            case "fna_a_contact" -> commonField.setContactNo(fieldValue);
+            case "fna_a_dependents" -> commonField.setNoOfDependents(fieldValue);
+
+            case "fna_c1a_amount" -> commonField.setTotalAnnualIncome(fieldValue);
+            case "fna_c1b_amount" -> commonField.setFna_c1b_amount(fieldValue);
+            case "fna_c1c_1_amount" -> commonField.setFna_c1c_1_amount(fieldValue);
+            case "fna_c1c_2_amount" -> commonField.setFna_c1c_2_amount(fieldValue);
+            case "fna_c1c_3_amount" -> commonField.setFna_c1c_3_amount(fieldValue);
+            case "fna_c1d_amount" -> commonField.setFna_c1d_amount(fieldValue);
+            case "fna_c2a_amount" -> commonField.setFna_c2a_amount(fieldValue);
+
+            case "fna_c2a_cash" -> commonField.setFna_c2a_cash(fieldValue);
+            case "fna_c2a_market_account" -> commonField.setFna_c2a_market_account(fieldValue);
+            case "fna_c2a_bank_account" -> commonField.setFna_c2a_bank_account(fieldValue);
+            case "fna_c2a_stocks" -> commonField.setFna_c2a_stocks(fieldValue);
+            case "fna_c2a_bonds" -> commonField.setFna_c2a_bonds(fieldValue);
+            case "fna_c2a_us" -> commonField.setFna_c2a_us(fieldValue);
+            case "fna_c2a_others" -> commonField.setFna_c2a_others(fieldValue);
+            case "fna_c2a_desc" -> commonField.setFna_c2a_desc(fieldValue);
+            
+            case "fna_c2b_amount" -> commonField.setFna_c2b_amount(fieldValue);
+            case "fna_c2c_amount" -> commonField.setFna_c2c_amount(fieldValue);
+            case "fna_c2d_amount" -> commonField.setFna_c2d_amount(fieldValue);
+            case "fna_c2e_amount" -> commonField.setFna_c2e_amount(fieldValue);
+            case "fna_b1_a" -> commonField.setFna_b1_a(fieldValue);
+            case "fna_b1_a_amount" -> commonField.setFna_b1_a_amount(fieldValue);
+            case "fna_b1_b" -> commonField.setFna_b1_b(fieldValue);
+            case "fna_b1a_4_amount" -> commonField.setFna_b1a_4_amount(fieldValue);
+            case "fna_b1b_1" -> commonField.setFna_b1b_1(fieldValue);
+            case "fna_b1b_2" -> commonField.setFna_b1b_2(fieldValue);
+            case "fna_b1b_3" -> commonField.setFna_b1b_3(fieldValue);
+            case "fna_b1_c" -> commonField.setFna_b1_c(fieldValue);
+            case "fna_b1_d" -> commonField.setFna_b1_d(fieldValue);
+            case "fna_b1_d_year" -> commonField.setFna_b1_d_year(fieldValue);
+            case "fna_b1_d_amount" -> commonField.setFna_b1_d_amount(fieldValue);
+
+            /* Page1 End */
+            /* Page2 Start */
+            case "fna_b1_e" -> commonField.setFna_b1_e(fieldValue);
+            case "fna_b1_f" -> commonField.setFna_b1_f(fieldValue);
+            case "fna_b1_f_other" -> commonField.setFna_b1_f_other(fieldValue);
+            case "fna_b1_f_desc" -> commonField.setFna_b1_f_desc(fieldValue);
+            case "fna_b2_a" -> commonField.setFna_b2_a(fieldValue);
+            case "fna_b2_b" -> commonField.setFna_b2_b(fieldValue);
+            case "fna_b2_c" -> commonField.setFna_b2_c(fieldValue);
+            case "fna_b2_d" -> commonField.setFna_b2_d(fieldValue);
+            case "fna_b2_e" -> commonField.setFna_b2_e(fieldValue);
+            case "fna_b2_f" -> commonField.setFna_b2_f(fieldValue);
+            case "fna_b2_g" -> commonField.setFna_b2_g(fieldValue);
+            /* Page2 End */
+            /* Page3 Start */
+            case "fna_c1e_10" -> commonField.setFna_c1e_10(fieldValue);
+            case "fna_c1e_10_20" -> commonField.setFna_c1e_10_20(fieldValue);
+            case "fna_c1e_21_30" -> commonField.setFna_c1e_21_30(fieldValue);
+            case "fna_c1e_31_40" -> commonField.setFna_c1e_31_40(fieldValue);
+            case "fna_c1e_41_50" -> commonField.setFna_c1e_41_50(fieldValue);
+            case "fna_c1e_50" -> commonField.setFna_c1e_50(fieldValue);                        
+            /* Page3 End */
+            /* Page4 Start */
+            case "fna_c2f_10" -> commonField.setFna_c2f_10(fieldValue);
+            case "fna_c2f_10_20" -> commonField.setFna_c2f_10_20(fieldValue);
+            case "fna_c2f_21_30" -> commonField.setFna_c2f_21_30(fieldValue);
+            case "fna_c2f_31_40" -> commonField.setFna_c2f_31_40(fieldValue);
+            case "fna_c2f_41_50" -> commonField.setFna_c2f_41_50(fieldValue);
+            case "fna_c2f_50" -> commonField.setFna_c2f_50(fieldValue);
+            /* Page4 End */
+            /* Page5 End */
+            case "fna_c3a_2_5" -> commonField.setFna_c3a_2_5(fieldValue);
+            case "fna_c3a_6_10" -> commonField.setFna_c3a_6_10(fieldValue);
+            case "fna_c3a_11_15" -> commonField.setFna_c3a_11_15(fieldValue);
+            case "fna_c3a_16_20" -> commonField.setFna_c3a_16_20(fieldValue);
+            case "fna_c3a_20" -> commonField.setFna_c3a_20(fieldValue);
+            case "fna_c3a_life" -> commonField.setFna_c3a_life(fieldValue);
+            case "fna_c3a_single_pay" -> commonField.setFna_c3a_single_pay(fieldValue);
+            case "fna_a_retire" -> commonField.setFna_a_retire(fieldValue);
+            case "fna_c3b_salary" -> commonField.setFna_c3b_salary(fieldValue);
+            case "fna_c3b_income" -> commonField.setFna_c3b_income(fieldValue);
+            case "fna_c3b_saving" -> commonField.setFna_c3b_saving(fieldValue);
+            case "fna_c3b_investments" -> commonField.setFna_c3b_investments(fieldValue);
+            case "fna_c3b_policy" -> commonField.setFna_c3b_policy(fieldValue);
+            case "fna_c3b_others" -> commonField.setFna_c3b_others(fieldValue);
+            case "fna_c3b_desc" -> commonField.setFna_c3b_desc(fieldValue);
+
+            case "fna_c3c_yes" -> commonField.setFna_c3c_yes(fieldValue);
+            case "fna_c3c_no" -> commonField.setFna_c3c_no(fieldValue);
+            /* Page5 End */
+            /* Page6 Start */
+            case "fna_d_1" -> commonField.setFna_d_1(fieldValue);
+            case "fna_d_2" -> commonField.setFna_d_2(fieldValue);
+            case "fna_d_3" -> commonField.setFna_d_3(fieldValue);
+            case "fna_d_desc" -> commonField.setFna_d_desc(fieldValue);
+
+            case "fna_d_b1_1" -> commonField.getOthers().put("recObj1", fieldValue);
+            case "fna_d_b1_2" -> commonField.getOthers().put("recObj2", fieldValue);
+            case "fna_d_b1_3" -> commonField.getOthers().put("recObj3", fieldValue);
+            case "fna_d_b1_4" -> commonField.getOthers().put("recObj4", fieldValue);
+            case "fna_d_b1_5" -> commonField.getOthers().put("recObj5", fieldValue);
+            case "fna_d_b1_6" -> commonField.getOthers().put("recObj6", fieldValue);
+
+            case "fna_d_name_1" -> commonField.getOthers().put("recProd1_1", fieldValue);
+            case "fna_d_name_1_2" -> commonField.getOthers().put("recProd1_2", fieldValue);
+            case "fna_d_name_2" -> commonField.getOthers().put("recProd2_1", fieldValue);
+            case "fna_d_name_2_2" -> commonField.getOthers().put("recProd2_2", fieldValue);
+            case "fna_d_name_3" -> commonField.getOthers().put("recProd3_2", fieldValue);
+            case "fna_d_name_3_2" -> commonField.getOthers().put("recProd3_2", fieldValue);
+            case "fna_d_name_4" -> commonField.getOthers().put("recProd4_1", fieldValue);
+            case "fna_d_name_4_2" -> commonField.getOthers().put("recProd4_2", fieldValue);
+            case "fna_d_name_5" -> commonField.getOthers().put("recProd5_1", fieldValue);
+            case "fna_d_name_5_2" -> commonField.getOthers().put("recProd5_2", fieldValue);
+            case "fna_d_name_6" -> commonField.getOthers().put("recProd6_1", fieldValue);
+            case "fna_d_name_6_2" -> commonField.getOthers().put("recProd6_2", fieldValue);
+            
+            case "fna_d_product_1" -> commonField.getOthers().put("recSelect1_1", fieldValue);
+            case "fna_d_product_1_2" -> commonField.getOthers().put("recSelect1_2", fieldValue);
+            case "fna_d_product_2" -> commonField.getOthers().put("recSelect2_1", fieldValue);
+            case "fna_d_product_2_2" -> commonField.getOthers().put("recSelect2_2", fieldValue);
+            case "fna_d_product_3" -> commonField.getOthers().put("recSelect3_1", fieldValue);
+            case "fna_d_product_3_2" -> commonField.getOthers().put("recSelect3_2", fieldValue);
+            case "fna_d_product_4" -> commonField.getOthers().put("recSelect4_1", fieldValue);
+            case "fna_d_product_4_2" -> commonField.getOthers().put("recSelect4_2", fieldValue);
+            case "fna_d_product_5" -> commonField.getOthers().put("recSelect5_1", fieldValue);
+            case "fna_d_product_5_2" -> commonField.getOthers().put("recSelect5_2", fieldValue);
+            case "fna_d_product_6" -> commonField.getOthers().put("recSelect6_1", fieldValue);
+            case "fna_d_product_6_2" -> commonField.getOthers().put("recSelect6_2", fieldValue);
+            /* Page6 End */
+        }
+    }
+
+    private void HSBCFIN(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "fill_3" -> commonField.setName(fieldValue);
+            //case "fill_3_1" -> commonField.getOthers().put("name1", fieldValue);
+            //case "fill_3_2" -> commonField.getOthers().put("name2", fieldValue);
+            case "fill_4" -> commonField.setNameChi(fieldValue);
+            case "fill_5" -> commonField.setGender(fieldValue);
+            case "fill_6" -> commonField.setDateOfBirth(fieldValue);
+
+            case "fill_7" -> commonField.setMaritalStatus(fieldValue);
+            case "fill_8" -> commonField.setNoOfDependents(fieldValue);
+            case "fill_9" -> commonField.setOccupationTitle(fieldValue);
+            case "fill_10" -> commonField.setContactNo(fieldValue);
+
+            case "toggle_1" -> commonField.setEduPri(fieldValue);
+            case "toggle_2" -> commonField.setEduSec(fieldValue);
+            case "toggle_3" -> commonField.setEduPostSec(fieldValue);
+            
+            case "fill_11" -> {
+                if(fieldValue != null){
+                    //convert to annual income
+                    //commonField.setFna_c1a_amount( String.valueOf(Math.round(NumberUtils.toDouble(fieldValue)/12)) );
+                }
+            }
+
+            case "fill_12" -> {
+                if(fieldValue != null){
+                    //convert to annual income
+                    commonField.setFna_c1b_amount( String.valueOf(Math.round(NumberUtils.toDouble(fieldValue)/12)) );
+                }
+            }
+            
+            case "fill_12a" -> commonField.setFna_c1c_3_amount(fieldValue);
+            case "fill_13" -> commonField.setFna_c1c_1_amount(fieldValue);
+            case "fill_14" -> commonField.setFna_c1c_2_amount(fieldValue);
+            case "fill_16" -> commonField.setFna_c1d_amount(fieldValue);
+            /* Page1 End */
+            /* Page2 Start */
+            case "fill_01" -> commonField.setFna_c2a_amount(fieldValue);
+            case "fill_02" -> commonField.setFna_c2b_amount(fieldValue);
+            case "fill_03" -> commonField.setFna_c2c_amount(fieldValue);
+            case "fill_04" -> commonField.setFna_c2d_amount(fieldValue);
+            case "fill_05" -> commonField.setFna_c2e_amount(fieldValue);
+            
+            case "Financial Protection" -> commonField.setFna_b1_a(fieldValue);
+            case "Preparation" -> commonField.setFna_b1_b(fieldValue);
+            case "Providing" -> commonField.setFna_b1_c(fieldValue);
+            case "Saving" -> commonField.setFna_b1_d(fieldValue);
+            case "Investment" -> commonField.setFna_b1_e(fieldValue);
+            case "Others" -> commonField.setFna_b1_f(fieldValue);
+            case "fill_8_2" -> commonField.setFna_b1_f_other(fieldValue);
+            case "fill_8_21" -> commonField.setFna_b1_f_desc(fieldValue);
+            /* Page2 End */
+            /* Page3 Start */
+            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(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(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(fieldValue);
+
+            case "fill_98_04" -> commonField.setFna_a_retire(fieldValue);
+            /* Page4 End */
+            /* Page5 Start */
+            
+            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(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 */
+
+
+            
+
+        }
+    }
+
+    private void MLFNA_EN(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "part1" -> commonField.setName(fieldValue);
+            case "part2_1a" -> commonField.setFna_b1_a(fieldValue);
+            case "part2_1a_amount" -> commonField.setFna_b1_a_amount(fieldValue);
+
+            case "part2_1b" -> commonField.setFna_b1_c(fieldValue);
+
+            case "part2_1c" -> commonField.setFna_b1_d(fieldValue);
+            case "part2_1c_amount" -> commonField.setFna_b1_d_amount(fieldValue);                        
+
+            case "part2_1d" -> commonField.setFna_b1_e(fieldValue);
+
+            /* exported year? only can one way from FNA b1 d year
+            case "part2_1c_a" -> commonField.setFna_b2_a(fieldValue);
+            case "part2_1c_b" -> commonField.setFna_b2_b(fieldValue);
+            case "part2_1c_c" -> commonField.setFna_b2_c(fieldValue);
+            case "part2_1c_d" -> commonField.setFna_b2_d(fieldValue);
+            case "part2_1c_e" -> commonField.setFna_b2_e(fieldValue);
+            case "part2_1c_f" -> commonField.setFna_b2_f(fieldValue);
+            case "part2_1c_g" -> commonField.setFna_b2_g(fieldValue);
+                */
+
+            case "part2_1d_1" -> commonField.setFna_b1b_1(fieldValue);
+            case "part2_1d_2" -> commonField.setFna_b1b_2(fieldValue);
+            case "part2_1d_3" -> commonField.setFna_b1b_3(fieldValue);
+
+            case "part2_1e" -> commonField.setFna_b1_b(fieldValue);
+
+            case "part2_1f" -> commonField.setFna_b1_f(fieldValue);
+            case "part2_1f_desc" -> commonField.setFna_b1_f_other(fieldValue);
+
+            
+            case "a Business Earning" -> commonField.setFna_c3b_salary(fieldValue);
+            case "b Others Please specify" -> commonField.setFna_c3b_income(fieldValue);
+            case "Check Box15" -> commonField.setFna_c3b_investments(fieldValue);
+            case "Check Box16" -> commonField.setFna_c3b_others(fieldValue);                        
+            case "undefined_6" -> commonField.setFna_c3b_desc(fieldValue);
+            
+            case "part2_2_a" -> commonField.setFna_b2_a(fieldValue);
+            case "part2_2_b" -> commonField.setFna_b2_b(fieldValue);
+            case "part2_2_c" -> commonField.setFna_b2_c(fieldValue);
+            case "part2_2_d" -> commonField.setFna_b2_d(fieldValue);
+            case "part2_2_e" -> commonField.setFna_b2_e(fieldValue);
+            case "part2_2_f" -> commonField.setFna_b2_f(fieldValue);
+            case "part2_2_g" -> commonField.setFna_b2_g(fieldValue);
+            /* Page1 End */
+            /* Page2 Start */
+            case "part3_3_1" -> commonField.setTotalAnnualIncome(fieldValue); //need to /7.78
+            case "part3_3_2" -> commonField.setFna_c1b_amount(fieldValue); //need to /7.78
+
+            case "part3_3_4" -> commonField.setFna_c2a_amount(fieldValue); //need to /7.78
+
+            case "part3_3_5_2a" -> commonField.setFna_c3b_saving(fieldValue);
+            case "part3_3_5_2b" -> commonField.setFna_c3b_investments(fieldValue);
+            case "part3_3_5_2c" -> commonField.setFna_c3b_others(fieldValue);
+            case "part3_3_5_2c_other" -> commonField.setFna_c3b_desc(fieldValue);
+
+            case "part3_3_6_yes" -> commonField.setFna_c3c_yes(fieldValue);
+            case "part3_3_6_no" -> commonField.setFna_c3c_no(fieldValue);
+
+            case "part3_3_6_2" -> commonField.setFna_c1c_3_amount(fieldValue); //monthly!
+
+            /* Page2 End */
+            /* Page3 Start */
+            case "part3_4_4_1a" -> commonField.setFna_c3a_2_5(fieldValue); 
+            case "part3_4_4_1b" -> commonField.setFna_c3a_6_10(fieldValue); 
+            case "part3_4_4_1c" -> commonField.setFna_c3a_11_15(fieldValue); 
+            case "part3_4_4_1d" -> commonField.setFna_c3a_16_20(fieldValue); 
+            //case "part3_4_4_1e" -> commonField.setFna_c3a_life(fieldValue); 
+            case "part3_4_4_1f" -> commonField.setFna_c3a_life(fieldValue); 
+        
+            case "part3_4_single_pay" -> commonField.setFna_c3a_single_pay(fieldValue); 
+
+            /* Page3 End */
+
+        }
+    }
+
+    private void SLFNA_EN(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "name" -> commonField.setName(fieldValue);
+            case "date_of_birth" -> commonField.setDateOfBirth(fieldValue);
+            case "occupation" -> commonField.setOccupationTitle(fieldValue);
+            case "address1" -> commonField.getOthers().put("address1", fieldValue);
+            case "address2" -> commonField.getOthers().put("address2", fieldValue);
+            case "contact" -> commonField.setContactNo(fieldValue);
+            case "email" -> commonField.setEmail(fieldValue);
+
+            case "chh1" -> commonField.setEduPri(fieldValue);
+            case "chh2" -> commonField.setEduSec(fieldValue);
+            case "chh3" -> commonField.setEduPostSec(fieldValue);
+            case "chh4" -> commonField.setEduPostSec(fieldValue); //duplicate now
+
+            case "chh5" -> commonField.setFna_a_life_0(fieldValue);
+            case "chh6" -> commonField.setFna_a_life_less_5(fieldValue);
+            case "chh7" -> commonField.setFna_a_life_above_5(fieldValue);
+
+            case "cb1a" -> commonField.setFna_b1_a(fieldValue);
+            case "cb1b" -> commonField.setFna_b1_b(fieldValue);
+            case "cb1c" -> commonField.setFna_b1_c(fieldValue);
+            case "cb1d" -> commonField.setFna_b1_d(fieldValue);
+            case "1amount" -> commonField.setFna_b1_d_amount(fieldValue);
+            case "cb1e" -> commonField.setFna_b1_e(fieldValue);
+            case "cb1f" -> commonField.setFna_b1_f_other(fieldValue);
+
+            case "cb10" -> commonField.setFna_b1b_1(fieldValue);
+            case "cb11" -> commonField.setFna_b1b_2(fieldValue);
+            case "cb12" -> commonField.setFna_b1b_3(fieldValue);
+            
+            case "cb13" -> commonField.setFna_b2_a(fieldValue);
+            case "cb14" -> commonField.setFna_b2_b(fieldValue);
+            case "cb15" -> commonField.setFna_b2_c(fieldValue);
+            case "cb16" -> commonField.setFna_b2_d(fieldValue);
+            case "cb17" -> commonField.setFna_b2_e(fieldValue);
+            case "cb18" -> commonField.setFna_b2_f(fieldValue);
+            case "cb19" -> commonField.setFna_b2_g(fieldValue);
+            /* Page1 End */
+
+            /* Page2 Start */                        
+            case "cb4a1" -> commonField.setFna_c1d_amount(fieldValue); //need to set the check box when get                        
+
+            case "4a1" -> commonField.setFna_c1d_amount(fieldValue);                        
+            case "4b1" -> commonField.setFna_c2a_amount(fieldValue);
+            
+            case "cb4b1" -> commonField.setFna_c2a_cash(fieldValue);
+            case "cb4b2" -> commonField.setFna_c2a_bank_account(fieldValue);
+            case "cb4b3" -> commonField.setFna_c2a_market_account(fieldValue);
+            case "cb4b4" -> commonField.setFna_c2a_stocks(fieldValue);
+            case "cb4b5" -> commonField.setFna_c2a_bonds(fieldValue);
+            case "cb4b6" -> commonField.setFna_c2a_us(fieldValue);
+            case "cb4b7" -> commonField.setFna_c2a_others(fieldValue);
+            case "4b2" -> commonField.setFna_c2a_desc(fieldValue);
+
+            case "4b3" -> commonField.setFna_c2b_amount(fieldValue);
+
+            case "cb4c1" -> commonField.setFna_c3a_2_5(fieldValue);
+            case "cb4c2" -> commonField.setFna_c3a_6_10(fieldValue);
+            case "cb4c3" -> commonField.setFna_c3a_11_15(fieldValue);
+            case "cb4c4" -> commonField.setFna_c3a_16_20(fieldValue);
+            case "cb4c5" -> commonField.setFna_c3a_life(fieldValue);
+            case "cb4c6" -> commonField.setFna_c3a_single_pay(fieldValue);
+
+            case "cb4d1" -> commonField.setFna_c1e_10(fieldValue);
+            case "cb4d2" -> commonField.setFna_c1e_10_20(fieldValue);
+            case "cb4d3" -> commonField.setFna_c1e_21_30(fieldValue);
+            case "cb4d4" -> commonField.setFna_c1e_31_40(fieldValue);
+            case "cb4d5" -> commonField.setFna_c1e_41_50(fieldValue);
+            case "cb4d6" -> commonField.setFna_c1e_50(fieldValue);
+
+            case "cb4e1" -> commonField.setFna_c3b_salary(fieldValue);
+            case "cb4e2" -> commonField.setFna_c3b_income(fieldValue);
+            case "cb4e3" -> commonField.setFna_c3b_investments(fieldValue);
+            case "cb4e4" -> commonField.setFna_c3b_saving(fieldValue);
+            case "cb4e5" -> commonField.setFna_c3b_others(fieldValue);
+            case "4e" -> commonField.setFna_c3b_desc(fieldValue);
+
+            case "cb4h1" -> commonField.setFna_c3c_yes(fieldValue);
+            case "cb4h2" -> commonField.setFna_c3c_no(fieldValue);
+            
+            /* Page2 End */
+
+
+            /* Page4 Start */
+            case "cb6a1" -> commonField.setFna_d_1(fieldValue);
+            case "cb6a2" -> commonField.setFna_d_3(fieldValue);
+            case "6a2_other1" -> commonField.setFna_d_desc(fieldValue);
+
+            case "5obj1" -> commonField.getOthers().put("recObj1", fieldValue);
+            case "5obj2" -> commonField.getOthers().put("recObj2", fieldValue);
+            case "5obj3" -> commonField.getOthers().put("recObj3", fieldValue);
+            case "5obj4" -> commonField.getOthers().put("recObj4", fieldValue);
+            case "5obj5" -> commonField.getOthers().put("recObj5", fieldValue);
+            case "5obj6" -> commonField.getOthers().put("recObj6", fieldValue);
+
+            case "5name1_1" -> commonField.getOthers().put("recProd1_1", fieldValue);
+            case "5name1_2" -> commonField.getOthers().put("recProd1_2", fieldValue);
+            case "5name2_1" -> commonField.getOthers().put("recProd2_1", fieldValue);
+            case "5name2_2" -> commonField.getOthers().put("recProd2_2", fieldValue);
+            case "5name3_1" -> commonField.getOthers().put("recProd3_2", fieldValue);
+            case "5name3_2" -> commonField.getOthers().put("recProd3_2", fieldValue);
+            case "5name4_1" -> commonField.getOthers().put("recProd4_1", fieldValue);
+            case "5name4_2" -> commonField.getOthers().put("recProd4_2", fieldValue);
+            case "5name5_1" -> commonField.getOthers().put("recProd5_1", fieldValue);
+            case "5name5_2" -> commonField.getOthers().put("recProd5_2", fieldValue);
+            case "5name6_1" -> commonField.getOthers().put("recProd6_1", fieldValue);
+            case "5name6_2" -> commonField.getOthers().put("recProd6_2", fieldValue);
+            
+            case "5slected1_1" -> commonField.getOthers().put("recSelect1_1", fieldValue);
+            case "5slected1_2" -> commonField.getOthers().put("recSelect1_2", fieldValue);
+            case "5slected2_1" -> commonField.getOthers().put("recSelect2_1", fieldValue);
+            case "5slected2_2" -> commonField.getOthers().put("recSelect2_2", fieldValue);
+            case "5slected3_1" -> commonField.getOthers().put("recSelect3_1", fieldValue);
+            case "5slected3_2" -> commonField.getOthers().put("recSelect3_2", fieldValue);
+            case "5slected4_1" -> commonField.getOthers().put("recSelect4_1", fieldValue);
+            case "5slected4_2" -> commonField.getOthers().put("recSelect4_2", fieldValue);
+            case "5slected5_1" -> commonField.getOthers().put("recSelect5_1", fieldValue);
+            case "5slected5_2" -> commonField.getOthers().put("recSelect5_2", fieldValue);
+            case "5slected6_1" -> commonField.getOthers().put("recSelect6_1", fieldValue);
+            case "5slected6_2" -> commonField.getOthers().put("recSelect6_2", fieldValue);
+            /* Page4 End */
+
+        }
+
+        /* Special logic Start */
+        
+        /* Special logic End */
+    }
+
+    private void SLAPP(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "1_2_name_ch" -> commonField.setNameChi(fieldValue);
+            
+            case "ch1_4_m" -> commonField.setGenderMale(fieldValue);
+            case "ch1_4_f" -> commonField.setGenderFemale(fieldValue);
+
+            case "1_6_dd" -> commonField.setDdDateOfBirth(fieldValue);
+            case "1_6_mm" -> commonField.setMmDateOfBirth(fieldValue);
+            case "1_6_yyyy" -> commonField.setYyyyDateOfBirth(fieldValue);
+
+            case "1_7_country" -> commonField.setPlaceOfBirth(fieldValue);
+            case "1_8" -> commonField.setCountryOfCitizenship(fieldValue);
+            
+            //if set countryOfIssue = HK
+            //tick th 1_10_2 if have value
+            case "1_10_id_num" -> {
+                commonField.setIdCard(fieldValue);
+                commonField.setCountryOfIssue("HK");
+            }
+
+            //tick the 1_10_6 if have value
+            case "1_10_passport_num" -> commonField.setPassportNo(fieldValue);
+
+            case "1_12_1" -> commonField.setOccupation(fieldValue);
+            case "1_12_2" -> commonField.setOccupationTitle(fieldValue);
+
+            //case "1_12_5" -> commonField.setFna_c1a_amount(fieldValue);
+            case "1_12_6" -> commonField.setCompanyName(fieldValue);
+            
+            case "1_12_7_1" -> commonField.getOthers().put("companyAddress1", fieldValue);
+            case "1_12_7_2" -> commonField.getOthers().put("companyAddress2", fieldValue);
+
+            case "1_12_8_1" -> commonField.setCompanyNature1(fieldValue);
+            case "1_12_8_2" -> commonField.setCompanyNature2(fieldValue);
+
+            /*
+            case "ch1_13_rm" -> commonField.setCrAddressRoom(fieldValue);
+            case "ch1_13_floor" -> commonField.setCrAddressFloor(fieldValue);
+            case "ch1_13_block" -> commonField.setCrAddressBlock(fieldValue);
+            case "ch1_13_building" -> commonField.setCrAddressBuilding(fieldValue);
+            case "ch1_13_street" -> commonField.setCrAddressStreet(fieldValue);
+            case "ch1_13_country" -> commonField.setCrAddressCountry(fieldValue);
+            case "1_13_zip" -> commonField.setCrAddressPostalCode(fieldValue);
+            
+            case "ch1_13_corr_rm" -> commonField.setCorAddressRoom(fieldValue);
+            case "ch1_13_corr_floor" -> commonField.setCorAddressFloor(fieldValue);
+            case "ch1_13_corr_block" -> commonField.setCorAddressBlock(fieldValue);
+            case "ch1_13_corr_building" -> commonField.setCorAddressBuilding(fieldValue);
+            case "ch1_13_corr_street" -> commonField.setCorAddressStreet(fieldValue);
+            case "ch1_13_corr_zip" -> commonField.setCorAddressPostalCode(fieldValue);
+                */
+            case "ch1_13_rm" -> commonField.getOthers().put("crAddressRoom", fieldValue);
+            case "ch1_13_floor" -> commonField.getOthers().put("crAddressFloor", fieldValue);
+            case "ch1_13_block" -> commonField.getOthers().put("crAddressBlock", fieldValue);
+            case "ch1_13_building" -> commonField.getOthers().put("crAddressBuilding", fieldValue);
+            case "ch1_13_street" -> commonField.getOthers().put("crAddressStreet", fieldValue);
+            case "ch1_13_country" -> commonField.getOthers().put("crAddressCountry", fieldValue);
+            case "1_13_zip" -> commonField.getOthers().put("crAddressPostalCode", fieldValue);
+            case "ch1_13_hk" -> commonField.getOthers().put("crAddressHk", fieldValue);
+            case "ch1_13_kln" -> commonField.getOthers().put("crAddressKln", fieldValue);
+            case "ch1_13_nt" -> commonField.getOthers().put("crAddressNt", fieldValue);
+
+            case "ch1_13_corr_rm" -> commonField.getOthers().put("corAddressRoom", fieldValue);
+            case "ch1_13_corr_floor" -> commonField.getOthers().put("corAddressFloor", fieldValue);
+            case "ch1_13_corr_block" -> commonField.getOthers().put("corAddressBlock", fieldValue);
+            case "ch1_13_corr_building" -> commonField.getOthers().put("corAddressBuilding", fieldValue);
+            case "ch1_13_corr_street" -> commonField.getOthers().put("corAddressStreet", fieldValue);
+            case "ch1_13_corr_country" -> commonField.getOthers().put("corAddressCountry", fieldValue);
+            case "ch1_13_corr_zip" -> commonField.getOthers().put("corAddressPostalCode", fieldValue);
+            case "ch1_13_corr_hk" -> commonField.getOthers().put("corAddressHk", fieldValue);
+            case "ch1_13_corr_kln" -> commonField.getOthers().put("corAddressKln", fieldValue);
+            case "ch1_13_corr_nt" -> commonField.getOthers().put("corAddressNt", fieldValue);
+
+            case "1_13_tel_mobile" -> commonField.setContactNo(fieldValue);
+
+            case "1_14d_tax1" -> commonField.setTaxResidency1(fieldValue);
+            case "1_14d_tax_num1" -> commonField.setTaxPin1(fieldValue);
+            case "ch1_14d_reason1_a" -> commonField.setTaxReason1("A");
+            case "ch1_14d_reason1_b" -> commonField.setTaxReason1("B");
+            case "ch1_14d_reason1_c" -> commonField.setTaxReason1("C");
+            case "1_14d_explain1" -> commonField.setTaxReasonB1(fieldValue);
+
+            case "1_14d_tax2" -> commonField.setTaxResidency2(fieldValue);
+            case "1_14d_tax_num2" -> commonField.setTaxPin2(fieldValue);
+            case "ch1_14d_reason2_a" -> commonField.setTaxReason2("A");
+            case "ch1_14d_reason2_b" -> commonField.setTaxReason2("B");
+            case "ch1_14d_reason2_c" -> commonField.setTaxReason2("C");
+            case "1_14d_explain2" -> commonField.setTaxReasonB2(fieldValue);
+
+            case "1_14d_tax3" -> commonField.setTaxResidency3(fieldValue);
+            case "1_14d_tax_num3" -> commonField.setTaxPin3(fieldValue);
+            case "ch1_14d_reason3_a" -> commonField.setTaxReason3("A");
+            case "ch1_14d_reason3_b" -> commonField.setTaxReason3("B");
+            case "ch1_14d_reason3_c" -> commonField.setTaxReason3("C");
+            case "1_14d_explain3" -> commonField.setTaxReasonB3(fieldValue);
+
+            case "ch2_5_1p" -> commonField.setEduPri(fieldValue);
+            case "ch2_5_1s" -> commonField.setEduSec(fieldValue);
+            case "ch2_5_1m" -> commonField.setEduPostSec(fieldValue);
+            case "ch2_5_1u" -> commonField.setEduUni(fieldValue);
+
+            case "ch2_5_2w" -> commonField.setFna_a_life_0(fieldValue);
+            case "ch2_5_2_less5" -> commonField.setFna_a_life_less_5(fieldValue);
+            case "ch2_5_2_5above" -> commonField.setFna_a_life_above_5(fieldValue);
+            
+            case "4_1_name1_1" -> commonField.setInsuranceCompany1_1(fieldValue);
+            case "4_1_name1_2" -> commonField.setInsuranceCompany1_2(fieldValue);
+            case "4_1_name1_3" -> commonField.setInsuranceCompany1_3(fieldValue);
+            case "4_1_year1" -> commonField.setInsuranceYear1(fieldValue);
+            case "4_1_currency1" -> commonField.setInsuranceCurrency1(fieldValue);
+            case "4_1_sum1_1" -> commonField.getOthers().put("insuranceSumInsured1_1", fieldValue);
+            case "4_1_sum1_2" -> commonField.getOthers().put("insuranceSumInsured1_2", fieldValue);
+            case "4_1_sum1_3" -> commonField.getOthers().put("insuranceSumInsured1_3", fieldValue);
+            case "ch4_1_life" -> {
+                if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
+                        commonField.setInsuranceLife1("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
+                        commonField.setInsuranceLife1("Off");
+                }
+                
+            }
+            case "ch4_1_accident" -> {
+                if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther1("Yes");
+                        commonField.setInsuranceOtherDesc1("Accident");
+                    }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+            case "ch4_1_critical" -> {
+                if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical1("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical1("Off");
+                }
+                
+            }
+            case "ch4_1_hospital" -> {
+                if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther1("Yes");
+                        commonField.setInsuranceOtherDesc1("Hospital");
+                    }else if("On".equals(fieldValue)){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+            
+            case "4_1_name2_1" -> commonField.setInsuranceCompany2_1(fieldValue);
+            case "4_1_name2_2" -> commonField.setInsuranceCompany2_2(fieldValue);
+            case "4_1_name2_3" -> commonField.setInsuranceCompany2_3(fieldValue);
+            case "4_1_year2" -> commonField.setInsuranceYear2(fieldValue);
+            case "4_1_currency2" -> commonField.setInsuranceCurrency2(fieldValue);
+            case "4_1_sum2_1" -> commonField.getOthers().put("insuranceSumInsured2_1", fieldValue);
+            case "4_1_sum2_2" -> commonField.getOthers().put("insuranceSumInsured2_2", fieldValue);
+            case "4_1_sum2_3" -> commonField.getOthers().put("insuranceSumInsured12_3", fieldValue);
+            case "ch4_2_life" -> {
+                if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
+                        commonField.setInsuranceLife2("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
+                        commonField.setInsuranceLife2("Off");
+                }
+                
+            }
+            case "ch4_2_accident" -> {
+                if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther2("Yes");
+                        commonField.setInsuranceOtherDesc2("Accident");
+                    }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+            case "ch4_2_critical" -> {
+                if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical2("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical2("Off");
+                }
+                
+            }
+            case "ch4_2_hospital" -> {
+                if(acroForm.getField("4_1_sum2").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther2("Yes");
+                        commonField.setInsuranceOtherDesc2("Hospital");
+                    }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum2").getValueAsString().isBlank()){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+
+            case "4_1_name3_1" -> commonField.setInsuranceCompany3_1(fieldValue);
+            case "4_1_name3_2" -> commonField.setInsuranceCompany3_2(fieldValue);
+            case "4_1_name3_3" -> commonField.setInsuranceCompany3_3(fieldValue);
+            case "4_1_year3" -> commonField.setInsuranceYear3(fieldValue);
+            case "4_1_currency3" -> commonField.setInsuranceCurrency3(fieldValue);
+            case "4_1_sum3_1" -> commonField.getOthers().put("insuranceSumInsured3_1", fieldValue);
+            case "4_1_sum3_2" -> commonField.getOthers().put("insuranceSumInsured3_2", fieldValue);
+            case "4_1_sum3_3" -> commonField.getOthers().put("insuranceSumInsured3_3", fieldValue);
+            case "ch4_3_life" -> {
+                if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
+                        commonField.setInsuranceLife3("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
+                        commonField.setInsuranceLife3("Off");
+                }
+                
+            }
+            case "ch4_3_accident" -> {
+                if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther3("Yes");
+                        commonField.setInsuranceOtherDesc3("Accident");
+                    }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+            case "ch4_3_critical" -> {
+                if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical3("Yes");
+                    else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank())
+                        commonField.setInsuranceCritical3("Off");
+                }
+                
+            }
+            case "ch4_3_hospital" -> {
+                if(acroForm.getField("4_1_sum3").getValueAsString() != null ){
+                    if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
+                        commonField.setInsuranceOther3("Yes");
+                        commonField.setInsuranceOtherDesc3("Hospital");
+                    }else if("On".equals(fieldValue) && !acroForm.getField("4_1_sum3").getValueAsString().isBlank()){
+                        //commonField.setInsuranceOther1("Off");
+                        //commonField.setInsuranceOtherDesc1("");
+                    }
+                }
+                
+            }
+        }
+    }
+
+    private void HSBCA31(String fieldName, String fieldValue, CommonField commonField,PDAcroForm acroForm){
+        switch (fieldName) {
+            /* Page1 Start */
+            case "fill_15" -> commonField.setFirstName(fieldValue);
+            case "fill_16" -> commonField.setGivenName(fieldValue);
+            
+            case "fill_17" -> commonField.setNameChi(fieldValue);
+            
+            case "Text1" -> commonField.setIdCard(fieldValue);
+            case "passportNo" -> commonField.setPassportNo(fieldValue);
+            case "Text12" -> commonField.setCountryOfIssue(fieldValue);
+            case "fill_18" -> commonField.setDateOfBirth(fieldValue);
+            case "Checkk Box6" -> commonField.setGenderMale(fieldValue);
+            case "Check kBox7" -> commonField.setGenderFemale(fieldValue);
+
+            case "fill_19" -> commonField.setCountryOfCitizenship(fieldValue);
+            case "fill_20" -> commonField.setPlaceOfBirth(fieldValue);
+            /* Page1 End */
+            /* Page2 Start */
+            case "Text16_1" -> commonField.getOthers().put("crAddress1", fieldValue);
+            case "Text16_2" -> commonField.getOthers().put("crAddress2", fieldValue);
+
+            case "address1" -> commonField.getOthers().put("address1", fieldValue);
+            case "address2" -> commonField.getOthers().put("address2", fieldValue);
+
+            //case "undefined_6" -> commonField.setContactNo(fieldValue);
+
+            case "Text182" -> commonField.setEmail(fieldValue);
+            case "Check Box175" -> commonField.setEmployedSelf(fieldValue);
+            case "Check Box177" -> commonField.setEmployed(fieldValue);
+            case "Check Box179" -> commonField.setPartTime(fieldValue);
+            case "Check Box181" -> commonField.setEmployedNon(fieldValue);
+            case "Check Box176" -> commonField.setStudent(fieldValue);
+            case "Check Box178" -> commonField.setHomemaker(fieldValue);
+            case "Check Box180" -> commonField.setRetired(fieldValue);
+
+            case "Text174" -> commonField.setCompanyName(fieldValue);
+            case "Text173_1" -> commonField.setCompanyNature1(fieldValue);
+            case "Text173_2" -> commonField.setCompanyNature2(fieldValue);
+            case "fill_16_2" -> commonField.setOccupationTitle(fieldValue);
+            case "fill_17_1" -> commonField.getOthers().put("companyAddress1", fieldValue);
+            case "fill_17_2" -> commonField.getOthers().put("companyAddress2", fieldValue);
+            /* Page2 End */
+            /* Page3 Start */
+            //case "undefined_51" -> commonField.setContactNo(fieldValue);
+            /* Page3 End */
+            /* Page12 Start */
+            case "undefined_17ha_1" -> commonField.setInsuranceCompany1_1(fieldValue);
+            case "undefined_17ha_2" -> commonField.setInsuranceCompany1_2(fieldValue);
+            //case "undefined_17ha_3" -> commonField.setInsuranceCompany1_3(fieldValue);
+            case "undefined_17hk_1" -> commonField.getOthers().put("insuranceSumInsured1_1", fieldValue);
+            case "undefined_17hk_2" -> commonField.getOthers().put("insuranceSumInsured1_2", fieldValue);
+            //case "undefined_17hk_3" -> commonField.getOthers().put("insuranceSumInsured1_3", fieldValue);
+
+            case "undefined_17hl" -> commonField.setInsuranceYear1(fieldValue);
+
+            case "undefined_17hn_1" -> commonField.setInsuranceCompany2_1(fieldValue);
+            case "undefined_17hn_2" -> commonField.setInsuranceCompany2_2(fieldValue);
+            //case "undefined_17hn_3" -> commonField.setInsuranceCompany2_3(fieldValue);
+            case "undefined_17ho_1" -> commonField.getOthers().put("insuranceSumInsured2_1", fieldValue);
+            case "undefined_17ho_2" -> commonField.getOthers().put("insuranceSumInsured2_2", fieldValue);
+            //case "undefined_17ho_3" -> commonField.getOthers().put("insuranceSumInsured2_3", fieldValue);
+
+            case "undefined_17hp" -> commonField.setInsuranceYear1(fieldValue);
 
             case "undefined_17hr_1" -> commonField.setInsuranceCompany3_1(fieldValue);
             case "undefined_17hr_2" -> commonField.setInsuranceCompany3_2(fieldValue);
-            case "undefined_17hr_3" -> commonField.setInsuranceCompany3_3(fieldValue);
-            case "undefined_17hsb" -> commonField.setInsuranceSumInsured1(fieldValue);
+            //case "undefined_17hr_3" -> commonField.setInsuranceCompany3_3(fieldValue);
+            case "undefined_17hsb_1" -> commonField.getOthers().put("insuranceSumInsured3_1", fieldValue);
+            case "undefined_17hsb_2" -> commonField.getOthers().put("insuranceSumInsured3_2", fieldValue);
+            //case "undefined_17hsb_3" -> commonField.getOthers().put("insuranceSumInsured3_3", fieldValue);
             case "undefined_17ht" -> commonField.setInsuranceYear1(fieldValue);
 
             case "fill_2_6" -> commonField.setUltimateTotalLife(fieldValue);
@@ -3448,6 +3605,9 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             case "fill_2_6e" -> commonField.setDeclinedDesc(fieldValue);
 
             case "fill_15_7y" -> commonField.setDeclinedDesc(fieldValue);
+
+            case "Check Box74bc" -> commonField.getOthers().put("futureAddressYes", fieldValue);
+            case "Check Box74_1ah" -> commonField.getOthers().put("futureAddressNo", fieldValue);
             /* Page12 End */
             /* Page13 Start */
             case "fill_9_6" -> commonField.setIncomeSalary(fieldValue);
@@ -3464,7 +3624,7 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             case "fill_34_2" -> commonField.setIncomeRentalsLastYear(fieldValue);
             case "fill_k37_2" -> commonField.setIncomeOther(fieldValue);
             case "fill_38_2" -> commonField.setIncomeOtherLastYear(fieldValue);
-            case "fill_37_2" -> commonField.setTotalAnnualIncome(fieldValue);
+            //case "fill_37_2" -> commonField.setTotalAnnualIncome(fieldValue);
 
             case "fill_39_2" -> commonField.setFna_c1b_amount(fieldValue);
 
@@ -3493,10 +3653,13 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
             case "Check Box65b" -> commonField.setBankruptYes(fieldValue);
             case "Check Box83" -> commonField.setBankruptNo(fieldValue);
-            case "Text26001" -> commonField.setBankruptNo(fieldValue);
+            case "Text26001" -> commonField.setBankruptDesc(fieldValue);
             /* Page14 End */
             case "fill_4_12" -> commonField.setFna_a_retire(fieldValue);
 
+            /* Page27 Start */
+            case "toggle_7_47" -> commonField.setFna_c3a_single_pay(fieldValue);
+            /* Page27 End */
 
         }
     }
@@ -3740,9 +3903,15 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             case "4_1_year2" -> commonField.setInsuranceYear2(fieldValue);
             case "4_1_year3" -> commonField.setInsuranceYear3(fieldValue);
 
-            case "4_1_sum1" -> commonField.setInsuranceSumInsured1(fieldValue);
-            case "4_1_sum2" -> commonField.setInsuranceSumInsured2(fieldValue);
-            case "4_1_sum3" -> commonField.setInsuranceSumInsured3(fieldValue);
+            case "4_1_sum1_1" -> commonField.getOthers().put("insuranceSumInsured1_1", fieldValue);
+            case "4_1_sum1_2" -> commonField.getOthers().put("insuranceSumInsured1_2", fieldValue);
+            case "4_1_sum1_3" -> commonField.getOthers().put("insuranceSumInsured1_3", fieldValue);
+            case "4_1_sum2_1" -> commonField.getOthers().put("insuranceSumInsured2_1", fieldValue);
+            case "4_1_sum2_2" -> commonField.getOthers().put("insuranceSumInsured2_2", fieldValue);
+            case "4_1_sum2_3" -> commonField.getOthers().put("insuranceSumInsured2_3", fieldValue);
+            case "4_1_sum3_1" -> commonField.getOthers().put("insuranceSumInsured3_1", fieldValue);
+            case "4_1_sum3_2" -> commonField.getOthers().put("insuranceSumInsured3_2", fieldValue);
+            case "4_1_sum3_3" -> commonField.getOthers().put("insuranceSumInsured3_3", fieldValue);
             case "ch4_1_life" -> {
                 if(acroForm.getField("4_1_sum1").getValueAsString() != null ){
                     if("Off".equals(fieldValue) && !acroForm.getField("4_1_sum1").getValueAsString().isBlank())
@@ -3905,8 +4074,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
             /* Page7 Start */
             case "ch5_1c_yes" -> commonField.getOthers().put("futureAddressYes", fieldValue);
             case "ch5_1c_no" -> commonField.getOthers().put("futureAddressNo", fieldValue);
-            case "5_1c_address_1" -> commonField.getOthers().put("futureAddress1", fieldValue);
-            case "5_1c_address_2" -> commonField.getOthers().put("futureAddress2", fieldValue);
+            case "5_1c_address_1" -> commonField.getOthers().put("futureAddress", fieldValue);
+            //case "5_1c_address_2" -> commonField.getOthers().put("futureAddress2", fieldValue);
             case "5_1c_reason" -> commonField.getOthers().put("futureAddressReason", fieldValue);
             case "5_1c_how_long" -> commonField.getOthers().put("futureAddressHowLong", fieldValue);
             //set it by this if both null futureAddressReason futureAddressHowLong; setValueIfPresent(form, "fill_2_4", commonField.getOthers().get("futureAddressReasonHowLong")); 
@@ -4065,4 +4234,44 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         else
             return "";
     }
+
+    public static Map<String, String> getCountryAndPhoneNo(String contactNo){
+        String countryCode = "";
+        String phoneNo = "";
+        if(StringUtils.trimToNull(contactNo) != null){
+            if(contactNo.replaceAll(" ", "").length() > 8){
+                //it may contain conttry code
+                if(contactNo.contains("+852")){       
+                    countryCode = "+852";
+                    phoneNo = contactNo.replace("+852", "");            
+                }else if(contactNo.contains("+853")){            
+                    countryCode = "+853";
+                    phoneNo = contactNo.replace("+853", "");
+                }else if(contactNo.contains("+86")){    
+                    countryCode = "+86";
+                    phoneNo = contactNo.replace("+86", "");        
+                    
+                }else if(contactNo.contains("+1")){       
+                    countryCode = "+1";
+                    phoneNo = contactNo.replace("+1", "");      
+                    
+                }else if(contactNo.contains("+81")){            
+                    countryCode = "+81";
+                    phoneNo = contactNo.replace("+81", "");  
+                }else if(contactNo.contains("+82")){            
+                    countryCode = "+82";
+                    phoneNo = contactNo.replace("+82", ""); 
+                }
+            }else{
+                phoneNo = contactNo;
+            }     
+        }
+
+        Map<String, String> d = new HashMap<>();
+        d.put("contactNo", contactNo);
+        d.put("countryCode", countryCode);
+        d.put("phoneNo", phoneNo);
+
+        return d;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java b/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
index f65c81a..8add854 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/template/service/TemplateService.java
@@ -148,7 +148,7 @@ public class TemplateService extends AbstractBaseEntityService<Template, Long, T
 			if (args.containsKey("createDateTo")) 
 				sql.append(" AND t.created <= :createDateTo ");
 		}
-		sql.append(" order by name like 'SL%', name like 'ML%', name like 'HSBC%' , name like 'Lioner%' ");
+		sql.append(" order by name like 'SL%', name like 'ML%', name like 'HSBC%' , name like 'Lioner%', name desc ");
 
 		return jdbcDao.queryForList(sql.toString(), args);
 	}