From df5d3bcddafdf7347a7257a93084a7035a83795b Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Mon, 29 Dec 2025 20:27:03 +0800
Subject: [PATCH] no message

---
 .../modules/lioner/pdf/service/PdfService.java   | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

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 dd9e35e..08505e9 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
@@ -1261,12 +1261,16 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
     
     private void SLFNA_EN_checkBox(PDAcroForm form2, CommonField commonField){
         /* Page1 Start */
-        if(commonField.getMaritalStatus() != null && "SINGLE".equals(commonField.getMaritalStatus().toUpperCase())){
+        if("Yes".equals(commonField.getOthers().get("maritalStatusSingle"))){
             setValueIfPresent(form2, "chhs", "Yes"); 
         }
-        if(commonField.getMaritalStatus() != null && "MARRIED".equals(commonField.getMaritalStatus().toUpperCase())){
+        if("Yes".equals(commonField.getOthers().get("maritalStatusMarried"))){
             setValueIfPresent(form2, "chhm", "Yes"); 
-        }     
+        }
+        if("Yes".equals(commonField.getOthers().get("maritalStatusOther"))){
+            setValueIfPresent(form2, "chho", "Yes"); 
+        } 
+
         if(convertStringToNum(commonField.getFna_b1_d_amount()) > 0){
             setValueIfPresent(form2, "cb6", "Yes");                                     
         }
@@ -1280,7 +1284,11 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
         setValueIfPresent(form2, "chh1", commonField.getEduPri()); 
         setValueIfPresent(form2, "chh2", commonField.getEduSec()); 
-        setValueIfPresent(form2, "chh4", commonField.getEduPostSec()); 
+        setValueIfPresent(form2, "chh3", commonField.getEduPostSec()); 
+        if("Yes".equals(commonField.getEduUni())){
+            setValueIfPresent(form2, "chh3", "Off");
+            setValueIfPresent(form2, "chh4", commonField.getEduUni());
+        }
 
         setValueIfPresent(form2, "chh5", commonField.getFna_a_life_0()); 
         setValueIfPresent(form2, "chh6", commonField.getFna_a_life_less_5());