From bcf884e3953f07ccda94df4807633539bb1935ff Mon Sep 17 00:00:00 2001 From: le Date: Tue, 23 Jun 2026 10:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=95=E4=BF=9D=E5=8D=95=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=90=BD=E8=A1=A8=EF=BC=8C=E5=8E=BB=E9=99=A4?= =?UTF-8?q?=E8=8B=B1=E5=A4=A7=E7=9B=B8=E5=85=B3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sinosoft/report/f1report/JRptConfig.java | 2 +- .../lis/httpservice/clm/LLClaimCheckBL.java | 8 +- .../httpservice/clm/LLClaimInfoReceiveBL.java | 6 +- .../httpservice/nb/ELEFServerGetInfoBL.java | 2 +- .../httpservice/nb/ELEFServerMailSendBL.java | 6 +- .../httpservice/nb/ELEGetCombinationInfo.java | 2 +- .../nb/GElectronicContQueryBL.java | 2 +- .../httpservice/nb/LAAgentListQueryBL.java | 2 +- .../lis/httpservice/nb/LCContAgentBL.java | 2 +- .../httpservice/nb/LCContDetailQueryBL.java | 2 +- .../lis/httpservice/nb/LCGrpContEnsureBL.java | 2 +- .../lis/httpservice/nb/LCGrpContQueryBL.java | 2 +- .../httpservice/nb/LCMessageAPPQueryBL.java | 2 +- .../httpservice/nb/LCMessageQueryService.java | 2 +- .../lis/httpservice/nb/LLTBInfoQueryBL.java | 2 +- .../httpservice/nb/MITClientContListBL.java | 2 +- .../nb/MITManageComRsikCtrlBL.java | 2 +- .../httpservice/nb/RiskContListQueryBL.java | 2 +- .../src/main/resources/application.yml | 4 +- .../src/main/resources/easyscan5/license.lic | 2 +- .../easyscan/EasyScanContainer-chrome.jsp | 2 +- .../g_edor/PEdorPopedomUserConfigInput.jsp | 4 +- .../lis/g_claim/LLClaimCalFranchiseBL.java | 4 +- .../lis/g_claim/LLClaimSpecialBackDataBL.java | 4 +- .../lis/g_claim/LLGlobalMedicalFeeInpBL.java | 6 +- .../lis/g_claim/LLGrpClaimCalDutyKindBL.java | 2 +- .../lis/g_claim/LLGrpClaimccManageBL.java | 2 +- .../webapp/g_claim/LLClaimCaseSubInput.js | 6 +- .../g_claim/LLClaimImportModifyInput.js | 4 +- .../webapp/g_claim/LLClaimMedicalReceipt.js | 2 +- .../g_claim/LLGlobalMedicalFeeInpInput.js | 2 +- .../sinosoft/lis/g_app/LCPolicySignBL.java | 2 +- .../lis/g_app/LCProposalSelectPlanBL.java | 2 +- .../lis/sql/g_app/AgencyDataSyncSQL.java | 4 +- .../main/webapp/g_app/GrpRiskQueryOneInput.js | 2 +- .../main/webapp/g_app/GrpRiskQueryTwoInput.js | 2 +- .../webapp/g_app/LCGrpCompNewContPolInput.js | 56 ++++++- .../webapp/g_app/LCGrpCompNewContPolInput.jsp | 138 ++++++++++++++---- .../main/webapp/g_app/LCGrpContPolInput.js | 18 ++- .../main/webapp/g_app/LCGrpContPolInput.jsp | 17 ++- .../main/webapp/g_app/LCInsuredAddInput.js | 3 + .../main/webapp/g_app/LCInsuredAddInput.jsp | 4 +- .../java/com/sinosoft/lis/g_pos/EdorRTBL.java | 2 +- .../com/sinosoft/lis/g_pos/FillListRRBL.java | 2 +- .../lis/g_print/EdorPrint/EdorPrintAT.java | 4 +- .../lis/g_print/EdorPrint/EdorPrintBI.java | 4 +- .../lis/g_print/EdorPrint/EdorPrintCT.java | 4 +- .../lis/g_print/EdorPrint/EdorPrintIO.java | 4 +- .../lis/g_print/EdorPrint/EdorPrintNI.java | 2 +- .../lis/g_print/EdorPrint/EdorPrintZT.java | 4 +- .../sinosoft/lis/g_print/LCGrpPrintBL.java | 4 +- .../NoticePrinter/EdorGrpBfNoticePrintBL.java | 2 +- .../NoticePrinter/EdorGrpFfNoticePrintBL.java | 2 +- .../main/webapp/g_sysQuery/LCAskQueryInput.js | 4 +- .../sinosoft/lis/g_quot/LSQuotCheckBL.java | 22 +-- .../lis/g_quot/LSQuotPlanDetailBL.java | 4 +- .../sinosoft/lis/g_quot/LSQuotTryCalBL.java | 2 +- .../sinosoft/lis/g_quot/LSQuotUWDetailBL.java | 20 +-- .../lis/sql/easyquery/g_quot/LSQuotSql.java | 2 +- .../main/webapp/g_quot/LSQuotCommonInput.js | 20 +-- .../webapp/g_quot/LSQuotETPlanDetailInput.js | 2 +- .../main/webapp/g_quot/LSQuotETPlanInput.js | 4 +- .../sinosoft/lis/bq/InsuAccRateCheckBL.java | 4 +- .../webapp/bq/PEdorNewPopedomGroupMain.jsp | 4 +- .../webapp/bq/PEdorSpecPopedomConfigInit.jsp | 4 +- .../webapp/bq/PEdorSpecPopedomConfigMain.jsp | 4 +- .../lis/bank/FMSUnionPaySendToBankBL.java | 8 +- .../com/sinosoft/lis/clm/CapitalFRealPay.java | 2 +- 68 files changed, 318 insertions(+), 164 deletions(-) diff --git a/lis-component-print-bl/src/main/java/com/sinosoft/report/f1report/JRptConfig.java b/lis-component-print-bl/src/main/java/com/sinosoft/report/f1report/JRptConfig.java index 2cc2dac1..18b15a82 100644 --- a/lis-component-print-bl/src/main/java/com/sinosoft/report/f1report/JRptConfig.java +++ b/lis-component-print-bl/src/main/java/com/sinosoft/report/f1report/JRptConfig.java @@ -29,7 +29,7 @@ public class JRptConfig extends DefaultHandler { //增加一个白名单，以后传入的参数，需要在此数组中设定 private static final List Scheme = Arrays.asList("http","https"); - private static final List ServerName = Arrays.asList("ydthlife.coom","ydthlife.coom.cn"); + private static final List ServerName = Arrays.asList("fz.coom","fz.coom.cn"); private static final List ServerPort = Arrays.asList("18080","28080"); private static final List ContextPath = Arrays.asList("lis","grplis","lisgrp"); diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimCheckBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimCheckBL.java index 7bda0902..81d12eaa 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimCheckBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimCheckBL.java @@ -185,7 +185,7 @@ public class LLClaimCheckBL implements MitService { //客户风险等级校验 if (!isCusrisk()){ - buildError("checkData",new I18nMessage("很抱歉，根据相关要求，暂不能为您提供微信理赔服务，若有疑问请您致电4000-188-688。","")); + buildError("checkData",new I18nMessage("很抱歉，根据相关要求，暂不能为您提供微信理赔服务，若有疑问请您致电客服。","")); return false; } @@ -193,7 +193,7 @@ public class LLClaimCheckBL implements MitService { //在核心存在团险保单 if (!existsPol()){ - buildError("checkData",new I18nMessage("未查询到该被保险人的保单信息，请核实您录入的信息是否正确，或致电 4000-188-688。","")); + buildError("checkData",new I18nMessage("未查询到该被保险人的保单信息，请核实您录入的信息是否正确，或致电 客服。","")); return false; } @@ -201,7 +201,7 @@ public class LLClaimCheckBL implements MitService { //判断保单的险种是否在理赔的范围内 if (!allow()){ - buildError("checkData",new I18nMessage("目前微信理赔仅支持部分医疗险申请，您的险种不符合微信理赔的申请条件，您可点击“报案”或致电4000-188-688，我们将有专人为您服务","")); + buildError("checkData",new I18nMessage("目前微信理赔仅支持部分医疗险申请，您的险种不符合微信理赔的申请条件，您可点击“报案”或致电客服，我们将有专人为您服务","")); return false; } @@ -228,7 +228,7 @@ public class LLClaimCheckBL implements MitService { //黑名单客户校验 if (!isBlackPerson()){ - buildError("checkData",new I18nMessage("很抱歉，根据相关要求，暂不能为您提供微信理赔服务，若有疑问请您致电4000-188-688。","")); + buildError("checkData",new I18nMessage("很抱歉，根据相关要求，暂不能为您提供微信理赔服务，若有疑问请您致电客服。","")); return false; } diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimInfoReceiveBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimInfoReceiveBL.java index 3e355da1..331eb8be 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimInfoReceiveBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/clm/LLClaimInfoReceiveBL.java @@ -1774,9 +1774,9 @@ public class LLClaimInfoReceiveBL implements MitService { tLLClaimDetail.setModifyDate(CurrentDate); tLLClaimDetail.setModifyTime(CurrentTime); - //泰和产品需要插入LLInsureAccTrace表 + //富泽产品需要插入LLInsureAccTrace表 if("271001".equals(tLLClaimDetail.getRiskCode())){ - buildError("dealData", new I18nMessage("不处理泰和产品！", "")); + buildError("dealData", new I18nMessage("不处理富泽产品！", "")); return false; } mLLClaimDetailSet.add(tLLClaimDetail); @@ -3664,7 +3664,7 @@ public class LLClaimInfoReceiveBL implements MitService { || pLLClaimDetailSchema.getGetDutyKind().equals("200") || pLLClaimDetailSchema.getGetDutyKind().equals("205") || pLLClaimDetailSchema.getGetDutyKind().equals("105")) - ||((pLLClaimDetailSchema.getGetDutyKind().equals("104")//对于泰和委托产品身故和重大疾病都要冲减帐户 + ||((pLLClaimDetailSchema.getGetDutyKind().equals("104")//对于富泽委托产品身故和重大疾病都要冲减帐户 || pLLClaimDetailSchema.getGetDutyKind().equals("204") || pLLClaimDetailSchema.getGetDutyKind().equals("102") || pLLClaimDetailSchema.getGetDutyKind().equals("202")) diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerGetInfoBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerGetInfoBL.java index c93c54a8..fcb85c4e 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerGetInfoBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerGetInfoBL.java @@ -34,7 +34,7 @@ import java.util.Date; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerMailSendBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerMailSendBL.java index b5d8ea45..3206f809 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerMailSendBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEFServerMailSendBL.java @@ -40,7 +40,7 @@ import java.util.Map; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ @@ -205,7 +205,7 @@ public class ELEFServerMailSendBL implements MitService { //String tEmailLimit = com.sinosoft.lis.pubfun.PubFun.getNoLimit(tSSRS.GetText(j, 1)); String tSerialNo = PubFun1.CreateMaxNo("EmailSerialNo","102700"); tEmailLogDB.setSerialNo(tSerialNo);//流水号 - // tEmailLogDB.setEmail("xunjiatishi@ydthlife.sgcc.com.cn");//邮件地址 + // tEmailLogDB.setEmail("xunjiatishi@fz.com.cn");//邮件地址 tEmailLogDB.setOtherNo(tSerialNo); tEmailLogDB.setSenduserName("电e金服-意向单询价提示"); tEmailLogDB.setState("Y");//发送状态 Y 成功 @@ -227,7 +227,7 @@ public class ELEFServerMailSendBL implements MitService { //String tEmailLimit = com.sinosoft.lis.pubfun.PubFun.getNoLimit(tSSRS.GetText(j, 1)); String tSerialNo = PubFun1.CreateMaxNo("EmailSerialNo","102700"); tEmailLogDB.setSerialNo(tSerialNo);//流水号 -// tEmailLogDB.setEmail("xunjiatishi@ydthlife.sgcc.com.cn");//邮件地址 +// tEmailLogDB.setEmail("xunjiatishi@fz.com.cn");//邮件地址 tEmailLogDB.setOtherNo(tSerialNo); tEmailLogDB.setSenduserName("电e金服-意向单询价提示"); tEmailLogDB.setState("N");//发送状态 Y 成功 diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEGetCombinationInfo.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEGetCombinationInfo.java index c96d3c20..c17a48eb 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEGetCombinationInfo.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/ELEGetCombinationInfo.java @@ -18,7 +18,7 @@ import com.sinosoft.utility.*; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* 1000000212 - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/GElectronicContQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/GElectronicContQueryBL.java index ea7deea5..cb5bc8e7 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/GElectronicContQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/GElectronicContQueryBL.java @@ -23,7 +23,7 @@ import org.springframework.util.ObjectUtils; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LAAgentListQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LAAgentListQueryBL.java index aebd750c..2aac8d22 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LAAgentListQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LAAgentListQueryBL.java @@ -34,7 +34,7 @@ import static java.io.FileDescriptor.out; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContAgentBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContAgentBL.java index 386836b8..4c645dcb 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContAgentBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContAgentBL.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContDetailQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContDetailQueryBL.java index cbcb7822..4d31b204 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContDetailQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCContDetailQueryBL.java @@ -29,7 +29,7 @@ import java.text.NumberFormat; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContEnsureBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContEnsureBL.java index c14629f5..63e60853 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContEnsureBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContEnsureBL.java @@ -29,7 +29,7 @@ import java.util.HashMap; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContQueryBL.java index 665be62f..94862cd4 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCGrpContQueryBL.java @@ -28,7 +28,7 @@ import java.text.NumberFormat; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageAPPQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageAPPQueryBL.java index eae9e33c..6026149a 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageAPPQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageAPPQueryBL.java @@ -28,7 +28,7 @@ import java.util.ArrayList; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageQueryService.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageQueryService.java index e9b6dc33..9dfe2e97 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageQueryService.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LCMessageQueryService.java @@ -382,7 +382,7 @@ public class LCMessageQueryService implements MitService { jsonLCGrpCont.put("XQBankAccSub", aSSRS.GetText(i, 166) );//续期开户行细分 jsonLCGrpCont.put("AUTHVALIDATE", aSSRS.GetText(i, 169) );//委托责任生效日期 jsonLCGrpCont.put("CLMLIMITCONTROLFLAG", aSSRS.GetText(i, 171) );//理赔额度管控标识 - jsonLCGrpCont.put("NEWOLDFLAG", aSSRS.GetText(i, 170) );//新旧泰和产品标识 + jsonLCGrpCont.put("NEWOLDFLAG", aSSRS.GetText(i, 170) );//新旧富泽产品标识 jsonArrayLCGrpCont.add(jsonLCGrpCont); } diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LLTBInfoQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LLTBInfoQueryBL.java index 774f42a5..9a929bd9 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LLTBInfoQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/LLTBInfoQueryBL.java @@ -22,7 +22,7 @@ import java.util.ArrayList; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: * @date: 2013-7-9 * 01020120 投保信息查询 * @version:1.0 diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITClientContListBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITClientContListBL.java index 12c9ce2a..354b637d 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITClientContListBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITClientContListBL.java @@ -23,7 +23,7 @@ import org.slf4j.LoggerFactory; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITManageComRsikCtrlBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITManageComRsikCtrlBL.java index 3edba84c..44a757b2 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITManageComRsikCtrlBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/MITManageComRsikCtrlBL.java @@ -32,7 +32,7 @@ import java.util.Date; *

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

* - * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/RiskContListQueryBL.java b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/RiskContListQueryBL.java index 4090f6a6..d9d9ee1a 100644 --- a/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/RiskContListQueryBL.java +++ b/lis-framework-service/src/main/java/com/sinosoft/lis/httpservice/nb/RiskContListQueryBL.java @@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory; *

Description:

*

Copyright: Copyright (c) 2013 All Rights Reserved

*

Company: YINGDA TAIHE LIFE INSURANCE Co.,Ltd.

- * @author: wanghaibing@ydthlife.com + * @author: wanghaibing@fz.com * @date: 2013-7-9 * @version:1.0 */ diff --git a/lis-framework-springboot/src/main/resources/application.yml b/lis-framework-springboot/src/main/resources/application.yml index ef265450..c65d421c 100644 --- a/lis-framework-springboot/src/main/resources/application.yml +++ b/lis-framework-springboot/src/main/resources/application.yml @@ -89,9 +89,9 @@ mail: # 是否需要用户名密码验证 auth: true # 发送方，遵循RFC-822标准 - from: grouplis@ydthlife.sgcc.com.cn + from: grouplis@fz.com.cn # 用户名（注意：如果使用foxmail邮箱，此处user为qq号） - user: grouplis@ydthlife.sgcc.com.cn + user: grouplis@fz.com.cn # 密码（注意，某些邮箱需要为SMTP服务单独设置密码，详情查看相关帮助） pass: 6N&&Eo$7l* # 使用 STARTTLS安全连接，STARTTLS是对纯文本通信协议的扩展。 diff --git a/lis-module-easyscan-service/src/main/resources/easyscan5/license.lic b/lis-module-easyscan-service/src/main/resources/easyscan5/license.lic index 46f3c669..43993bd1 100644 --- a/lis-module-easyscan-service/src/main/resources/easyscan5/license.lic +++ b/lis-module-easyscan-service/src/main/resources/easyscan5/license.lic @@ -1,6 +1,6 @@ - 泰和人寿保险股份有限公司 + 富泽人寿保险股份有限公司 2020-11-19T00:00:00 2099-12-31T23:59:59 diff --git a/lis-module-easyscan-web/src/main/webapp/easyscan/EasyScanContainer-chrome.jsp b/lis-module-easyscan-web/src/main/webapp/easyscan/EasyScanContainer-chrome.jsp index 28d9745a..f6a66e4e 100644 --- a/lis-module-easyscan-web/src/main/webapp/easyscan/EasyScanContainer-chrome.jsp +++ b/lis-module-easyscan-web/src/main/webapp/easyscan/EasyScanContainer-chrome.jsp @@ -39,7 +39,7 @@ if(clientUrl.contains("grouplis")){ clientUrl = clientUrl.replace("http","https"); } -// clientUrl = "https://grouplis.ydthlife.com/"; +// clientUrl = "https://grouplis.fz.com/"; // String clientUrl = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; %> diff --git a/lis-module-grp-authority-web/src/main/webapp/g_edor/PEdorPopedomUserConfigInput.jsp b/lis-module-grp-authority-web/src/main/webapp/g_edor/PEdorPopedomUserConfigInput.jsp index 4b42c37c..4bda4cf5 100644 --- a/lis-module-grp-authority-web/src/main/webapp/g_edor/PEdorPopedomUserConfigInput.jsp +++ b/lis-module-grp-authority-web/src/main/webapp/g_edor/PEdorPopedomUserConfigInput.jsp @@ -4,8 +4,8 @@ *

Title: Life Insurance Bussiness System

*

Description: 保险核心业务管理系统

*

Copyright: Copyright (c) 2010 Yingda Taihe Life Insurance Co.,Ltd. All Rights Reserved

- *

Company: 泰和人寿保险股份有限公司

- *

WebSite: http://www.ydthlife.com

+ *

Company: 富泽人寿保险股份有限公司

+ *

WebSite: http://www.fz.com

* * @author : pengst * @version : 1.0 diff --git a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimCalFranchiseBL.java b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimCalFranchiseBL.java index 380bf8f4..d3b9654d 100644 --- a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimCalFranchiseBL.java +++ b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimCalFranchiseBL.java @@ -402,7 +402,7 @@ public class LLClaimCalFranchiseBL { buildError("getFranchiseCtrlToFee", new I18nMessage("查询给付责任信息失败，请核查！", "LIS-12145")); return false; } -// wangzj 判断是否为27100泰和委托三享定制 +// wangzj 判断是否为27100富泽委托三享定制 if (tTaiHePlan){ LCGrpHealthEntrustConfigDB lcGrpHealthEntrustConfigDB = new LCGrpHealthEntrustConfigDB(); /* lcGrpHealthEntrustConfigDB.setOtherNo(mLCPolSchema.getGrpContNo()); @@ -978,7 +978,7 @@ public class LLClaimCalFranchiseBL { } /** - * 是否为泰和三享方案 + * 是否为富泽三享方案 * @return */ private boolean isTaiHe3(String tGrpContNo) { diff --git a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimSpecialBackDataBL.java b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimSpecialBackDataBL.java index 965260fc..0c740391 100644 --- a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimSpecialBackDataBL.java +++ b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLClaimSpecialBackDataBL.java @@ -1238,10 +1238,10 @@ public class LLClaimSpecialBackDataBL { tLLClaimUWMDetailSchema.setClmUWNo("0"); tLLClaimUWMDetailSchema.setBackNo(this.mBackNo); //委托对账需求 peiyf - if(this.mRgtno.startsWith("KTH")||this.mRgtno.startsWith("KZB")){//泰和或账户B案件回退使用 + if(this.mRgtno.startsWith("KTH")||this.mRgtno.startsWith("KZB")){//富泽或账户B案件回退使用 tLLClaimUWMDetailSchema.setClmUWer(tLLRegisterSchema.getOperator()); tLLClaimUWMDetailSchema.setAuditPer(tLLRegisterSchema.getOperator()); - }else{//非泰和或账户B的仍走原逻辑 + }else{//非富泽或账户B的仍走原逻辑 tLLClaimUWMDetailSchema.setClmUWer(this.mGlobalInput.Operator); } diff --git a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGlobalMedicalFeeInpBL.java b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGlobalMedicalFeeInpBL.java index 395622c5..7c7389f3 100644 --- a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGlobalMedicalFeeInpBL.java +++ b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGlobalMedicalFeeInpBL.java @@ -1070,15 +1070,15 @@ public class LLGlobalMedicalFeeInpBL implements BusinessService { /* * 除了住院津贴外，全球医疗的账单中其他责任，包括“一般疾病（意外）和一般住院”，“一般疾病（意外）和一般门诊”，“特殊疾病及特殊医疗”，“紧急医疗及身故救助”， * “分娩费&新生儿费”，“健康检查”，“牙科保障”，“眼科保障”，“战争及恐怖主义活动” - * 都新增了“账单开始日期”和“账单结束日期”，所以也都存在这两个字段中，所以也不能覆盖。 add by whs 2019-04-11 泰和全球医疗产品需求（231022新产品） + * 都新增了“账单开始日期”和“账单结束日期”，所以也都存在这两个字段中，所以也不能覆盖。 add by whs 2019-04-11 富泽全球医疗产品需求（231022新产品） */ logger.info("全球医疗账单录入（账单开始日期）：startDate----------->>>>>>>>>>"+startDate); logger.info("全球医疗账单录入（账单结束日期）：endDate----------->>>>>>>>>>"+endDate); - //全球医疗账单录入的“一般疾病（意外）和一般门诊”责任中新增“中草药门诊次数”和“物理治疗、美式脊椎矫正等治疗次数”字段 add by whs 2019-04-11 泰和全球医疗产品需求（新产品231022） + //全球医疗账单录入的“一般疾病（意外）和一般门诊”责任中新增“中草药门诊次数”和“物理治疗、美式脊椎矫正等治疗次数”字段 add by whs 2019-04-11 富泽全球医疗产品需求（新产品231022） String ChineseMediTimes = (String) mTransferData.getValueByName("ChineseMediTimes");//中草药门诊次数 String PhysicalTimes = (String) mTransferData.getValueByName("PhysicalTimes");//物理治疗、美式脊椎矫正等治疗次数 - //全球医疗账单录入的“紧急医疗及身故救助”和“战争及恐怖主义活动”中新增“陪同交通费用”字段 add by whs 2019-04-11 泰和全球医疗产品需求（新产品231022） + //全球医疗账单录入的“紧急医疗及身故救助”和“战争及恐怖主义活动”中新增“陪同交通费用”字段 add by whs 2019-04-11 富泽全球医疗产品需求（新产品231022） String JT001=(String) mTransferData.getValueByName("JT001");//陪同交通费用 logger.info("全球医疗账单录入（中草药门诊次数）：ChineseMediTimes----------->>>>>>>>>>"+ChineseMediTimes); logger.info("全球医疗账单录入（物理治疗、美式脊椎矫正等治疗次数）：PhysicalTimes----------->>>>>>>>>>"+PhysicalTimes); diff --git a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimCalDutyKindBL.java b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimCalDutyKindBL.java index c53dd11e..f3c260c2 100644 --- a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimCalDutyKindBL.java +++ b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimCalDutyKindBL.java @@ -370,7 +370,7 @@ public class LLGrpClaimCalDutyKindBL { */ // tSql = "select nvl(sum(adjsum),0) from llcasereceipt where 1 = 1" // +" and feeitemcode in ('AC001','BC001','CB001','CZ001','AI001','BL001')" -// +" and ClmNo =? and nvl(avaliflag,'111') not like '271%'"; 271是泰和的情况 +// +" and ClmNo =? and nvl(avaliflag,'111') not like '271%'"; 271是富泽的情况 String tQSoc = SQLProxy.getInstance(LLCaseReceiptSQL.class).getSumAdjSumByClmNoAndReasonCode(this.mClmNo,pClaimType); tLLClaimDutyKindSchema.setSocPay(Double.parseDouble(tSSRS.GetText(i,1))+Double.parseDouble(tQSoc)); tLLClaimDutyKindSchema.setOthPay(Double.parseDouble(tSSRS.GetText(i,2))); diff --git a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimccManageBL.java b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimccManageBL.java index b31cad0a..b7b32163 100644 --- a/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimccManageBL.java +++ b/lis-module-grp-claim-service/src/main/java/com/sinosoft/lis/g_claim/LLGrpClaimccManageBL.java @@ -1187,7 +1187,7 @@ public class LLGrpClaimccManageBL { || pLLClaimDetailSchema.getGetDutyKind().equals("200") || pLLClaimDetailSchema.getGetDutyKind().equals("205") || pLLClaimDetailSchema.getGetDutyKind().equals("105")) - ||((pLLClaimDetailSchema.getGetDutyKind().equals("104")//对于泰和委托产品身故和重大疾病都要冲减帐户 + ||((pLLClaimDetailSchema.getGetDutyKind().equals("104")//对于富泽委托产品身故和重大疾病都要冲减帐户 || pLLClaimDetailSchema.getGetDutyKind().equals("204") || pLLClaimDetailSchema.getGetDutyKind().equals("102") || pLLClaimDetailSchema.getGetDutyKind().equals("202")) diff --git a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimCaseSubInput.js b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimCaseSubInput.js index 5574071e..d9053027 100644 --- a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimCaseSubInput.js +++ b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimCaseSubInput.js @@ -2554,10 +2554,10 @@ function CheckConfictToLPCusternoInfo(){ } /** - * 循环判断出险人险种为231022-泰和全球团体医疗产品 + * 循环判断出险人险种为231022-富泽全球团体医疗产品 * 匹配理算的每个保单的是否存在责任超保额赔付情况。若存在则阻断。 * - * 泰和全球团体医疗产品（231022） + * 富泽全球团体医疗产品（231022） * add by whs 2019-04-17 */ function AmntOutGetClm(){ @@ -2604,7 +2604,7 @@ function AmntOutGetClm(){ /* * 在整案结论保存时，校验该人所在对应团单，累计该团单下所有人赔付的金额（包括在途），是否超过800万， * 若超过，则弹出阻断提示“累计该团单【团单号】下所有被保险人战争及恐怖主义活动责任赔付的金额（包括在途），已超过800万，请核对！”。 - * 泰和全球团体医疗产品（231022） + * 富泽全球团体医疗产品（231022） * add by whs 2019-06-13 */ if(!AmntOutGrpGetClm(tGrpContNo)){ diff --git a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimImportModifyInput.js b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimImportModifyInput.js index cb8471a2..bbb70400 100644 --- a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimImportModifyInput.js +++ b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimImportModifyInput.js @@ -325,7 +325,7 @@ function saveClick(){ var isRiskCode = easyExecSql(tSQLInfo.getString()); if(fm.claimType[2].value=="04" && fm.newFatalDiseaseType.value=="zj001" && isRiskCode=="1"){ - i18nAlert("请检查赔案责任是否涉及《附加泰和特定恶性肿瘤疾病保险》，若涉及，请同时勾选特种疾病，并在特种疾病费用类型中录入相应病种，重新理算。"); + i18nAlert("请检查赔案责任是否涉及《附加富泽特定恶性肿瘤疾病保险》，若涉及，请同时勾选特种疾病，并在特种疾病费用类型中录入相应病种，重新理算。"); } //出险原因激活 @@ -422,7 +422,7 @@ function beforeSubmit(){ tSQLInfo.addSubPara(fm.customerNo.value); var urisk = easyExecSql(tSQLInfo.getString()); if (urisk!=null){ - i18nAlert("录入疾病时，只有附加百万无忧重疾医疗，泰和康惠重疾医疗，康佑臻享终身重疾，康佑臻爱终身重疾允许事故日期和出险日期不一致"); + i18nAlert("录入疾病时，只有附加百万无忧重疾医疗，富泽康惠重疾医疗，康佑臻享终身重疾，康佑臻爱终身重疾允许事故日期和出险日期不一致"); }else { if (AccYear > AccYear2){ i18nAlert("事故日期必须早于等于出险日期"); diff --git a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimMedicalReceipt.js b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimMedicalReceipt.js index 0e2a0d3e..030586c1 100644 --- a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimMedicalReceipt.js +++ b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLClaimMedicalReceipt.js @@ -2226,7 +2226,7 @@ function dayCount(start, end) { } /*校验当前理赔案件的保单是否满足以下条件： - a.非泰和健康保障委托管理产品（险种代码271001）; + a.非富泽健康保障委托管理产品（险种代码271001）; b.保单归属地为北京分公司的团体保单（包含今后上线的所有的团险新产品）。 */ function DiagnoseKind() { diff --git a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLGlobalMedicalFeeInpInput.js b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLGlobalMedicalFeeInpInput.js index 1f5936c9..629698fb 100644 --- a/lis-module-grp-claim-web/src/main/webapp/g_claim/LLGlobalMedicalFeeInpInput.js +++ b/lis-module-grp-claim-web/src/main/webapp/g_claim/LLGlobalMedicalFeeInpInput.js @@ -1243,7 +1243,7 @@ function verifyDate(){ /* * 投保时无法录入细项限额，但可能产生特约承保的情况，故理赔账单细项不做限额限次等校验， * 只校验每一被保险人单次或累计分项责任保额和总保额是否超限，分项责任保额和总保额以承保环节录入为准。 - * 所以去掉原来限额限次的校验 modify by whs 2019-04-11 泰和全球医疗产品需求（231022） + * 所以去掉原来限额限次的校验 modify by whs 2019-04-11 富泽全球医疗产品需求（231022） */ // var total = Number(accumulative('J'))+(diffDay-3)*800 if(diffDay>3){ diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCPolicySignBL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCPolicySignBL.java index 0c718858..0a8ae2a8 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCPolicySignBL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCPolicySignBL.java @@ -1319,7 +1319,7 @@ public class LCPolicySignBL implements BusinessService { if(ssrs1.getMaxRow()>0){ xQuotNo = ssrs1.GetText(1,1); }else { - buildError("dealPlanInfo", new I18nMessage("泰和险种缺少询价相关数据！", "LIS-08006")); + buildError("dealPlanInfo", new I18nMessage("富泽险种缺少询价相关数据！", "LIS-08006")); return false; } sqlv = lcPolicySignBLSQL.updateOtherNOByGrpcontno (tGrpContNo,xQuotNo,mGlobalInput.Operator);//LCGrpHealthEntrustConfigMain diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCProposalSelectPlanBL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCProposalSelectPlanBL.java index 4e8de5ec..f36bcceb 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCProposalSelectPlanBL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCProposalSelectPlanBL.java @@ -328,7 +328,7 @@ public class LCProposalSelectPlanBL { if (new BigDecimal(tQuotPrem).compareTo( BigDecimal.ZERO)!=0) { if (new BigDecimal(tUpPrem).divide(new BigDecimal(tStandValue),4,RoundingMode.HALF_UP).compareTo(new BigDecimal("0.2")) <0 || new BigDecimal(tUpPrem).divide(new BigDecimal(tStandValue),4,RoundingMode.HALF_UP).compareTo(new BigDecimal("1.8")) >0) { - buildError("checkData", new I18nMessage("电力行业D款团体意外伤害保险保费不得低于标准保费20%或大于标准保费180%！", "LIS-99999")); + buildError("checkData", new I18nMessage("团体意外伤害保险保费不得低于标准保费20%或大于标准保费180%！", "LIS-99999")); return false; } } diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/AgencyDataSyncSQL.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/AgencyDataSyncSQL.java index 91b75d8a..61680cce 100644 --- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/AgencyDataSyncSQL.java +++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/AgencyDataSyncSQL.java @@ -17,13 +17,13 @@ public interface AgencyDataSyncSQL { @SQL("SELECT PICPATH FROM ASK_AFFIX_INFO where HOSTNAME='AgencyData'") String getIsCustomerVerify(); - @SQL(value = "SELECT distinct a.grpcontno , a.grpname, '', c.SocialInsuNo, e.MOBILEPHONE1,b.postaladdress, a.CValiDate,(select max(t.enddate) from lcpol t where t.grpcontno = a.grpcontno), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno ),0),'1', nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.paytype = 'ZC'),0), (select t.name from lacom t where t.agentcom = a.agentcom) ,'泰和人寿保险股份有限公司','100', nvl(a.Amnt,0), nvl(a.Prem,0), (case when a.payintv=0 then '趸交' when a.payintv=-1 then '不定期交费'else '期交' end),a.polapplydate , (select riskname from lmriskapp t ,lcgrppol p where t.riskcode =p.riskcode and p.grpcontno = a.grpcontno and t.subriskflag = 'M' limit 1),'2' FROM lcgrpcont a, lcgrpappnt b, LCGrpContactInfo e , ldgrp c where 1=1 and a.appntno = c.customerno and a.grpcontno = b.grpcontno and e.CustomerNo =b.CustomerNo and b.customerno = e.customerno and exists (SELECT 1 FROM lcgrppol c , lmriskapp h WHERE a.grpcontno = c.grpcontno and c.RISKCODE = h.RISKCODE and h.RiskPeriod in ('S', 'M') ) and exists(select 1 from lacom t,lcagentcominfo t1 where t.AgentCom = t1.AgentCom and t1.PolicyNo = a.GrpContNo and (t.name like '%长安%' or t.name like '%新疆安泰保险经纪%'or t.name like '%山东保险%')) and a.SignDate = '?DealDate?' ") + @SQL(value = "SELECT distinct a.grpcontno , a.grpname, '', c.SocialInsuNo, e.MOBILEPHONE1,b.postaladdress, a.CValiDate,(select max(t.enddate) from lcpol t where t.grpcontno = a.grpcontno), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno ),0),'1', nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.paytype = 'ZC'),0), (select t.name from lacom t where t.agentcom = a.agentcom) ,'富泽人寿保险股份有限公司','100', nvl(a.Amnt,0), nvl(a.Prem,0), (case when a.payintv=0 then '趸交' when a.payintv=-1 then '不定期交费'else '期交' end),a.polapplydate , (select riskname from lmriskapp t ,lcgrppol p where t.riskcode =p.riskcode and p.grpcontno = a.grpcontno and t.subriskflag = 'M' limit 1),'2' FROM lcgrpcont a, lcgrpappnt b, LCGrpContactInfo e , ldgrp c where 1=1 and a.appntno = c.customerno and a.grpcontno = b.grpcontno and e.CustomerNo =b.CustomerNo and b.customerno = e.customerno and exists (SELECT 1 FROM lcgrppol c , lmriskapp h WHERE a.grpcontno = c.grpcontno and c.RISKCODE = h.RISKCODE and h.RiskPeriod in ('S', 'M') ) and exists(select 1 from lacom t,lcagentcominfo t1 where t.AgentCom = t1.AgentCom and t1.PolicyNo = a.GrpContNo and (t.name like '%长安%' or t.name like '%新疆安泰保险经纪%'or t.name like '%山东保险%')) and a.SignDate = '?DealDate?' ") SSRS getAgencyDataSyncSQL1(@Param("DealDate") String DealDate); @SQL(value = "SELECT (select (case when risktype='A' then '意外险' when risktype='H' then '健康险类' when risktype='L' then '人寿险类' end) from lmriskapp t where t.riskcode = a.riskcode), (select riskname from lmriskapp t where t.riskcode = a.riskcode), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno and t.grppolno = a.grppolno ),0), nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.grppolno = a.grppolno and t.paytype = 'ZC'),0), (select count(distinct insuredno) from lcinsured t where t.grpcontno = a.grpcontno), '' FROM lcgrppol a WHERE a.grpcontno = '?grpcontno?' ") SSRS getAgencyDataSyncSQL2(@Param("grpcontno") String grpcontno); - @SQL(value = "SELECT distinct a.grpcontno ,a.grpname, '', c.SocialInsuNo, e.MOBILEPHONE1,b.postaladdress, a.cvalidate,(select max(t.enddate) from lcpol t where t.grpcontno = a.grpcontno), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno ),0),'1',nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.paytype = 'ZC'),0), (select t.name from lacom t where t.agentcom = a.agentcom) ,'泰和人寿保险股份有限公司','100', nvl(a.Amnt,0), nvl(a.Prem,0), (case when a.payintv=0 then '趸交' when a.payintv=-1 then '不定期交费'else '期交' end),a.polapplydate , (select riskname from lmriskapp t ,lcgrppol p where t.riskcode =p.riskcode and p.grpcontno = a.grpcontno and t.subriskflag = 'M' limit 1),'2', p.EDORNO FROM lcgrpcont a, lcgrpappnt b, LCGrpContactInfo e , ldgrp c,lpgrpedoritem p where 1=1 and p.grpcontno = a.grpcontno and a.appntno = c.customerno and a.grpcontno = b.grpcontno and e.CustomerNo =b.CustomerNo and b.customerno = e.customerno and exists (SELECT 1 FROM lcgrppol c , lmriskapp h WHERE a.grpcontno = c.grpcontno and c.RISKCODE = h.RISKCODE and h.RiskPeriod in ('S', 'M') ) and exists(select 1 from lacom t,lcagentcominfo t1 where t.AgentCom = t1.AgentCom and t1.PolicyNo = a.GrpContNo and (t.name like '%长安%' or t.name like '%新疆安泰保险经纪%'or t.name like '%山东保险%')) and p.edorstate = '0' and p.makedate = '?DealDate?' ") + @SQL(value = "SELECT distinct a.grpcontno ,a.grpname, '', c.SocialInsuNo, e.MOBILEPHONE1,b.postaladdress, a.cvalidate,(select max(t.enddate) from lcpol t where t.grpcontno = a.grpcontno), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno ),0),'1',nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.paytype = 'ZC'),0), (select t.name from lacom t where t.agentcom = a.agentcom) ,'富泽人寿保险股份有限公司','100', nvl(a.Amnt,0), nvl(a.Prem,0), (case when a.payintv=0 then '趸交' when a.payintv=-1 then '不定期交费'else '期交' end),a.polapplydate , (select riskname from lmriskapp t ,lcgrppol p where t.riskcode =p.riskcode and p.grpcontno = a.grpcontno and t.subriskflag = 'M' limit 1),'2', p.EDORNO FROM lcgrpcont a, lcgrpappnt b, LCGrpContactInfo e , ldgrp c,lpgrpedoritem p where 1=1 and p.grpcontno = a.grpcontno and a.appntno = c.customerno and a.grpcontno = b.grpcontno and e.CustomerNo =b.CustomerNo and b.customerno = e.customerno and exists (SELECT 1 FROM lcgrppol c , lmriskapp h WHERE a.grpcontno = c.grpcontno and c.RISKCODE = h.RISKCODE and h.RiskPeriod in ('S', 'M') ) and exists(select 1 from lacom t,lcagentcominfo t1 where t.AgentCom = t1.AgentCom and t1.PolicyNo = a.GrpContNo and (t.name like '%长安%' or t.name like '%新疆安泰保险经纪%'or t.name like '%山东保险%')) and p.edorstate = '0' and p.makedate = '?DealDate?' ") SSRS getAgencyDataSyncSQL3(@Param("DealDate") String DealDate); @SQL(value = "SELECT (select (case when risktype='A' then '意外险' when risktype='H' then '健康险类' when risktype='L' then '人寿险类' end) from lmriskapp t where t.riskcode = a.riskcode), (select riskname from lmriskapp t where t.riskcode = a.riskcode), nvl((select sum(t.amnt) from lcpol t where t.grpcontno = a.grpcontno and t.grppolno = a.grppolno ),0), nvl((select sum(t.sumactupaymoney) from ljapayperson t where t.grpcontno = a.grpcontno and t.grppolno = a.grppolno and t.paytype = 'ZC'),0), (select count(distinct insuredno) from lcinsured t where t.grpcontno = a.grpcontno), '' FROM lcgrppol a WHERE a.grpcontno = '?grpcontno?' ") diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryOneInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryOneInput.js index 2f107337..2c732bb8 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryOneInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryOneInput.js @@ -21,7 +21,7 @@ function easyQueryClick() // RiskGrid.setRowColData(0,1,"北京分公司本部营销服务部"); // RiskGrid.setRowColData(0,2,"0000000167"); - // RiskGrid.setRowColData(0,3,"泰和人寿保险股份有限公司"); + // RiskGrid.setRowColData(0,3,"富泽人寿保险股份有限公司"); // RiskGrid.setRowColData(0,4,"低风险"); // RiskGrid.setRowColData(0,5,"新契约评估"); diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryTwoInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryTwoInput.js index f3a53c80..9c202042 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryTwoInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/GrpRiskQueryTwoInput.js @@ -27,7 +27,7 @@ function easyQueryClick() RiskGrid.setRowColData(0,1,"北京分公司本部营销服务部"); RiskGrid.setRowColData(0,2,"0000000167"); - RiskGrid.setRowColData(0,3,"泰和人寿保险股份有限公司"); + RiskGrid.setRowColData(0,3,"富泽人寿保险股份有限公司"); RiskGrid.setRowColData(0,4,"低风险"); RiskGrid.setRowColData(0,5,"新契约评估"); diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js index e3090378..94a06b0e 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js @@ -299,6 +299,20 @@ function clearCounty(){ document.all("CountyName").value = ""; document.all("CountyCode").value = ""; } + + +function clearCityAndCounty2(){ + + document.getElementById("LinkCity2").value = ""; + document.getElementById("LinkCityCode2").value = ""; + document.getElementById("LinkCounty2").value = ""; + document.getElementById("LinkCountyCode2").value = ""; +} +function clearCounty2(){ + document.getElementById("LinkCounty2").value = ""; + document.getElementById("LinkCountyCode2").value = ""; +} + /** * 清空关联查询的项目 */ @@ -1016,6 +1030,17 @@ function initEntry1(tGContNo){ document.all("OtherIDType").value=tPropEntry[0][59]; document.all("OtherIDNo").value=tPropEntry[0][60]; document.all("AppntNo").value=tPropEntry[0][61]; + document.all("grpType").value=tPropEntry[0][62]; + document.all("grpTypeName").value=tPropEntry[0][63]; + document.all("cDate").value=tPropEntry[0][64]; + document.all("bussarea").value=tPropEntry[0][65]; + document.all("bussareaName").value=tPropEntry[0][66]; + document.all("Corporation1").value=tPropEntry[0][67]; + document.all("CorIDType1").value=tPropEntry[0][68]; + document.all("CorIDTypeName1").value=tPropEntry[0][69]; + document.all("CorID1").value=tPropEntry[0][70]; + document.all("CorIDStartDate1").value=tPropEntry[0][71]; + document.all("CorIDExpiryDate1").value=tPropEntry[0][72]; } } //初始化省市县 @@ -1037,6 +1062,13 @@ function initEntry2(tGContNo){ document.all("CountyName").value=tPropEntry[0][6]; document.all("DetailAddress").value=tPropEntry[0][7]; document.all("ZipCode").value=tPropEntry[0][8]; + document.all("LinkProvinceCode2").value=tPropEntry[0][9]; + document.all("LinkProvince2").value=tPropEntry[0][10]; + document.all("LinkCityCode2").value=tPropEntry[0][11]; + document.all("LinkCity2").value=tPropEntry[0][12]; + document.all("LinkCountyCode2").value=tPropEntry[0][13]; + document.all("LinkCounty2").value=tPropEntry[0][14]; + document.all("LinkDetailAddr").value=tPropEntry[0][15]; } } //初始化联系人信息 @@ -1192,6 +1224,13 @@ function initEntry13(tGContNo){ document.all("IsElecInvoicePrint").value=tTaxEntry[0][8]; document.all("IsElecInvoicePrintName").value=tTaxEntry[0][9]; document.all("ElectInvoiceEmail").value=tTaxEntry[0][10]; + + document.all("fuli").value=tTaxEntry[0][11]; + document.all("fuliName").value=tTaxEntry[0][12]; + document.all("Taxpayer").value=tTaxEntry[0][13]; + document.all("TaxpayerName").value=tTaxEntry[0][14]; + document.all("Invoice").value=tTaxEntry[0][15]; + document.all("InvoiceName").value=tTaxEntry[0][16]; } } //客户经理 @@ -2953,7 +2992,22 @@ function returnShowCode(value1, value2, value3, returnType) { } else { return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180); } - } else if (value1=='bankcity') { + } else if (value1=='Linkcity') { + + if (isEmpty(fm.LinkProvinceCode2)) { + i18nAlert("请选择省！", "LIS-00795"); + return false; + } + + var tProvince = document.all("LinkProvinceCode2").value; + + + if (returnType=='0') { + return showCodeList('city',value2,value3,null,tProvince,'UpPlaceName','1',180); + } else { + return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180); + } + }else if (value1=='bankcity') { if (isEmpty(fm.BankProvinceName)) { i18nAlert("请选择省！", "LIS-00795"); diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.jsp index 2e9287b9..360824ba 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.jsp @@ -162,13 +162,13 @@ 业务分类 - ABC业务分类细分 - +<%-- ABC业务分类细分--%> + - 电E金服标识 - +<%-- 电E金服标识--%> + 是否为关联交易 @@ -185,8 +185,8 @@ - 强制校验职业占比 - +<%-- 强制校验职业占比--%> + 强制检验投保人数 是否为统括单 @@ -208,8 +208,8 @@ 保费分摊方式 - 政保合作业务标志 - +<%-- 政保合作业务标志--%> + @@ -376,6 +376,40 @@ 合计 + + + 组织类型 + + + 成立日期 + + + 经营区域 + + + + + 组织类型 + + + 成立日期 + + + 经营区域 + + + + + + + 联系地址 + + 省 + 市 + 区/县 + + + 单位性质 @@ -387,22 +421,56 @@ -<%-- 单位传真--%> -<%-- --%> - 法人/负责人姓名 - - 法人/负责人证件类型 - - 法人/负责人证件号码 - + <%-- 单位传真--%> + <%-- --%> + 法人姓名 + + 法人证件类型 + + 法人证件号码 + + + + 法人证件有效起期 + + + 法人证件有效止期 + + + + <%-- 单位传真--%> + <%-- --%> + 负责人姓名 + + 负责人证件类型 + + 负责人证件号码 + - 法人/负责人证件有效起期 - + 负责人证件有效起期 + - 法人/负责人证件有效止期 - + 负责人证件有效止期 + +<%-- --%> +<%--<%– 单位传真–%>--%> +<%--<%– –%>--%> +<%-- 法人/负责人姓名--%> +<%-- --%> +<%-- 法人/负责人证件类型--%> +<%-- --%> +<%-- 法人/负责人证件号码--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- 法人/负责人证件有效起期--%> +<%-- --%> + +<%-- 法人/负责人证件有效止期--%> +<%-- --%> +<%-- --%> 单位地址 @@ -480,8 +548,8 @@ 是否省管产业单位 - 是否为绿色标识 - +<%-- 是否为绿色标识--%> + 中小微企业标识 @@ -493,17 +561,17 @@ 供应链金融业务-保险产品（短险）标识 - - 产业链上下游企业标识 - - 电网主业人身保险业务标识 - + +<%-- 产业链上下游企业标识--%> + +<%-- 电网主业人身保险业务标识--%> + - 能源行业人身保险业务标识 - - 是否农电工业务 - +<%-- 能源行业人身保险业务标识--%> + +<%-- 是否农电工业务--%> + @@ -575,6 +643,14 @@ <%--电子发票--%> + + 开通弹性福利平台 + + 纳税人类型 + + 开票样式 + + 电子发票 diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js index 56dd6603..7a070676 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js @@ -480,7 +480,7 @@ function showGrpIDInfo(){ } -//基本投保信息 +//基本投保信息,先查询lcgrpcont，查不到从询价查询基本信息 function initEntry(){ tSQLInfo = new SqlClass(); tSQLInfo.setResourceName("g_app.LCContSql"); @@ -645,6 +645,7 @@ function initEntry(){ } +//查询询价信息反显到页面 function queryQuotAndImpInfo(){ var tPropEntry; //一般询价 @@ -4941,3 +4942,18 @@ function showQuotInfo() { window.open(tSrc, "询价查询", 'width=950,height=520,top=0,left=0,toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=1,status=0'); } + +function changeBlanketFlag(){ + // + // alert(document.all("OperSourceType")); + console.log("需要改变值"); + console.log(document.all("OperSourceType").value); + + if ("A"==document.all("OperSourceType").value){ + document.getElementById("BlanketFlag").value="1"; + document.getElementById("BlanketFlagName").value="是"; + }else { + document.getElementById("BlanketFlag").value="0"; + document.getElementById("BlanketFlagName").value="否"; + } +} diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp index a67453da..97e72193 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp @@ -126,7 +126,8 @@ 业务分类 - + + <%-- ABC业务分类细分--%> <%-- --%> @@ -179,16 +180,16 @@ 互联网业务标识 - + 中介渠道互联网保险业务标志 - + 直销渠道互联网保险业务标志 - + 自营互联网平台类型 - + @@ -297,7 +298,7 @@ 单位证件类型 <%-- --%> - + <%-- *--%> 单位证件号码 @@ -523,6 +524,10 @@ 付款方式 + 支票号 + + + 开户名 银行账号 diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.js index b2288fc8..34f8b41c 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.js +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.js @@ -1833,6 +1833,9 @@ function initPlanFlag() { } function checkInsured(){ + if (fm.InsuredType.value == "1"){ + return true; + } tSQLInfo = new SqlClass(); tSQLInfo.setModule("grp_nb"); tSQLInfo.setResourceName("g_app.LCInsuredAddSql"); diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.jsp index a54df30d..e3ecda5a 100644 --- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.jsp +++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredAddInput.jsp @@ -74,8 +74,8 @@ verify="被保险人类型~InsuredType|NOTNULL&CODE:insuredtype" onchange="verifyField(this)" style="background:url(../common/images/select--bg_03.png) no-repeat right center" ondblclick="showCodeList('insuredtype',[this,InsuredTypeName],[0,1],null, '1','OtherSign', '1', null);" - onkeyup="return showCodeListKey('insuredtype',[this,InsuredTypeName],[0,1],null, '1','OtherSign', '1', null);"> + onkeyup="return showCodeListKey('insuredtype',[this,InsuredTypeName],[0,1],null, '1','OtherSign', '1', null);"> + diff --git a/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/EdorRTBL.java b/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/EdorRTBL.java index 8c3f8edb..93bffeba 100644 --- a/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/EdorRTBL.java +++ b/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/EdorRTBL.java @@ -129,7 +129,7 @@ public class EdorRTBL implements BusinessService { return false; } try { - //用于泰和健康账户资金部分退保 + //用于富泽健康账户资金部分退保 //BqNameFun.isSpecRiskcodeByGrpContNo(mLPGrpEdorItemSchema.getGrpContNo()) && //AT关我RT什么事 if ("AT".equals(mLPGrpEdorItemSchema.getEdorType())) { diff --git a/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/FillListRRBL.java b/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/FillListRRBL.java index 012509bf..2ada7e02 100644 --- a/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/FillListRRBL.java +++ b/lis-module-grp-pa-service/src/main/java/com/sinosoft/lis/g_pos/FillListRRBL.java @@ -232,7 +232,7 @@ public class FillListRRBL { /** * 对于减人之后加人的特殊处理，在契约判断中加入条件，非保全加人才判断insuredCount是否大于0 * 如果是保全加人的话，则查询团单下是否有该客户没有终止的保单，如果有，则不允许加人 - * 此修改是针对泰和人寿保险公司对于减人之后还要加此人的特殊处理 + * 此修改是针对富泽人寿保险公司对于减人之后还要加此人的特殊处理 * Modify By Amadeus ----20090413-------BGN */ if (insuredCount > 0 && existsCostmuerCount != null && !existsCostmuerCount.equals("")) { diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintAT.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintAT.java index e61795dc..d66650aa 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintAT.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintAT.java @@ -155,7 +155,7 @@ public class EdorPrintAT implements EdorPrint { } tPolNo = mEdorPrintATSQL.queryPolNoByLCPol2(mLPGrpEdorItemSchema.getGrpContNo()); - if (tPolNo != null && !"".equals(tPolNo)) {//泰和允许没有投资账户，所以只有在有投资账户的情况下才进行后续操作 picmin + if (tPolNo != null && !"".equals(tPolNo)) {//富泽允许没有投资账户，所以只有在有投资账户的情况下才进行后续操作 picmin rTransferData = EdorPrintUtil.getPolBalance(tPolNo, mLPGrpEdorItemSchema.getEdorAppDate(), mLPGrpEdorItemSchema.getGrpContNo()); try { tSumPay = Double.parseDouble(String.valueOf(rTransferData.getValueByName("AccBala"))); @@ -184,7 +184,7 @@ public class EdorPrintAT implements EdorPrint { mJSONParam.put("SXFMoney", tDF.format(sxfMoney)); } mJSONParam.put("ATActMoney", "应退费金额为"+tDF.format(mLPGrpEdorItemSchema.getGetMoney())+"元。付费通知书号"+mAccNo+"。");//应退费金额为{{ATActMoney}}元。付费通知书号{{ATAccNo}}。 - // 退保转投需求 泰和产品 shiyu + // 退保转投需求 富泽产品 shiyu String PayFormNameStr = mEdorPrintATSQL.queryPayFormNameExeSQL(mLPGrpEdorItemSchema.getEdorAcceptNo()); mJSONParam.put("THPayFormName", PayFormNameStr); } else { diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintBI.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintBI.java index f1031fb9..8076e4d3 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintBI.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintBI.java @@ -183,7 +183,7 @@ public class EdorPrintBI implements EdorPrint { XmlExport tXmlExport = new XmlExport(); // tXmlExport.createDocument(VTS_NAME, "printer"); //初始化xml文档 if(mAppFlag.equals("1") ){ - //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 + //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 if(EdorPrintUtil.isSpecRiskcode(mLPGrpEdorItemSchema.getEdorNo())) { tXmlExport.createDocument("GEdorLBPrintAPPSpec.vts", "printer"); @@ -192,7 +192,7 @@ public class EdorPrintBI implements EdorPrint { tXmlExport.createDocument(VTS_NAME_APP, "printer"); //初始化xml文档 } }else{ - //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 + //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 if(EdorPrintUtil.isSpecRiskcode(mLPGrpEdorItemSchema.getEdorNo())) { tXmlExport.createDocument("GEdorLBPrintSpec.vts", "printer"); diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintCT.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintCT.java index 18056644..5c394079 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintCT.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintCT.java @@ -109,7 +109,7 @@ public class EdorPrintCT implements EdorPrint { if (!"a".equalsIgnoreCase(mLPGrpEdorItemSchema.getEdorState()))//复核通过时不再重新生成清单，由于团单的数据量巨大造成系统处理缓慢 { - if (!EdorPrintUtil.isSpecRiskcodeByGrpContNo(mLPGrpEdorItemSchema.getGrpContNo())) //泰和健康不需要清单 + if (!EdorPrintUtil.isSpecRiskcodeByGrpContNo(mLPGrpEdorItemSchema.getGrpContNo())) //富泽健康不需要清单 { } @@ -203,7 +203,7 @@ public class EdorPrintCT implements EdorPrint { } } - // 退保转投需求 泰和产品 shiyu + // 退保转投需求 富泽产品 shiyu String PayFormNameStr = mEdorPrintCTSQL.queryPayFromNameByLPEdorApp(mLPGrpEdorItemSchema.getEdorAcceptNo()); mJSONParam.put("THPayFormName", PayFormNameStr); } diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintIO.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintIO.java index 3618af96..a4d6a537 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintIO.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintIO.java @@ -189,14 +189,14 @@ public class EdorPrintIO implements EdorPrint { //人名清单 JSONObject tJSONObject = new JSONObject(); if (mAppFlag.equals("1")) { - //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 + //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 if (EdorPrintUtil.isSpecRiskcode(mLPGrpEdorItemSchema.getEdorNo())) { tJSONObject.put("printer", "P004070APPSpec.vts"); } else { tJSONObject.put("printer", "P004070APP.vts"); } } else { - //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 + //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 if (EdorPrintUtil.isSpecRiskcode(mLPGrpEdorItemSchema.getEdorNo())) { tJSONObject.put("printer", "P004070Spec.vts"); } else { diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintNI.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintNI.java index 4573ecf5..ede89d80 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintNI.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintNI.java @@ -176,7 +176,7 @@ public class EdorPrintNI implements EdorPrint { break; } } - //泰和健康采用新的模板 + //富泽健康采用新的模板 if (EdorPrintUtil.isSpecRiskcodeByGrpContNo(mLPGrpEdorItemSchema.getGrpContNo())) { Type = 5; } diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintZT.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintZT.java index 1f8a18b0..96b2f34e 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintZT.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/EdorPrint/EdorPrintZT.java @@ -237,7 +237,7 @@ public class EdorPrintZT implements EdorPrint { * 2.长期险 * 3.账户式医疗 * 4.企补医疗 add by Amadeus 2008-3-18 企补医疗与现有批单不兼容，需要重新生成 - * 5.泰和健康保障 add by pengst 2012-11-18 泰和健康保障与现有批单不兼容，需要重新生成 + * 5.富泽健康保障 add by pengst 2012-11-18 富泽健康保障与现有批单不兼容，需要重新生成 * 0.其他 */ private int getRiskType(String GrpContNo) { @@ -269,7 +269,7 @@ public class EdorPrintZT implements EdorPrint { break; } } - //泰和健康采用新的模板 + //富泽健康采用新的模板 if (EdorPrintUtil.isSpecRiskcodeByGrpContNo(mLPGrpEdorItemSchema.getGrpContNo())) { Type = 5; } diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/LCGrpPrintBL.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/LCGrpPrintBL.java index 904054fe..b3f3b97f 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/LCGrpPrintBL.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/LCGrpPrintBL.java @@ -1243,7 +1243,7 @@ public class LCGrpPrintBL extends CovBase implements BusinessService { if (insuYear.equals("1000")) { j = 106 - Integer.parseInt(tInsuAge); - if (j > 100&& !"432002".equals(tRiskCode)) //modify by zq 泰和幸福新产品 20170427 + if (j > 100&& !"432002".equals(tRiskCode)) //modify by zq 富泽幸福新产品 20170427 { j = 100; }else if("432002".equals(tRiskCode)){ @@ -1322,7 +1322,7 @@ public class LCGrpPrintBL extends CovBase implements BusinessService { str3 = new String[2]; str3[0] = String.valueOf(index); - //113003安享泰和现金价值打印，现价为零的地方，打印成“--” wasn + //113003安享富泽现金价值打印，现价为零的地方，打印成“--” wasn if("113003".equals(tRiskCode) && strcash.equals("0.00")){ strcash = "--"; } diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpBfNoticePrintBL.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpBfNoticePrintBL.java index ff5e0f55..cf4ef2a4 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpBfNoticePrintBL.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpBfNoticePrintBL.java @@ -213,7 +213,7 @@ public class EdorGrpBfNoticePrintBL { ExeSQL tExeSQL = new ExeSQL(); SSRS tSS = new SSRS(); -// //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 +// //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 // if(EdorPrintUtil.isSpecRiskcodeByEdorAccpetNo(tLPEdorAppSchema.getEdorAcceptNo())) // { // tXmlExport.createDocument("EdorGrpBfNoticeSpec.vts", "printer"); diff --git a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpFfNoticePrintBL.java b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpFfNoticePrintBL.java index 3dde7228..c5d39bf0 100644 --- a/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpFfNoticePrintBL.java +++ b/lis-module-grp-print-service/src/main/java/com/sinosoft/lis/g_print/NoticePrinter/EdorGrpFfNoticePrintBL.java @@ -188,7 +188,7 @@ public class EdorGrpFfNoticePrintBL { //获取数据库数据 private boolean getBaseData() { SSRS tSS = new SSRS(); - //泰和健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 + //富泽健康委托管理中的保险人全部为被保障人，所以需要全部修改,采用新的 // if (EdorPrintUtil.isSpecRiskcodeByEdorAccpetNo(tLPEdorAppSchema.getEdorAcceptNo())) { // tXmlExport.createDocument("EdorGrpFfNoticeSpec.vts", "printer"); // } else { diff --git a/lis-module-grp-query-web/src/main/webapp/g_sysQuery/LCAskQueryInput.js b/lis-module-grp-query-web/src/main/webapp/g_sysQuery/LCAskQueryInput.js index 855fcda1..2ec9dc82 100644 --- a/lis-module-grp-query-web/src/main/webapp/g_sysQuery/LCAskQueryInput.js +++ b/lis-module-grp-query-web/src/main/webapp/g_sysQuery/LCAskQueryInput.js @@ -38,7 +38,7 @@ function basefee(){ if (LongRiskGrid.mulLineCount > 0) { for (var j = 0; j < LongRiskGrid.mulLineCount; j++) { - if(LongRiskGrid.getRowColData(j, 1) == "泰和健康保障委托管理产品") + if(LongRiskGrid.getRowColData(j, 1) == "富泽健康保障委托管理产品") { LongRiskGrid.setRowColData(j,24,100); } @@ -499,7 +499,7 @@ function queryLongRiskGrid() turnPage4.queryModal(tSQLInfo.getString(),LongRiskGrid, 2, 1); for(var k=0;k1){ - buildError("riskMustRule", new I18nMessage("同方案下电力行业D款团体意外伤害保险险种仅允许录入一个必选责任！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("同方案下团体意外伤害保险险种仅允许录入一个必选责任！", "LIS-99999")); return false; } if (dutyFlag ==0){ - buildError("riskMustRule", new I18nMessage("同方案下电力行业D款团体意外伤害保险险种必须录入一个必选责任！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("同方案下团体意外伤害保险险种必须录入一个必选责任！", "LIS-99999")); return false; } // if ("221027".equals(mLSQuotPlanDetailSchema.getRiskCode()) && "0".equals(mLSQuotPlanDetailSchema.getFreeRisk())) { if(Double.valueOf(mLSQuotPlanDetailSchema.getDiscount())<0.2 || Double.valueOf(mLSQuotPlanDetailSchema.getDiscount())>1.8 ){ - buildError("riskMustRule", new I18nMessage("电力行业D款团体意外伤害保险险种承保费率不得低于基准费率的20%，不高于基准费率的180%", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("团体意外伤害保险险种承保费率不得低于基准费率的20%，不高于基准费率的180%", "LIS-99999")); return false; } } @@ -2184,7 +2184,7 @@ public class LSQuotCheckBL { for (int k3 = 1; k3 <= mLSQuotPlanDetailSet.size(); k3++) { if (!amnt222708.equals(s)){ - buildError("riskMustRule", new I18nMessage("电力行业D款团体意外伤害保险险种一次性工伤意外伤残补助金保额错误，应等于意外伤害保额的20%！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("团体意外伤害保险险种一次性工伤意外伤残补助金保额错误，应等于意外伤害保额的20%！", "LIS-99999")); return false; @@ -2251,15 +2251,15 @@ public class LSQuotCheckBL { } /** - * 泰和全球团体医疗保险 + * 富泽全球团体医疗保险 */ if ("231022".equals(mLSQuotPlanDetailSchema.getRiskCode())) { if ("".equals(mLSQuotPlanDetailSubSchema.getP5()) || mLSQuotPlanDetailSubSchema.getP5() == null) { - buildError("riskMustRule", new I18nMessage("泰和全球团体医疗保险保障类型为必录项！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("富泽全球团体医疗保险保障类型为必录项！", "LIS-99999")); return false; } if ("231006".equals(mLSQuotPlanDetailSchema.getDutyCode()) &&( "1".equals(mLSQuotPlanDetailSubSchema.getP5()) || "2".equals(mLSQuotPlanDetailSubSchema.getP5()))) { - buildError("riskMustRule", new I18nMessage("泰和全球团体医疗保险战争及恐怖主义活动责任的保障类型不允许选择大陆及港澳台地区！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("富泽全球团体医疗保险战争及恐怖主义活动责任的保障类型不允许选择大陆及港澳台地区！", "LIS-99999")); return false; } @@ -2271,7 +2271,7 @@ public class LSQuotCheckBL { if (mLSQuotPlanDetailSubSchema.getPlanCode().equals(mLSQuotPlanDetailSubSet.get(kk).getPlanCode())) { if (mLSQuotPlanDetailSubSet.get(kk).getP5()!=null){ if ( ! (mLSQuotPlanDetailSubSchema.getP5().equals(mLSQuotPlanDetailSubSet.get(kk).getP5()))){ - buildError("riskMustRule", new I18nMessage("泰和全球团体医疗保险属于全球医疗保险，在同一方案内的保障类型必须一致！！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("富泽全球团体医疗保险属于全球医疗保险，在同一方案内的保障类型必须一致！！", "LIS-99999")); return false; } } @@ -2283,7 +2283,7 @@ public class LSQuotCheckBL { } } if (!hasBaseDuty){ - buildError("riskMustRule", new I18nMessage("泰和全球团体医疗保险属于全球医疗保险，每个方案必须包含一个基本责任！！", "LIS-99999")); + buildError("riskMustRule", new I18nMessage("富泽全球团体医疗保险属于全球医疗保险，每个方案必须包含一个基本责任！！", "LIS-99999")); return false; } diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotPlanDetailBL.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotPlanDetailBL.java index 1e350e6f..a0aaab27 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotPlanDetailBL.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotPlanDetailBL.java @@ -306,7 +306,7 @@ public class LSQuotPlanDetailBL { } }else { if ("231003".equals(tRiskCode) || //补充医疗 - "231022".equals(tRiskCode)|| //泰和全球团体医疗保险 + "231022".equals(tRiskCode)|| //富泽全球团体医疗保险 "231013".equals(tRiskCode) //境外救援团体医疗保险 ){ //这个险种不计算标准保费，将标准保费计算成期望保费 @@ -454,7 +454,7 @@ public class LSQuotPlanDetailBL { } }else { if ("231003".equals(tRiskCode) || //补充团体医疗保险 - "231022".equals(tRiskCode)|| //泰和全球团体医疗保险 + "231022".equals(tRiskCode)|| //富泽全球团体医疗保险 "231013".equals(tRiskCode) //境外救援团体医疗保险 ){ //这个险种不计算标准保费，将标准保费计算成期望保费 diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotTryCalBL.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotTryCalBL.java index d1623130..f0b717c6 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotTryCalBL.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotTryCalBL.java @@ -584,7 +584,7 @@ public class LSQuotTryCalBL { }else { if ("231003".equals(tRiskCode) || //补充医疗 - "231022".equals(tRiskCode)|| //泰和全球团体医疗保险 + "231022".equals(tRiskCode)|| //富泽全球团体医疗保险 "231013".equals(tRiskCode) //境外救援团体医疗保险 ){ diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotUWDetailBL.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotUWDetailBL.java index 9ed645c4..28e60726 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotUWDetailBL.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/g_quot/LSQuotUWDetailBL.java @@ -1754,14 +1754,14 @@ public class LSQuotUWDetailBL { boolean unqiueFlag_221027=true; if ("1".equals(s_221027)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } if (unqiueFlag_221027){ String s_221027_1 = xLsquotuwsql.LSQuotUWSql711(mQuotNo,"221027",acc_DutyCodeList_221027); if ("1".equals(s_221027_1)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -1770,7 +1770,7 @@ public class LSQuotUWDetailBL { String s_221027_2 = xLsquotuwsql.LSQuotUWSql712(mQuotNo,"221027",acc_DutyCodeList_221027); if ("1".equals(s_221027_2)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -1780,7 +1780,7 @@ public class LSQuotUWDetailBL { String s_221027_3 = xLsquotuwsql.LSQuotUWSql702(mQuotNo,"222707"); if ("1".equals(s_221027_3)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -1789,7 +1789,7 @@ public class LSQuotUWDetailBL { String s_221027_4 = xLsquotuwsql.LSQuotUWSql703(mQuotNo,"222707"); if ("1".equals(s_221027_4)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; } } @@ -2160,14 +2160,14 @@ public class LSQuotUWDetailBL { boolean unqiueFlag_221027=true; if ("1".equals(s_221027)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } if (unqiueFlag_221027){ String s_221027_1 = xLsquotuwsql.LSQuotUWSql714(mQuotNo,"221027",acc_DutyCodeList_221027); if ("1".equals(s_221027_1)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -2176,7 +2176,7 @@ public class LSQuotUWDetailBL { String s_221027_2 = xLsquotuwsql.LSQuotUWSql715(mQuotNo,"221027",acc_DutyCodeList_221027); if ("1".equals(s_221027_2)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -2186,7 +2186,7 @@ public class LSQuotUWDetailBL { String s_221027_3 = xLsquotuwsql.LSQuotUWSql702(mQuotNo,"222707"); if ("1".equals(s_221027_3)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; unqiueFlag_221027=false; } } @@ -2195,7 +2195,7 @@ public class LSQuotUWDetailBL { String s_221027_4 = xLsquotuwsql.LSQuotUWSql703(mQuotNo,"222707"); if ("1".equals(s_221027_4)){ tIsOverUWRateAuditAuth = "1"; - tIsOverUWRateAuditAuthReason += "【电力行业D款团体意外伤害保险】请进行临分处理!;"; + tIsOverUWRateAuditAuthReason += "【团体意外伤害保险】请进行临分处理!;"; } } diff --git a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotSql.java b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotSql.java index f708e6e3..3796ece2 100644 --- a/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotSql.java +++ b/lis-module-grp-quotation-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_quot/LSQuotSql.java @@ -387,7 +387,7 @@ public interface LSQuotSql { SSRS LSQuotSql48(@Param("para0") String para0, @Param("para1") String para1, @Param("para2") String para2); - //查询险种是不是泰和 + //查询险种是不是富泽 @SQL(value = "select distinct riskcode from lsquotplandetail a where 1=1 @{0}", clauses = { @Clause(key = 0, clause = "and a.quotno = '#{para0}'", expression = "#{para0} != empty")}) SSRS LSQuotSql49(@Param("para0") String para0); diff --git a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotCommonInput.js b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotCommonInput.js index b755d972..1cb83609 100644 --- a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotCommonInput.js +++ b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotCommonInput.js @@ -3269,7 +3269,7 @@ function chkAmnt(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } @@ -3288,7 +3288,7 @@ function chkAmnt(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3308,7 +3308,7 @@ function chkAmnt(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3324,7 +3324,7 @@ function chkAmnt(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3340,7 +3340,7 @@ function chkAmnt(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" } } @@ -3929,7 +3929,7 @@ function chkAmntProj(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } @@ -3948,7 +3948,7 @@ function chkAmntProj(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3967,7 +3967,7 @@ function chkAmntProj(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3983,7 +3983,7 @@ function chkAmntProj(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" unqiueFlag_221027=false; } } @@ -3999,7 +3999,7 @@ function chkAmntProj(){ var flag_221027 = easyExecSql(tSQLInfo.getString(), 1, 0, 1); if (flag_221027=='1'){ - alertStr+="【电力行业D款团体意外伤害保险】请进行临分处理!\n" + alertStr+="【团体意外伤害保险】请进行临分处理!\n" } } diff --git a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanDetailInput.js b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanDetailInput.js index 12d749d0..9e26d028 100644 --- a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanDetailInput.js +++ b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanDetailInput.js @@ -498,7 +498,7 @@ function addPlanDetail() { //tangxuy 20231025 /* if(fm.RiskCode.value == "271001"){ if(fm.threeEnjoyFlag.value == ""){ - alert("选择产品为泰和委托业务时，【是否属于三享计划】为必录") + alert("选择产品为富泽委托业务时，【是否属于三享计划】为必录") return false; } }*/ diff --git a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanInput.js b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanInput.js index ecec35ee..64d0ffd9 100644 --- a/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanInput.js +++ b/lis-module-grp-quotation-web/src/main/webapp/g_quot/LSQuotETPlanInput.js @@ -775,7 +775,7 @@ function beforeSubmit(cObj, cTranProdType) { //221027险种的222708责任录入的时候必选先录入必选责任 if(!checkDuty()){ - alert("请您先录入电力行业D款团体意外伤害保险的必选责任"); + alert("请您先录入团体意外伤害保险的必选责任"); return false; } @@ -846,7 +846,7 @@ function beforeSubmit2(cObj, cTranProdType) { } //221027险种的222708责任录入的时候必选先录入必选责任 if(!checkDuty()){ - alert("请您先录入电力行业D款团体意外伤害保险的必选责任"); + alert("请您先录入团体意外伤害保险的必选责任"); return false; } diff --git a/lis-module-ind-config-service/src/main/java/com/sinosoft/lis/bq/InsuAccRateCheckBL.java b/lis-module-ind-config-service/src/main/java/com/sinosoft/lis/bq/InsuAccRateCheckBL.java index a07255b0..52db06f7 100644 --- a/lis-module-ind-config-service/src/main/java/com/sinosoft/lis/bq/InsuAccRateCheckBL.java +++ b/lis-module-ind-config-service/src/main/java/com/sinosoft/lis/bq/InsuAccRateCheckBL.java @@ -150,7 +150,7 @@ public class InsuAccRateCheckBL else if(mBonusType.equals("2")&&!"1".equals(mFiscalYear)) { tLPInsuAccRateSchema = mInputData.get(LPInsuAccRateSchema.class, 0); - tLPInsuAccRateSchema.setAccSerNo("01");//泰和多账户功能增加AccSerNo主键，因此只能暂时这样处理了 + tLPInsuAccRateSchema.setAccSerNo("01");//富泽多账户功能增加AccSerNo主键，因此只能暂时这样处理了 tLPInsuAccRateDB.setSchema(tLPInsuAccRateSchema); @@ -177,7 +177,7 @@ public class InsuAccRateCheckBL if("2".equals(mBonusType1)&&!"1".equals(mFiscalYear1)) { tLPInsuAccRateSchema = mInputData.get(LPInsuAccRateSchema.class, 0); - tLPInsuAccRateSchema.setAccSerNo("01");//泰和多账户功能增加AccSerNo主键，因此只能暂时这样处理了 + tLPInsuAccRateSchema.setAccSerNo("01");//富泽多账户功能增加AccSerNo主键，因此只能暂时这样处理了 tLPInsuAccRateDB.setAccSerNo(tLPInsuAccRateSchema.getAccSerNo()); tLPInsuAccRateDB.setEdorNo(tLPInsuAccRateSchema.getEdorNo()); tLPInsuAccRateDB.setEdorType(tLPInsuAccRateSchema.getEdorType()); diff --git a/lis-module-ind-config-web/src/main/webapp/bq/PEdorNewPopedomGroupMain.jsp b/lis-module-ind-config-web/src/main/webapp/bq/PEdorNewPopedomGroupMain.jsp index ce718c09..6c7b6f4d 100644 --- a/lis-module-ind-config-web/src/main/webapp/bq/PEdorNewPopedomGroupMain.jsp +++ b/lis-module-ind-config-web/src/main/webapp/bq/PEdorNewPopedomGroupMain.jsp @@ -3,8 +3,8 @@ *

Title: Life Insurance Bussiness System

*

Description: 保险核心业务管理系统

*

Copyright: Copyright (c) 2010 Yingda Taihe Life Insurance Co.,Ltd. All Rights Reserved

- *

Company: 泰和人寿保险股份有限公司

- *

WebSite: http://www.ydthlife.com

+ *

Company: 富泽人寿保险股份有限公司

+ *

WebSite: http://www.fz.com

* * @author : pengst * @version : 1.0 diff --git a/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigInit.jsp b/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigInit.jsp index 1f4c1cdd..2f80eb44 100644 --- a/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigInit.jsp +++ b/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigInit.jsp @@ -5,8 +5,8 @@ *

Title: Life Insurance Bussiness System

*

Description: 保险核心业务管理系统

*

Copyright: Copyright (c) 2010 Yingda Taihe Life Insurance Co.,Ltd. All Rights Reserved

- *

Company: 泰和人寿保险股份有限公司

- *

WebSite: http://www.ydthlife.com

+ *

Company: 富泽人寿保险股份有限公司

+ *

WebSite: http://www.fz.com

* * @author : pengst * @version : 1.0 diff --git a/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigMain.jsp b/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigMain.jsp index 4e2d85ff..6d899080 100644 --- a/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigMain.jsp +++ b/lis-module-ind-config-web/src/main/webapp/bq/PEdorSpecPopedomConfigMain.jsp @@ -6,8 +6,8 @@ *

Title: Life Insurance Bussiness System

*

Description: 保险核心业务管理系统

*

Copyright: Copyright (c) 2010 Yingda Taihe Life Insurance Co.,Ltd. All Rights Reserved

- *

Company: 泰和人寿保险股份有限公司

- *

WebSite: http://www.ydthlife.com

+ *

Company: 富泽人寿保险股份有限公司

+ *

WebSite: http://www.fz.com

* * @author : pengst * @version : 1.0 diff --git a/lis-module-task-service/src/main/java/com/sinosoft/lis/bank/FMSUnionPaySendToBankBL.java b/lis-module-task-service/src/main/java/com/sinosoft/lis/bank/FMSUnionPaySendToBankBL.java index 4f021f6c..d1f2990f 100644 --- a/lis-module-task-service/src/main/java/com/sinosoft/lis/bank/FMSUnionPaySendToBankBL.java +++ b/lis-module-task-service/src/main/java/com/sinosoft/lis/bank/FMSUnionPaySendToBankBL.java @@ -185,7 +185,7 @@ public class FMSUnionPaySendToBankBL { // + " and not exists (select 1 from ljaget where trim(actugetno) = (trim(a.actugetno)||'M'))" // + " and not exists (select 1 from lljagetclaim where actugetno = a.actugetno)" // + " and not exists (select 'X' from LJAFailState where trim(getnoticeno) = trim(a.actugetno) and datatype = 'F' and state in('0','1'))" -// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及泰和团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 +// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及富泽团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 // + " and not exists (select 1 from ljagetclaim d where d.riskcode in ('271001', '232003','232004') and d.getdutycode" // + " not in ('232335', '232336', '232337', '232419') and d.actugetno=a.actugetno and d.pay > 0 and exists (select 1 from" // + " LLClaimDetail h where h.clmno=d.otherno) and exists (select 1 from lCGet b where b.grpcontno = d.grpcontno" @@ -211,7 +211,7 @@ public class FMSUnionPaySendToBankBL { // + " and not exists (select 1 from ljaget where trim(actugetno) = (trim(a.actugetno)||'M'))" // + " and not exists (select 1 from lljagetclaim where actugetno = a.actugetno)" // + " and not exists (select 'X' from LJAFailState where trim(getnoticeno) = trim(a.actugetno) and datatype = 'F' and state in('0','1'))" -// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及泰和团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 +// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及富泽团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 // + " and not exists (select 1 from ljagetclaim d where d.riskcode in ('271001', '232003','232004') and d.getdutycode" // + " not in ('232335', '232336', '232337', '232419') and d.actugetno=a.actugetno and d.pay > 0 and exists (select 1 from" // + " LLClaimDetail h where h.clmno=d.otherno) and exists (select 1 from lCGet b where b.grpcontno = d.grpcontno" @@ -267,7 +267,7 @@ public class FMSUnionPaySendToBankBL { // +" and (BankCode = '"+bankCode+"' or BankCode = '"+bankCodeSort+"')" // +" and shoulddate <= '"+endDate+"' " // + " and not exists (select 'X' from LJAFailState where trim(getnoticeno) = trim(lljaget.UNITEGETNO) and datatype = 'F' and state in('0','1'))" -// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及泰和团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 +// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及富泽团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 // +" and not exists (select 1 from ljagetclaim d where d.riskcode in ('271001', '232003','232004') and d.getdutycode" // +" not in ('232335', '232336', '232337', '232419') and" // +" d.actugetno in(select j.actugetno from lljagetclaim j where j.unitegetno=lljaget.unitegetno)" @@ -290,7 +290,7 @@ public class FMSUnionPaySendToBankBL { // +" and shoulddate >= '"+startDate+"' " // +" and shoulddate <= '"+endDate+"' " // + " and not exists (select 'X' from LJAFailState where trim(getnoticeno) = trim(lljaget.UNITEGETNO) and datatype = 'F' and state in('0','1'))" -// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及泰和团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 +// //WH2016HXYWTX0079-20160518财务付费时增加对账户冲销校验--添加对账户B、康和及富泽团险理赔赔付后是否了扣减账户的校验，如果没有冲减账户，则在制盘提数中排除出去 // +" and not exists (select 1 from ljagetclaim d where d.riskcode in ('271001', '232003','232004') and d.getdutycode" // +" not in ('232335', '232336', '232337', '232419') and" // +" d.actugetno in(select j.actugetno from lljagetclaim j where j.unitegetno=lljaget.unitegetno)" diff --git a/lis-module-task-service/src/main/java/com/sinosoft/lis/clm/CapitalFRealPay.java b/lis-module-task-service/src/main/java/com/sinosoft/lis/clm/CapitalFRealPay.java index 79d9c0bf..f93cfd0d 100644 --- a/lis-module-task-service/src/main/java/com/sinosoft/lis/clm/CapitalFRealPay.java +++ b/lis-module-task-service/src/main/java/com/sinosoft/lis/clm/CapitalFRealPay.java @@ -646,7 +646,7 @@ public class CapitalFRealPay { paymentDetail.put("coInsuranceMark",coInsuranceMark);//共保标记 paymentDetail.put("virtualAccount","");//支出虚拟户 paymentDetail.put("electricData","");//是否电财数据 - paymentDetail.put("taiheFlag","");//泰和业务标志 + paymentDetail.put("taiheFlag","");//富泽业务标志 LJAGetClaimSet tLJAGetClaimSet = SQLProxy.getInstance(LJAGetClaimSQL.class).findAllByActuGetNo(tLJAGetSchema.getActuGetNo()); paymentDetail.put("policyNumber",tLJAGetClaimSet.get(1).getGrpContNo());//保单号