diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
index 9fe93fe15e..6e9ca29445 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
@@ -1695,7 +1695,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return rb.setMsg(resultBean.getMsg());
         }
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
-        map.put("createOrgName", dto.getCreateOrgName());
+        HomeKcCust homeKcCust = dto.getHomeKcCust();
+        if (homeKcCust != null){
+            map.put("createOrgName", homeKcCust.getAccCompName());
+        }else {
+            map.put("createOrgName", dto.getCreateOrgName());
+        }
         map.put("customerName", dto.getCustomerName());
         map.put("contractNo",dto.getContractNo());
         String carContract = getCarContract(dto, map, appOrderDetailsVo);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
index 11badb20b3..3c78e4ba61 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanhomevisitprep/LoanHomevisitPrepService.java
@@ -642,56 +642,133 @@ public class LoanHomevisitPrepService extends MybatisBaseService<LoanHomevisitPr
         map.put("parBaddress", crmCustomerTemp.getAddress());
         //乙方实际居住地址
         map.put("parBxaddress", crmCustomerTemp.getAddress());
-        //丙方
-        map.put("partyC", "");
-        //丙方身份证号
-        map.put("parCidNo", "");
-        //丙方电话
-        map.put("parCphone", "");
-        //丙方户籍地址
-        map.put("parCaddress", "");
-        //丙方实际居住地址
-        map.put("parCxaddress", "");
-        //丁方
-        map.put("partyD", "");
-        //丁方统一社会信用代码
-        map.put("partyDregistNum", "");
-        //丁方负责人
-        map.put("partyDfzr","");
-        //丁方电话
-        map.put("partyDphone","");
-        //丁方注册地址
-        map.put("partyDaddress", "");
-        //丁方实际经营地址
-        map.put("partyDxaddress", "");
-        //戊方
-        map.put("partyE", "");
-        //戊方身份证号
-        map.put("partyEidNo", "");
-        //戊方电话
-        map.put("partyEphone", "");
-        //戊方户籍地址
-        map.put("partyEaddress", "");
-        //戊方实际居住地址
-        map.put("partyExaddress", "");
-        //己方
-        map.put("partyF", "");
-        //己方身份证号
-        map.put("partyFidNo", "");
-        //己方电话
-        map.put("partyFphone", "");
-        //己方户籍地址
-        map.put("partyFaddress", "");
-        //己方实际居住地址
-        map.put("partyFxaddress", "");
-        //车辆登记在 □ 乙方 □ 丁方名下
-        map.put("yf","□");
-        map.put("df","□");
-        //连带还款责任 □丙方、 □丁方、 □戊方、 □己方为连带还款人
-        map.put("bf","");
-        map.put("dfTwo","");
-        map.put("mf","");
-        map.put("yfwldhk","");
+        HomeKcCust homeKcCust = printConfirmDto.getHomeKcCust();
+        if (homeKcCust != null){
+            //丙方
+            map.put("partyC", homeKcCust.getSpouseName());
+            //丙方身份证号
+            map.put("parCidNo", homeKcCust.getSpouseIdCard());
+            //丙方电话
+            map.put("parCphone", homeKcCust.getSpouseMobile());
+            //丙方户籍地址
+            map.put("parCaddress", homeKcCust.getSpouseRegisterAddress());
+            //丙方实际居住地址
+            map.put("parCxaddress", homeKcCust.getSpouseAddress());
+            //丁方
+            map.put("partyD", homeKcCust.getAccCompName());
+            //丁方统一社会信用代码
+            map.put("partyDregistNum", homeKcCust.getAccCompRegistNum());
+            //丁方负责人
+            map.put("partyDfzr",homeKcCust.getAccCompContract());
+            //丁方电话
+            map.put("partyDphone",homeKcCust.getAccComphone());
+            //丁方注册地址
+            map.put("partyDaddress", homeKcCust.getAccCompAddress());
+            //丁方实际经营地址
+            map.put("partyDxaddress", homeKcCust.getAccCompxAddress());
+            List<HomeKcOtherPeo> otherPersonnel = homeKcCust.getOtherPersonnel();
+            if (otherPersonnel != null && otherPersonnel.size() > 0){
+                for (HomeKcOtherPeo homeKcOtherPeo : otherPersonnel) {
+                    if ("1".equals(homeKcOtherPeo.getPersonnelKey())){
+                        //戊方
+                        map.put("partyE", homeKcOtherPeo.getName());
+                        //戊方身份证号
+                        map.put("partyEidNo", homeKcOtherPeo.getIdCard());
+                        //戊方电话
+                        map.put("partyEphone", homeKcOtherPeo.getMobile());
+                        //戊方户籍地址
+                        map.put("partyEaddress", homeKcOtherPeo.getResidentAddress());
+                        //戊方实际居住地址
+                        map.put("partyExaddress", homeKcOtherPeo.getAddress());
+                        otherPersonnel.remove(otherPersonnel);
+                        break;
+                    }
+                }
+                for (HomeKcOtherPeo homeKcOtherPeo : otherPersonnel) {
+                    if ("1".equals(homeKcOtherPeo.getPersonnelKey())){
+                        //己方
+                        map.put("partyF", homeKcOtherPeo.getName());
+                        //己方身份证号
+                        map.put("partyFidNo", homeKcOtherPeo.getIdCard());
+                        //己方电话
+                        map.put("partyFphone", homeKcOtherPeo.getMobile());
+                        //己方户籍地址
+                        map.put("partyFaddress", homeKcOtherPeo.getResidentAddress());
+                        //己方实际居住地址
+                        map.put("partyFxaddress", homeKcOtherPeo.getAddress());
+                        break;
+                    }
+                }
+            }
+            //车辆登记在 □ 乙方 □ 丁方名下
+            if ("1".equals(homeKcCust.getVehRegis())){
+                map.put("yf","☑");
+                map.put("df","□");
+            }else if ("2".equals(homeKcCust.getVehRegis())){
+                map.put("yf","□");
+                map.put("df","☑");
+            }
+            //连带还款责任 □丙方、 □丁方、 □戊方、 □己方为连带还款人
+            map.put("bf","□");
+            map.put("mf","□");
+            map.put("yfwldhk","□");
+            if ("0".equals(homeKcCust.getIsSecurity())){
+                map.put("dfTwo","☑");
+            }else if ("1".equals(homeKcCust.getIsSecurity())){
+                map.put("dfTwo","□");
+            }
+        }else {
+            //丙方
+            map.put("partyC", "");
+            //丙方身份证号
+            map.put("parCidNo", "");
+            //丙方电话
+            map.put("parCphone", "");
+            //丙方户籍地址
+            map.put("parCaddress", "");
+            //丙方实际居住地址
+            map.put("parCxaddress", "");
+            //丁方
+            map.put("partyD", "");
+            //丁方统一社会信用代码
+            map.put("partyDregistNum", "");
+            //丁方负责人
+            map.put("partyDfzr","");
+            //丁方电话
+            map.put("partyDphone","");
+            //丁方注册地址
+            map.put("partyDaddress", "");
+            //丁方实际经营地址
+            map.put("partyDxaddress", "");
+            //戊方
+            map.put("partyE", "");
+            //戊方身份证号
+            map.put("partyEidNo", "");
+            //戊方电话
+            map.put("partyEphone", "");
+            //戊方户籍地址
+            map.put("partyEaddress", "");
+            //戊方实际居住地址
+            map.put("partyExaddress", "");
+            //己方
+            map.put("partyF", "");
+            //己方身份证号
+            map.put("partyFidNo", "");
+            //己方电话
+            map.put("partyFphone", "");
+            //己方户籍地址
+            map.put("partyFaddress", "");
+            //己方实际居住地址
+            map.put("partyFxaddress", "");
+            //车辆登记在 □ 乙方 □ 丁方名下
+            map.put("yf","□");
+            map.put("df","□");
+            //连带还款责任 □丙方、 □丁方、 □戊方、 □己方为连带还款人
+            map.put("bf","□");
+            map.put("dfTwo","□");
+            map.put("mf","□");
+            map.put("yfwldhk","□");
+        }
         InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + "hkxy" + ".ftl");
         //生成word文件名
         String targetPath = docPdfComponent.getUploadTemplateUrl();