From e27e6e0c873c957117fc28eb243b262a9aa1acc8 Mon Sep 17 00:00:00 2001
From: "vluk@2fi-solutions.com.hk" <vluk@2fi-solutions.com.hk>
Date: Fri, 9 Jan 2026 19:35:23 +0800
Subject: [PATCH] no message

---
 .../lioner/client/service/ClientService.java    |  1 +
 .../modules/lioner/pdf/service/PdfService.java  | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
index 09c726d..da93b81 100644
--- a/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
+++ b/src/main/java/com/ffii/lioner/modules/lioner/client/service/ClientService.java
@@ -195,6 +195,7 @@ public class ClientService extends AbstractBaseEntityService<Client, Long, Clien
 
 	public List<Map<String,Object>> list(Map<String, Object> args){
 			StringBuilder sql = new StringBuilder("SELECT"
+				+ " (select fullname from user where id = client.createdBy) as createByName, "
 				+ " id, "
 				+ " clientCode, "
 				+ " fullname, "
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 6dcc392..d0c7bdf 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
@@ -924,6 +924,15 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
     }
 
     private void HSBCFIN_textBox(PdfAcroForm form, CommonField commonField, Client client){
+        if("Yes".equals(commonField.getOthers().get("maritalStatusSingle"))){
+            setValueIfPresent(form, "fill_7", "Single"); 
+        }
+        if("Yes".equals(commonField.getOthers().get("maritalStatusMarried"))){
+            setValueIfPresent(form, "fill_7", "Married"); 
+        }
+        if("Yes".equals(commonField.getOthers().get("maritalStatusOther"))){
+            setValueIfPresent(form, "chho", "Other"); 
+        } 
         //logger.info("Processing HSBCFIN form (ID: 3)");
         /* Page1 Start */
         setValueIfPresent(form, "fill_3", StringUtils.trimToEmpty(StringUtils.trimToEmpty(client.getLastname()) + " " + StringUtils.trimToEmpty(client.getFirstname())));
@@ -1409,8 +1418,8 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
         setValueIfPresent(form, "1_12_1", commonField.getOthers().get("empPosition"));
         setValueIfPresent(form, "1_12_2", commonField.getOthers().get("empDuties"));
         
-        setValueIfPresent(form, "1_12_5", commonField.getTotalAnnualIncome());
-        if(commonField.getTotalAnnualIncome() != null && !commonField.getTotalAnnualIncome().isBlank()){
+        setValueIfPresent(form, "1_12_5", formatNum(client.getTotalIncomeCurrent()));
+        if(client.getTotalIncomeCurrent() != null){
             setValueIfPresent(form, "1_12_5_usd", "USD");
             setValueIfPresent(form, "1_12_5_pa", "P.A.");
         }
@@ -2028,6 +2037,10 @@ public class PdfService extends AbstractBaseEntityService<Pdf, Long, PdfReposito
 
             if(consultant.getName() != null){
                 setValueIfPresent(form, "BranchName", consultant.getName());
+                setValueIfPresent(form, "IntermdeiaryName", consultant.getName());
+                setValueIfPresent(form, "WitnessName", consultant.getName());
+                setValueIfPresent(form, "TRName", consultant.getName());
+                
             }                            
         }