Merge remote-tracking branch 'origin/master'

lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCCustomerImpartSchema.java

@@ -187,8 +187,16 @@ public class LCCustomerImpartSchema extends Entity implements Schema<LCCustomerI
     @Column(index = 18, name = "DisDate", desc = "发病日期", type = Schema.TYPE_DATE)
     private Date disDate;
 
+    /**
+     * 详细描述
+     */
+    @Getter
+    @Setter
+    @Column(index = 19, name = "DescVal", desc = "详细描述", type = Schema.TYPE_STRING)
+    private String descVal;
+
 
-    public static final int FIELDNUM = 19; // 数据库表的字段个数
+    public static final int FIELDNUM = 20; // 数据库表的字段个数
 
     private transient FDate fDate = new FDate(); // 处理日期
 
@@ -287,7 +295,6 @@ public class LCCustomerImpartSchema extends Entity implements Schema<LCCustomerI
         return this;
     }
 
-
     public LCCustomerImpartSchema setSchema(LCCustomerImpartSchema aLCCustomerImpartSchema) {
         SchemaHelper.setSchema(aLCCustomerImpartSchema, this);
         return this;

lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContSchema.java

@@ -794,8 +794,48 @@ public class LCGrpContSchema extends Entity implements Schema<LCGrpContSchema>,
     @Column(index = 169, name = "ModifyOperator", desc = "最后一次修改操作员", type = Schema.TYPE_STRING)
     private String modifyOperator;
 
+    @Getter
+    @Setter
+    @Column(index = 170, name = "grpType", desc = "组织类型", type = Schema.TYPE_STRING)
+    private String grpType;
+
+    @Getter
+    @Setter
+    @Column(index = 171, name = "cDate", desc = "成立日期", type = Schema.TYPE_DATE)
+    private Date cDate;
+
+    @Getter
+    @Setter
+    @Column(index = 172, name = "bussarea", desc = "经营区域", type = Schema.TYPE_STRING)
+    private String bussarea;
+
+    @Getter
+    @Setter
+    @Column(index = 173, name = "Corporation1", desc = "法人姓名", type = Schema.TYPE_STRING)
+    private String Corporation1;
+
+    @Getter
+    @Setter
+    @Column(index = 174, name = "CorIDType1", desc = "法人证件类型", type = Schema.TYPE_STRING)
+    private String CorIDType1;
+
+    @Getter
+    @Setter
+    @Column(index = 175, name = "CorID1", desc = "法人证件号码", type = Schema.TYPE_STRING)
+        private String CorID1;
+
+    @Getter
+    @Setter
+    @Column(index = 176, name = "CorIDStartDate1", desc = "法人证件有效期起", type = Schema.TYPE_DATE)
+        private Date CorIDStartDate1;
+
+    @Getter
+    @Setter
+    @Column(index = 177, name = "CorIDExpiryDate1", desc = "法人证件有效期止", type = Schema.TYPE_DATE)
+    private Date CorIDExpiryDate1;
+
 
-    public static final int FIELDNUM = 170; // 数据库表的字段个数
+    public static final int FIELDNUM = 178; // 数据库表的字段个数
 
     private transient FDate fDate = new FDate(); // 处理日期
 
@@ -1806,6 +1846,73 @@ public class LCGrpContSchema extends Entity implements Schema<LCGrpContSchema>,
         return this;
     }
 
+
+    public String getCorIDStartDate1() {
+        if (CorIDStartDate1 != null)
+            return fDate.getString(CorIDStartDate1);
+        else
+            return null;
+    }
+
+    public LCGrpContSchema setCorIDStartDate1(Date acDate) {
+        CorIDStartDate1 = acDate;
+        return this;
+    }
+
+    public LCGrpContSchema setCorIDStartDate1(String acDate) {
+        if (acDate != null && !acDate.equals("") && !acDate.equals("null")) {
+            CorIDStartDate1 = fDate.getDate(acDate);
+        } else {
+            CorIDStartDate1 = null;
+        }
+        return this;
+    }
+
+    public String getCDate() {
+        if (cDate != null)
+            return fDate.getString(cDate);
+        else
+            return null;
+    }
+
+    public LCGrpContSchema setCDate(Date acDate) {
+        cDate = acDate;
+        return this;
+    }
+
+    public LCGrpContSchema setCDate(String acDate) {
+        if (acDate != null && !acDate.equals("") && !acDate.equals("null")) {
+            cDate = fDate.getDate(acDate);
+        } else {
+            cDate = null;
+        }
+        return this;
+    }
+
+
+    public String getCorIDExpiryDate1() {
+        if (CorIDExpiryDate1 != null)
+            return fDate.getString(CorIDExpiryDate1);
+        else
+            return null;
+    }
+
+    public LCGrpContSchema setCorIDExpiryDate1(Date acDate) {
+        CorIDExpiryDate1 = acDate;
+        return this;
+    }
+
+    public LCGrpContSchema setCorIDExpiryDate1(String acDate) {
+        if (acDate != null && !acDate.equals("") && !acDate.equals("null")) {
+            CorIDExpiryDate1 = fDate.getDate(acDate);
+        } else {
+            CorIDExpiryDate1 = null;
+        }
+        return this;
+    }
+
+
+
     public LCGrpContSchema setAmntShareRate(double aAmntShareRate) {
         amntShareRate = aAmntShareRate;
         return this;

lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java

@@ -136,8 +136,29 @@ public class LCGrpContactInfoSchema extends Entity implements Schema<LCGrpContac
     @Column(index = 20, name = "ModifyTime", desc = "最后一次修改时间", type = Schema.TYPE_STRING)
     private String modifyTime;
 
+    @Getter
+    @Setter
+    @Column(index = 21, name = "linkprovincecode", desc = "联系地址的省", type = Schema.TYPE_STRING)
+    private String linkProvinceCode;
+
+    @Getter
+    @Setter
+    @Column(index = 22, name = "linkcitycode", desc = "联系地址的市", type = Schema.TYPE_STRING)
+    private String linkCityCode;
+
+    @Getter
+    @Setter
+    @Column(index = 23, name = "linkcountycode", desc = "联系地址的区", type = Schema.TYPE_STRING)
+    private String linkCountyCode;
+
+    @Getter
+    @Setter
+    @Column(index = 24, name = "linkdetailaddr", desc = "联系地址的详细地址", type = Schema.TYPE_STRING)
+    private String linkDetailAddr;
+
+
 
-    public static final int FIELDNUM = 21; // 数据库表的字段个数
+    public static final int FIELDNUM = 25; // 数据库表的字段个数
 
     private transient FDate fDate = new FDate(); // 处理日期
 

lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpInvoiceDetailSchema.java

@@ -212,8 +212,20 @@ public class LCGrpInvoiceDetailSchema extends Entity implements Schema<LCGrpInvo
     @Column(index = 22, name = "ElectInvoiceEmail", desc = "电子发票接收邮箱", type = Schema.TYPE_STRING)
     private String electInvoiceEmail;
 
+    @Getter
+    @Setter
+    @Column(index = 23, name = "fuli", desc = "是否开通福利平台", type = Schema.TYPE_STRING)
+    private String fuli;
+    @Getter
+    @Setter
+    @Column(index = 24, name = "Taxpayer", desc = "纳税人类型", type = Schema.TYPE_STRING)
+    private String Taxpayer;
+    @Getter
+    @Setter
+    @Column(index = 25, name = "Invoice", desc = "发票样式", type = Schema.TYPE_STRING)
+    private String Invoice;
 
-    public static final int FIELDNUM = 23; // 数据库表的字段个数
+    public static final int FIELDNUM = 26; // 数据库表的字段个数
 
     private transient FDate fDate = new FDate(); // 处理日期
 

lis-model-policy-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerImpartSQL.java

@@ -139,4 +139,7 @@ public interface LCCustomerImpartSQL {
     SQLwithBindVariables deleteByGrpContNo(
             @Param("mGrpContNo") String mGrpContNo
     );
+
+    @SQL("select impartcode,impartver,impartcontent,impartparammodle,descval from LCCustomerImpart where grpcontno = '?grpContNo?' order by impartcontent")
+    SSRS selectCustomerImpartByGrpContNo(@Param("grpContNo") String grpContNo);
 }

lis-model-policy-schema/src/main/java/com/sinosoft/lis/sql/repository/LCGrpContSQL.java

@@ -540,4 +540,8 @@ WHERE a.GrpContNo = '?GrpContNo?'
 
     @SQL("select 1 from lcgrpcont l where l.GrpContNo = '?GrpContNo?'")
     String selectLcGrpContByGRPCONTNO(@Param("GrpContNo") String GrpContNo);
+
+
+    @SQL( value = "select grpType,grpNature from LCGrpCont where grpcontno = '?GrpContNo?' ")
+    SSRS selectGrpContByGRPCONTNO(@Param("GrpContNo") String GrpContNo);
 }

lis-module-common-bl/src/main/java/com/sinosoft/lis/bl/LCCustomerImpartBL.java

@@ -11,19 +11,55 @@ package com.sinosoft.lis.bl;
 import com.sinosoft.lis.i18n.I18nMessage;
 import com.sinosoft.lis.db.LBCustomerImpartDB;
 import com.sinosoft.lis.db.LCCustomerImpartDB;
+import com.sinosoft.lis.pubfun.GlobalInput;
+import com.sinosoft.lis.pubfun.MMap;
 import com.sinosoft.lis.pubfun.PubFun;
+import com.sinosoft.lis.controller.Action;
+import com.sinosoft.lis.pubfun.PubSubmit;
 import com.sinosoft.lis.schema.LBCustomerImpartSchema;
 import com.sinosoft.lis.schema.LCCustomerImpartSchema;
+import com.sinosoft.lis.sql.repository.LCCustomerImpartSQL;
 import com.sinosoft.lis.vschema.LBCustomerImpartSet;
 import com.sinosoft.lis.vschema.LCCustomerImpartSet;
-import com.sinosoft.utility.CError;
+import com.sinosoft.persistence.SQLProxy;
-import com.sinosoft.utility.Reflections;
+import com.sinosoft.utility.*;
-import com.sinosoft.utility.SQLwithBindVariables;
+import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Objects;
+import java.util.regex.Pattern;
+
 public class LCCustomerImpartBL {
     private static final Logger logger = LoggerFactory.getLogger(LCCustomerImpartBL.class);
+
+	private LCCustomerImpartSQL lCCustomerImpartSQL = SQLProxy.getInstance(LCCustomerImpartSQL.class);
+
+	/** 投保单号 */
+	private String grpContNo;
+
+	/** 错误处理类，每个需要错误处理的类中都放置该类 */
+	private CErrors mErrors = new CErrors();
+
+	/** 提交数据的容器 */
+	private MMap mMMap = new MMap();
+
+	/** 操作变量 */
+	private String mOperate;
+
+	private String mCurrentDate;
+	private String mCurrentTime;
+
+	/** 传入数据的容器 */
+	private VData mInputData = new VData();
+
+
+	public LCCustomerImpartBL() {
+
+		mCurrentDate = PubFun.getCurrentDate();
+		mCurrentTime = PubFun.getCurrentTime();
+	}
 	// @Constructor
 	public static LCCustomerImpartSchema get() {
 		LCCustomerImpartSchema schema = new LCCustomerImpartSchema();
@@ -134,4 +170,119 @@ public class LCCustomerImpartBL {
 		return tLCCustomerImpartSet;
 	}
 
+
+
+	public boolean submitData(List<LCCustomerImpartSchema> list,String operator) {
+
+		if (!getInputData(operator)) {
+			return false;
+		}
+
+		if (!checkData(list)) {
+			return false;
+		}
+
+		if (!dealData(list)) {
+			return false;
+		}
+
+        return saveData();
+    }
+
+	private boolean saveData() {
+		PubSubmit tPubSubmit = new PubSubmit();
+
+		mInputData.add(mMMap);
+		if (!tPubSubmit.submitData(mInputData, Action.INSERT_ACTION)) {
+			buildError("saveData", new I18nMessage("提交数据失败！", "LIS-08006"));
+			return false;
+		}
+		return true;
+	}
+
+	private boolean dealData(List<LCCustomerImpartSchema> list) {
+		LCCustomerImpartSchema lcCustomerImpartSchema = list.get(0);
+		grpContNo = lcCustomerImpartSchema.getGrpContNo();
+
+		if (Action.INSERT_ACTION.equals(mOperate)) {
+			SQLwithBindVariables sqLwithBindVariables = lCCustomerImpartSQL.deleteByGrpContNo(grpContNo);
+			mMMap.put(sqLwithBindVariables, MMap.Action.DELETE);
+
+			for (LCCustomerImpartSchema tLCCustomerImpartSchema : list) {
+				tLCCustomerImpartSchema.setModifyDate(mCurrentDate);
+				tLCCustomerImpartSchema.setMakeTime(mCurrentTime);
+				tLCCustomerImpartSchema.setModifyDate(mCurrentDate);
+				tLCCustomerImpartSchema.setMakeTime(mCurrentTime);
+				mMMap.put(tLCCustomerImpartSchema, MMap.Action.INSERT);
+			}
+		}
+		return true;
+	}
+
+	private boolean checkData(List<LCCustomerImpartSchema> list) {
+
+		for (LCCustomerImpartSchema tLCCustomerImpartSchema : list) {
+			String impartCode = tLCCustomerImpartSchema.getImpartCode();
+
+			String impartParamModle = tLCCustomerImpartSchema.getImpartParamModle();
+
+			if (StringUtils.isNotBlank(impartParamModle) && Objects.equals(impartCode, "A0101")){
+
+				String regex = "^\\d+(/\\d+){4}$";
+				Pattern pattern = Pattern.compile(regex);
+
+				if (!pattern.matcher(impartParamModle).matches()){
+					buildError("checkData",new I18nMessage(impartCode+"参数错误，格式为：参数1/参数2/参数3/参数4/参数5", "LIS-72097"));
+					return false;
+				}
+			}
+
+			if (StringUtils.isNotBlank(impartParamModle) && Objects.equals(impartCode, "A01010")){
+
+				String regex = "^\\d+(/\\d+)$";
+				Pattern pattern = Pattern.compile(regex);
+
+				if (!pattern.matcher(impartParamModle).matches()){
+					buildError("checkData",new I18nMessage(impartCode+"参数错误，格式为：参数1/参数2", "LIS-72098"));
+					return false;
+				}
+			}
+
+
+			if (StringUtils.isNotBlank(impartParamModle) && !Objects.equals(impartCode, "A01010") && !Objects.equals(impartCode, "A0101")) {
+				if (!Objects.equals(impartParamModle, "是") && !Objects.equals(impartParamModle, "否") ){
+					buildError("checkData",new I18nMessage(impartCode+"参数错误，请填是或否", "LIS-72099"));
+					return false;
+				}
+			}
+		}
+
+
+
+		return true;
+	}
+
+	private boolean getInputData(String operator) {
+		this.mOperate = operator;
+		return true;
+	}
+
+	public CErrors getErrors() {
+		return mErrors;
+	}
+
+	/**
+	 * 错误构造方法
+	 * @param tFunctionName
+	 * @param tErrorMessage
+	 */
+	private void buildError(String tFunctionName, I18nMessage tErrorMessage) {
+
+		CError tCError = new CError();
+		tCError.moduleName = this.getClass().getSimpleName();
+		tCError.functionName = tFunctionName;
+		tCError.errorMessage(tErrorMessage);
+		mErrors.addOneError(tCError);
+	}
+
 }

lis-module-easyscan-common-service/src/main/java/com/sinosoft/lis/pubfun/LisImageShow.java

@@ -115,7 +115,7 @@ public class LisImageShow {
             CallHTTP callHTTP = new CallHTTP(tES_DOC_PAGESSchema.getPageID(),tES_DOC_PAGESSchema.getHostName());
             logger.info("pagePath="+pagePath);
             logger.info("fileName="+pageName + pageSuffix);
-            InputStream targetObject = callHTTP.getObject("/"+pagePath, pageName + pageSuffix);
+            InputStream targetObject = callHTTP.getObject(pagePath, pageName + pageSuffix);
             if (targetObject != null) {
 
                 return targetObject;

lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java

@@ -148,12 +148,18 @@ public interface LCContSql {
             " OtherIdType," +
             " OtherIdNo, " +
             " b.AppntNo " +
+            ",b.grptype,(select codename from ldcode where codetype='grptype' and code= b.grptype)," +
+            "        b.cdate,b.bussarea," +
+            "        (select codename from ldcode where codetype='bussarea' and code= b.bussarea)," +
+            "       b.corporation1,b.coridtype1," +
+            "       (select codename from ldcode where codetype='idtype' and code= b.coridtype1)," +
+            "       b.corid1,b.coridstartdate1,b.coridexpirydate1"+
             " from lcgrpappnt a ,lcgrpcont b where a.GrpContNo =b.GrpContNo  @{0}", clauses = {
             @Clause(key = 0, clause = "and a.grpcontno = '#{para0}'", expression = "#{para0} != empty")})
     SSRS LCContSql4(@Param("para0") String para0);
 
     //#省市县查询
-    @SQL(value = "select a.grpcontno,a.province,(select placename from ldaddress where placetype='01' and placecode=a.province),a.city,(select placename from ldaddress where placetype='02' and placecode=a.city),a.county,(select placename from ldaddress where placetype='03' and placecode=a.county),a.address,a.zipcode from  LCGrpContactInfo a  where  1=1  @{0}", clauses = {
+    @SQL(value = "select a.grpcontno,a.province,(select placename from ldaddress where placetype='01' and placecode=a.province),a.city,(select placename from ldaddress where placetype='02' and placecode=a.city),a.county,(select placename from ldaddress where placetype='03' and placecode=a.county),a.address,a.zipcode,a.linkprovincecode,(select placename from ldaddress where placetype='01' and placecode=a.linkprovincecode), a.linkcitycode,(select placename from ldaddress where placetype='02' and placecode=a.linkcitycode),a.linkcountycode,(select placename from ldaddress where placetype='03' and placecode=a.linkcountycode),a.linkdetailaddr\n from  LCGrpContactInfo a  where  1=1  @{0}", clauses = {
             @Clause(key = 0, clause = "and a.GrpContNo = '#{para0}'", expression = "#{para0} != empty")})
     SSRS LCContSql5(@Param("para0") String para0);
 
@@ -379,7 +385,7 @@ public interface LCContSql {
     SSRS LCContSql44(@Param("para0") String para0);
 
     //#计价方式查询
-    @SQL(value = "select a.TaxpaperFlag,(select m.codename from ldcode m where m.codetype='invoicetypeflag' and m.code=a.TaxpaperFlag ),a.TaxpayerName,a.TaxpayerNo,a.BankName,a.BankAccNo,a.Phone,a.Address,a.IsElecInvoicePrint,(select CodeName from ldcode where CodeType ='iselecinvoiceprint' and Code = a.IsElecInvoicePrint),a.ElectInvoiceEmail from LCGrpInvoiceDetail a where 1=1  @{0}", clauses = {
+    @SQL(value = "select a.TaxpaperFlag,(select m.codename from ldcode m where m.codetype='invoicetypeflag' and m.code=a.TaxpaperFlag ),a.TaxpayerName,a.TaxpayerNo,a.BankName,a.BankAccNo,a.Phone,a.Address,a.IsElecInvoicePrint,(select CodeName from ldcode where CodeType ='iselecinvoiceprint' and Code = a.IsElecInvoicePrint),a.ElectInvoiceEmail,a.fuli,(select codename from ldcode where codetype='trueflag' and code=a.fuli),a.taxpayer,(select codename from ldcode where codetype='taxpayer' and code=a.taxpayer),a.invoice,(select codename from ldcode where codetype='invoice' and code=a.invoice) from LCGrpInvoiceDetail a where 1=1  @{0}", clauses = {
             @Clause(key = 0, clause = "and a.GrpContNo = '#{para0}'", expression = "#{para0} != empty")})
     SSRS LCContSql45(@Param("para0") String para0);
     @SQL(value = "select 1 from lccontplan a where 1=1  @{0}", clauses = {

lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentInput.jsp

@@ -0,0 +1,322 @@
+<%
+    /***************************************************************
+     * <p>ProName：LDHealthAttachmentInput.jsp</p>
+     * <p>Title：附件管理</p>
+     * <p>Description：附件管理</p>
+     * <p>Copyright：Copyright (c) 2012</p>
+     * <p>Company：Sinosoft</p>
+     * @author   : zhoufz
+     * @version  : 8.0
+     * @date     : 2014-03-20
+     ****************************************************************/
+%>
+<%@page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
+<%@include file="../common/jsp/UsrCheck.jsp" %>
+<%@page import="com.sinosoft.utility.XssUtil" %>
+<%
+    String tOtherNoType = XssUtil.escapeJavaScript(request.getParameter("OtherNoType"));
+    String tOtherNo = XssUtil.escapeJavaScript(request.getParameter("OtherNo"));
+    String tSubOtherNo = XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"));
+    String tUploadNode = XssUtil.escapeJavaScript(request.getParameter("UploadNode"));
+
+    String[] t告知内容 = {
+            "1、投保单位过去三年有发生过死亡或伤残情况?是否向保险公司索赔过医疗保险金?若“是”请告知。＿年 疾病身故人数＿ 意外身故人数＿ 残疾人数＿ 医疗发生金额＿元",
+            "2、投保单位未在工作现场为参保人员提供《中华人民共和国劳动法》、《中华人民共和国安全生产法》、《中华人民共和国建筑法》等法律法规要求的安全技术、安全防护措施和其他维护安全、防范危险、预防火灾等措施?",
+            "3、参加投保的被保险人,近一年是否存在因患病或其他健康原因而不能工作连续达10个工作日或减轻劳动量的情况？",
+            "4、参加投保的被保险人，现在或过去是否存在患重大疾病或住院连续超过10天、或病假连续超过10天的情况？重大疾病内容如下：\n" +
+                    "a、心脏病(心功能不全Ⅱ级及Ⅱ级以上)。\n" +
+                    "b、高血压(Ⅱ级及Ⅱ级以上)、冠心病、心肌梗塞、心脏瓣膜病。\n" +
+                    "c、脑血管疾病(脑出血、脑梗塞)、脑部的良性肿瘤、癫痫病、瘫痪、帕金森氏症。\n" +
+                    "d、慢性肾脏疾病(肾小球肾炎、肾盂肾炎、肾病综合征、肾功能不全)。\n" +
+                    "e、慢性阻塞性肺病(慢性支气管炎、肺气肿、肺心病)。\n" +
+                    "f、慢性活动性肝炎、慢性病毒性肝炎、肝硬化。\n" +
+                    "g、白血病、再生障碍性贫血、淋巴瘤、系统性红斑狼疮、糖尿病。\n" +
+                    "h、任何恶性肿瘤、任何性质不明的肿块/阴影/结节。\n" +
+                    "i、任何精神疾病、任何先天性或遗传性疾病、传染性疾病、性病或艾滋病。",
+            "5、参加投保的被保险人，是否需要参加飞行、潜水、登山、攀岩、赛车、赛马、举重、武术比赛、滑雪、滑浪、漂流、蹦极等危险活动？",
+            "6、参加投保的被保险人的职业是否涉及或接触任何危险物（化学物质、爆炸物、有毒物质、放射性物品或其他危险物）、高处作业（指在距坠落高度基准面 2 米或 2 米以上有可能坠落的高处进行的作业）、高压作业、潜水或水下作业、隧道坑道或井下作业等危险工作？",
+            "7、参加投保的被保险人，是否因工作原因需要前往正在或经常发生自然灾害、病疫、战乱、动乱、种族冲突、政局动荡的危险地区或国家？",
+            "8、参加投保的被保险人，是否存在以下一项或多项：\n" + "(1)非投保单位员工或非团体成员的人员(连带被保险人除外)?(2)计划长期居住或逗留在中国大陆以外的国家或地区累计超过6个月的人员? (3)残障、职业病人员?",
+            "9、投保时是否有正在怀孕的员工？",
+            "10、投保身故责任的未成年人是否有其他生效中的身故责任保险?若“是”请告知。\n" +
+                    "富泽人寿＿万元；其他保险公司＿万元。"
+    };
+%>
+<script>
+    var tOtherNoType = "<%=tOtherNoType%>";
+    var tOtherNo = "<%=tOtherNo%>";
+    var tSubOtherNo = "<%=tSubOtherNo%>";
+    var tUploadNode = "<%=tUploadNode%>";
+</script>
+<html>
+<head>
+    <%--<title>附件管理</title>--%><title>LIS</title>
+    <script src="../common/javascript/Common.js"></script>
+    <script src="../common/cvar/CCodeOperate.js"></script>
+    <script src="../common/javascript/MulLine.js"></script>
+    <script src="../common/javascript/EasyQuery.js"></script>
+    <script src="../common/easyQueryVer3/EasyQueryVer3.js"></script>
+    <script src="../common/easyQueryVer3/EasyQueryCache.js"></script>
+    <script src="../common/javascript/VerifyInput.js"></script>
+    <SCRIPT src="../common/laydate/laydate.js"></SCRIPT>
+    <link href="../common/css/Project.css" rel=stylesheet type=text/css>
+    <LINK href="../common/css/Project3.css" rel=stylesheet type=text/css>
+    <link href="../common/css/mulLine.css" rel=stylesheet type=text/css>
+    <script src="./LDAttachmentInput.js"></script>
+    <%@include file="./LDAttachmentInit.jsp" %>
+    <script src="../common/javascript/i18n/jquery.i18n.js"></script>
+    <script src="../common/javascript/i18n/jquery.i18n.messagestore.js"></script>
+    <script src="../common/javascript/i18n/i18n.js"></script>
+</head>
+<body onload="initForm(); initElementtype();">
+
+
+<form name=fm id=fm method=post action="" target=fraSubmit>
+    <div id="divAttachment" class="container Grid" showname="附件列表">
+        <%--		<table class=common>--%>
+        <%--			<tr class=common>--%>
+        <%--				<td text-align: left colSpan=1>--%>
+        <span id="spanAttachmentGrid"></span>
+        <%--				</td>--%>
+        <%--			</tr>--%>
+        <%--		</table>--%>
+    </div>
+</form>
+<form name=fmupload id=fmupload method=post action="" ENCTYPE="multipart/form-data" target=fraSubmit>
+    <div id="divAttachmentUpload" style="display: ''">
+        <table class=common>
+            <%--			<tr class=common>--%>
+            <%--				<td class=title data-i18n="AttachmentType">附件类型</td>--%>
+            <%--				<td class=input colspan=5><input class=codeno name=AttachType id=AttachType readonly verify="附件类型~AttachmentType|notnull" style="background:url(../common/images/select--bg_03.png) no-repeat right center"--%>
+            <%--					ondblclick="return showCodeList('attachtype',[this, AttachTypeName],[0, 1],null,null,null,'1',180);" --%>
+            <%--					onkeyup="return showCodeListKey('attachtype',[this, AttachTypeName],[0, 1],null,null,null,'1',180);">--%>
+            <%--					<input class=codename name=AttachTypeName id=AttachTypeName readonly elementtype=nacessary></td>--%>
+            <%--			</tr>--%>
+            <tr>
+                <td class=title data-i18n="AttachmentPath">附件路径</td>
+                <%--				<td class=input colspan=5><input class=common type=file verify="附件路径~AttachmentPath|notnull" name=UploadPath style="width:400px" elementtype=nacessary><font color="#FF0000">（<span data-i18n="LIS-00112">仅支持txt，doc，docx，xls，xlsx，pdf，zip，eml 格式的文件上载，文件大小不超过5M</span>）</font></td>--%>
+                <td class=input colspan=5><input class=common type=file verify="附件路径~AttachmentPath|notnull"
+                                                 name=UploadPath style="width:400px" elementtype=nacessary><font
+                        color="#FF0000">（<span style="color: red">仅支持txt，doc，docx，xls，xlsx，pdf，zip，eml 格式的文件上载，询价要求文件大小不超过10M</span>）</font>
+                </td>
+            </tr>
+            <tr class=common>
+                <td class=title></td>
+                <td class=input></td>
+                <td class=title></td>
+                <td class=input></td>
+                <td class=title></td>
+                <td class=input></td>
+            </tr>
+        </table>
+        <input class=cssButton type=button name=UploadButton value="上传附件" data-i18n="AttachmentUpload-1"
+               id="upLoadClickBtn" onclick="upLoadClick();">
+        <input class=cssButton type=button name=DownloadButton value="下载附件" data-i18n="DownloadAttachmt"
+               id="downLoadClickBtn" onclick="downLoadClick();">
+        <input class=cssButton type=button name=DeleteButton value="删除附件" data-i18n="DelAttachment"
+               id="deleteClickBtn" onclick="deleteClick();">
+        <input class=cssButton type=button value="关 闭" data-i18n="Closed" id="closeBtn" onclick="top.close();">
+        <input class=cssButton type=button value="关 闭" data-i18n="Closed" id="closeBtn1" onclick="top.close();">
+
+    </div>
+    <br/><br/><br/><br/>
+</form>
+
+
+<span id="spanCode" style="display: 'none'; position:absolute; slategray"></span>
+
+<div id="divAgentDetailInfo" style="display: ''; margin: 10px;">
+    <table class="common" width="100%">
+        <tbody>
+        <tr>
+            <td class="titleImg normal">
+                <span class="containerExpandButton">健康告知录入 (说明：1、建工险仅需填写第1-2项；2、第3-10项若为“是”,请在“详细描述”栏写明。)</span>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+
+    <div id="divAgentDetail" class="container grid" showname="健康告知录入" style="display: ''">
+        <span id="spanAgentDetailGrid">
+            <!-- 简化后的表格结构 -->
+            <div class="flexigrid">
+                <!-- 表头 -->
+                <div class="hDiv">
+                    <div class="hDivBox">
+                        <table cellpadding="0" cellspacing="0" style="width: 100%">
+                            <thead>
+                                <tr>
+                                    <!-- 列宽比例约为 1:2:2:3:3 -->
+                                    <th axis="col1"><div style="width: 50px; text-align: center;">序号</div></th>
+                                    <th axis="col2"><div style="width: 100px; text-align: center;">告知版别</div></th>
+                                    <th axis="col3"><div style="width: 100px; text-align: center;">告知编码</div></th>
+                                    <th axis="col4"><div style="width: 800px; text-align: center;">告知内容</div></th>
+                                    <th axis="col5"><div style="width: 150px; text-align: center;">填写内容</div></th>
+                                    <th axis="col6"><div style="width: 170px; text-align: center;">详细说明</div></th>
+
+                                </tr>
+                            </thead>
+                        </table>
+                    </div>
+                </div>
+
+                <!-- 表体 (10行数据) -->
+                <div class="bDiv" style="height: auto;">
+                    <table cellpadding="0" cellspacing="0" border="0" class="autoht">
+                        <tbody>
+                            <!-- 以下是10行数据的循环，序号1-10 -->
+                            <!-- 每一行的ID和Name属性做了简单的递增处理以确保唯一性 -->
+                            <% for(int i=1; i<=10; i++) { %>
+                            <tr id="spanAgentDetailGrid<%=i-1%>" style="border-left: 2px solid #1ea5df;">
+                                <!-- 序号列 (固定 1-10) -->
+                                <td class="muline">
+                                    <div style="width:50px;">
+                                        <input type="text"
+                                               name="AgentDetailGridNo<%=i%>"
+                                               value="<%=i%>"
+                                               class="mulreadonly"
+                                               style="width:50px; text-align:center; border:none; background:#f0f0f0;"
+                                               readonly="readonly">
+                                    </div>
+                                </td>
+
+                                <!-- 告知版别 (固定值，示例为"通用版") -->
+                                <td class="muline">
+                                    <div style="width:100px;">
+                                        <input type="text"
+                                               name="AgentDetailGridVer<%=i%>"
+                                               value="A01"
+                                               class="mulreadonly"
+                                               style="width:100px; text-align:center; border:none; background:#f0f0f0;"
+                                               readonly="readonly">
+                                    </div>
+                                </td>
+
+                                <!-- 告知编码 (固定值，示例为"GD00<行号>") -->
+                                <td class="muline">
+                                    <div style="width:100px;">
+                                        <input type="text"
+                                               name="AgentDetailGridCode<%=i%>"
+                                               value="A010<%=i%>"
+                                               class="mulreadonly"
+                                               style="width:100px; text-align:center; border:none; background:#f0f0f0;"
+                                               readonly="readonly">
+                                    </div>
+                                </td>
+
+                                <!-- 告知内容 (核心修改：取数组中的值) -->
+                                <td class="muline">
+                                    <div style="width:800px;">
+                                    <input type="text"
+                                    name="AgentDetailGridText<%=i-1%>"
+                                    value="<%= t告知内容[i-1] %>"
+                                    class="mulreadonly"
+                                    style="width:800px; text-align:left; padding-left:2px; border:none; background:#fff;"
+                                    readonly="readonly"
+                                    title="<%= t告知内容[i-1] %>">
+                                    </div>
+                                </td>
+
+                                <!-- 填写内容 (用户手输入) -->
+                                <td class="muline">
+                                    <div style="width:150px;">
+                                        <input type="text"
+                                               name="AgentDetailGridInput<%=i%>"
+                                               value=""
+                                               class="mulcommon"
+                                               style="width:150px; text-align:left; padding-left:2px; border:none;"
+                                               verify="填写内容|notnull"
+                                               onfocus="this.style.border='1px solid #1ea5df';"
+                                               onblur="this.style.border='none';">
+                                    </div>
+                                </td>
+
+                                <!-- 详细说明 (用户手输入) -->
+                                <td class="muline">
+                                    <div style="width:170px;">
+                                        <input type="text"
+                                               name="AgentDetailGridDesc<%=i%>"
+                                               value=""
+                                               class="mulcommon"
+                                               style="width:170px; text-align:left; padding-left:2px; border:none;"
+                                               verify="详细说明|notnull"
+                                               onfocus="this.style.border='1px solid #1ea5df';"
+                                               onblur="this.style.border='none';">
+                                    </div>
+                                </td>
+                            </tr>
+                            <% } %>
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </span>
+    </div>
+</div>
+
+<!-- 1. 右下角的保存按钮样式 -->
+<div style="text-align: right; margin-top: 10px; margin-right: 10px;">
+    <input class="cssButton" type="button" value="保 存" id="saveHealthDetailBtn" onclick="saveHealthDetailData();">
+</div>
+
+
+
+<!-- 2. 数据收集与发送脚本 -->
+<script>
+    function saveHealthDetailData() {
+            var dataList = []; // 用于存储所有行的数据
+
+            // 循环获取 1-10 行的输入框数据
+            for (var i = 1; i <= 10; i++) {
+                var rowData = {
+                    seqNo: document.querySelector('input[name="AgentDetailGridNo' + i + '"]').value,
+                    impartVer: document.querySelector('input[name="AgentDetailGridVer' + i + '"]').value,
+                    impartCode: document.querySelector('input[name="AgentDetailGridCode' + i + '"]').value,
+                    impartContent: document.querySelector('input[name="AgentDetailGridText' + (i-1) + '"]').value,
+                    impartParam: document.querySelector('input[name="AgentDetailGridInput' + i + '"]').value,
+                    descVal: document.querySelector('input[name="AgentDetailGridDesc' + i + '"]').value
+                };
+                dataList.push(rowData);
+            }
+
+            // 【核心修改】将 tOtherNo 和表格数据打包成一个对象
+            // 这里的 '<%=tOtherNo%>' 是 JSP 语法，会在页面加载时直接替换为真实的值
+            var submitData = {
+                grpContNo: '<%=tOtherNo%>',
+                body: dataList
+            };
+
+            console.log("准备提交的数据:", submitData);
+
+            // 发送 AJAX 请求给后端
+            var xhr = new XMLHttpRequest();
+            xhr.open('POST', '../API/grp_nb/g_app/LCCustomerImpartSave/ADD', true);
+            xhr.setRequestHeader('Content-Type', 'application/json');
+
+        xhr.onreadystatechange = function() {
+            if (xhr.readyState === 4 && xhr.status === 200) {
+                var response = JSON.parse(xhr.responseText);
+
+                // 修改点1：使用后端实际返回的字段名 'suc' 进行判断
+                // 或者使用 if (response.flagStr === "Success")
+                if (response.suc === true) {
+                    alert('健康告知保存成功！');
+                } else {
+                    // 修改点2：使用后端实际返回的错误信息字段 'content' 或 'flagStr'
+                    // content 字段里有具体的错误原因（如：提交数据失败！）
+                    alert('保存失败：' + response.content);
+                }
+            } else if (xhr.readyState === 4) {
+                alert('网络请求异常，状态码：' + xhr.status);
+            }
+        };
+
+            // 发送包含 otherNo 的整体数据
+            xhr.send(JSON.stringify(submitData));
+        }
+</script>
+
+</body>
+
+
+</html>

lis-module-grp-common-web/src/main/webapp/g_busicommon/LDHealthAttachmentMain.jsp

@@ -0,0 +1,62 @@
+<%
+    /***************************************************************
+     * <p>ProName：LDHealthAttachmentMain.jsp</p>
+     * <p>Title：附件管理</p>
+     * <p>Description：附件管理</p>
+     * <p>Copyright：Copyright (c) 2012</p>
+     * <p>Company：Sinosoft</p>
+     * @author   : zhoufz
+     * @version  : 8.0
+     * @date     : 2014-03-20
+     ****************************************************************/
+%>
+<%@page pageEncoding="UTF-8" contentType="text/html;charset=UTF-8" %>
+<%@include file="../common/jsp/UsrCheck.jsp"%>
+<%@page import="com.sinosoft.utility.XssUtil"%>
+<html>
+<head>
+    <%--<title>附件管理</title>--%><title>LIS</title>
+    <script src="../common/javascript/jquery-1.7.2.js"></script>
+    <script src="../common/javascript/Common.js"></script>
+
+</head>
+
+<script language="javascript">
+    var intPageWidth=screen.availWidth;
+    var intPageHeight=screen.availHeight;
+    window.resizeTo(intPageWidth,intPageHeight);
+    window.focus();
+
+</script>
+<frameset name="fraMain" rows="0,0,0,*" frameborder="no" border="1" framespacing="0" cols="*">
+    <%--标题与状态区域--%>
+    <%--保存客户端变量的区域，该区域必须有--%>
+    <frame name="VD" src="../common/cvar/CVarData.jsp">
+
+    <%--保存客户端变量和WebServer实现交户的区域，该区域必须有--%>
+    <frame name="EX" src="../common/cvar/CExec.jsp">
+
+
+    <frame name="fraTitle"  scrolling="no" noresize src="about:blank" >
+    <frameset name="fraSet" cols="0%,*,0%" frameborder="no" border="1" framespacing="0" rows="*">
+        <%--菜单区域--%>
+        <frame name="fraMenu" scrolling="yes" noresize src="about:blank">
+        <%
+            String tUploadNode = XssUtil.escapeJavaScript(request.getParameter("UploadNode"));
+            String tOtherNoType = XssUtil.escapeJavaScript(request.getParameter("OtherNoType"));
+            String tOtherNo = XssUtil.escapeJavaScript(request.getParameter("OtherNo"));
+            String tSubOtherNo = XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"));
+        %>
+        <%--交互区域--%>
+        <frame id="fraInterface" name="fraInterface" scrolling="auto" src="./LDHealthAttachmentInput.jsp?OtherNoType=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNoType"))%>&OtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNo"))%>&SubOtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"))%>&UploadNode=<%=XssUtil.escapeJavaScript(request.getParameter("UploadNode"))%>" />
+        <%--./LDAttachmentInput.jsp?OtherNoType=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNoType"))%>&OtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("OtherNo"))%>&SubOtherNo=<%=XssUtil.escapeJavaScript(request.getParameter("SubOtherNo"))%>&UploadNode=<%=XssUtil.escapeJavaScript(request.getParameter("UploadNode"))%>--%>
+        <%--下一步页面区域--%>
+        <frame id="fraNext" name="fraNext" scrolling="auto" src="about:blank"/>
+    </frameset>
+</frameset>
+<noframes>
+    <body bgcolor="#ffffff">
+    </body>
+</noframes>
+
+</html>

lis-module-grp-nb-schema/src/main/java/com/sinosoft/lis/sql/repository/LCCustomerIDSQL.java

@@ -26,4 +26,8 @@ public interface LCCustomerIDSQL {
     @SQL("select * from LcCustomerID where  PolicyNo  ='?tGrpContNo?' and IDFlag  ='00' and IDTYPE ='6' and CustomerNo  ='?tCustomerNo?'")
     LCCustomerIDSet getLCCustomerIDSetByGrpContNoAndCustomerNo(@Param("tGrpContNo") String tGrpContNo,
                                                                 @Param("tCustomerNo") String tCustomerNo);
+
+    @SQL(value = "select IDType,EndDate from LCCustomerID where PolicyNo = '?grpContNo?' ")
+    SSRS getSSRSByGrpContNo(@Param("grpContNo") String grpContNo);
+
 }

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCCustomerImpartController.java

@@ -0,0 +1,95 @@
+package com.sinosoft.lis.controller.g_app;
+
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.sinosoft.lis.bl.LCCustomerImpartBL;
+import com.sinosoft.lis.controller.Action;
+import com.sinosoft.lis.controller.ResponseInfo;
+import com.sinosoft.lis.controller.Service;
+
+import com.sinosoft.lis.i18n.I18nMessage;
+import com.sinosoft.lis.pubfun.GlobalInput;
+import com.sinosoft.lis.schema.LCCustomerImpartSchema;
+import com.sinosoft.lis.vo.g_app.LCCustomerImpartAddVO;
+import io.swagger.annotations.ApiOperation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+@RequestMapping(value = Service.GRP_NB)
+public class LCCustomerImpartController {
+
+    private static final Logger logger = LoggerFactory.getLogger(LCCustomerImpartController.class);
+
+    @ResponseBody
+    @ApiOperation("新单管理-->生成投保单-->投保书信息-->被保险人清单维护-->健康告知书附件上载-->健康保存")
+    @PostMapping(value = "/g_app/LCCustomerImpartSave/" + Action.ADD_ACTION)
+    public ResponseInfo add(@RequestBody LCCustomerImpartAddVO request) {
+        request.setAction(Action.ADD_ACTION);
+        return dealMethod(request);
+    }
+
+    private ResponseInfo dealMethod(@RequestBody LCCustomerImpartAddVO lcCustomerImpartAddVO){
+        String operator = Action.INSERT_ACTION;
+        ResponseInfo response = new ResponseInfo();
+        GlobalInput tGI = GlobalInput.get();
+        if (tGI == null) {
+            response.setContent(new I18nMessage("页面失效,请重新登陆", "LIS-18239").getMessage());
+            response.fail();
+            return response;
+        }
+
+        List<LCCustomerImpartAddVO.LCCustomerImpartAddParam> body = lcCustomerImpartAddVO.getBody();
+
+        if (CollectionUtil.isEmpty(lcCustomerImpartAddVO.getBody())){
+            response.succ();
+            return response;
+        }
+
+        List<LCCustomerImpartSchema> schemaList = new ArrayList<>();
+
+        for (LCCustomerImpartAddVO.LCCustomerImpartAddParam param : body){
+            String grpContNo = lcCustomerImpartAddVO.getGrpContNo();
+            LCCustomerImpartSchema schema = new LCCustomerImpartSchema();
+            schema.setGrpContNo(grpContNo);
+            schema.setContNo(grpContNo);
+            schema.setProposalContNo(grpContNo);
+            schema.setImpartCode(param.getImpartCode());
+            schema.setImpartVer(param.getImpartVer());
+            schema.setImpartContent(param.getImpartContent());
+            schema.setImpartParamModle(param.getImpartParam());
+            schema.setDescVal(param.getDescVal());
+            schema.setPatchNo(1);
+            schema.setOperator(tGI.Operator);
+            schema.setCustomerNo("");
+            schema.setCustomerNoType("");
+            schemaList.add(schema);
+        }
+
+        LCCustomerImpartBL lcCustomerImpartBL = new LCCustomerImpartBL();
+        if (lcCustomerImpartBL.submitData(schemaList,operator)){
+            response.setContent("操作成功");
+            response.succ();
+        }else {
+            response.setContent(lcCustomerImpartBL.getErrors().getLastError());
+            response.fail();
+        }
+        return response;
+    }
+
+
+
+
+
+
+
+
+}

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java

@@ -411,6 +411,24 @@ public class LCGrpContPolController {
                     String mOnJobNumber =request.getParameter("AllOnWorkPeoples");
                     String mRetireNumber = request.getParameter("AllOffWorkPeoples");
 
+                    //法人信息
+                    String mCorporation1 = request.getParameter("Corporation1");
+                    String mCorIDType1 = request.getParameter("CorIDType1");
+                    String mCorID1 = request.getParameter("CorID1");
+                    String mCorIDStartDate1 = request.getParameter("CorIDStartDate1");
+                    String mCorIDExpiryDate1 = request.getParameter("CorIDExpiryDate1");
+                    String mGrpType = request.getParameter("grpType");
+                    String mcDate = request.getParameter("cDate");
+                    String mBussarea = request.getParameter("bussarea");
+                    mLCGrpContSchema.setCorporation1(mCorporation1);
+                    mLCGrpContSchema.setCorIDType1(mCorIDType1);
+                    mLCGrpContSchema.setCorID1(mCorID1);
+                    mLCGrpContSchema.setCorIDStartDate1(mCorIDStartDate1);
+                    mLCGrpContSchema.setCorIDExpiryDate1(mCorIDExpiryDate1);
+                    mLCGrpContSchema.setGrpType(mGrpType);
+                    mLCGrpContSchema.setCDate(mcDate);
+                    mLCGrpContSchema.setBussarea(mBussarea);
+
                     String mMainBusiness = request.getParameter("MainBusiness");
                     String mGrpNature = request.getParameter("GrpNature");
                     String mBusiCategory =request.getParameter("BusiCategory");
@@ -502,6 +520,13 @@ public class LCGrpContPolController {
                     String mCountyCode = request.getParameter("CountyCode");
                     String mDetailAddress = request.getParameter("DetailAddress");
                     String mZipCode = request.getParameter("ZipCode");
+
+                    //
+
+                    String mLinkProvinceCode = request.getParameter("LinkProvinceCode2");
+                    String mLinkCityCode = request.getParameter("LinkCityCode2");
+                    String mLinkCountyCode = request.getParameter("LinkCountyCode2");
+                    String mLinkDetailAddr = request.getParameter("LinkDetailAddr");
                     //---------------------------------------------------------------------------------------------------------------------
                     mLCGrpContactInfoSchema = new LCGrpContactInfoSchema();
                     mLCGrpContactInfoSchema.setGrpContNo(mGrpPropNo);
@@ -512,6 +537,12 @@ public class LCGrpContPolController {
                     mLCGrpContactInfoSchema.setCounty(mCountyCode);
                     mLCGrpContactInfoSchema.setAddress(mDetailAddress);
                     mLCGrpContactInfoSchema.setZipCode(mZipCode);
+
+                    mLCGrpContactInfoSchema.setLinkProvinceCode(mLinkProvinceCode);
+                    mLCGrpContactInfoSchema.setLinkCityCode(mLinkCityCode);
+                    mLCGrpContactInfoSchema.setLinkCountyCode(mLinkCountyCode);
+                    mLCGrpContactInfoSchema.setLinkDetailAddr(mLinkDetailAddr);
+
                     //-------------------------------单位证件信息--------------------------------------------------------------
                     String mGrpIDType = request.getParameter("GrpIDType");
                     String mGrpID = request.getParameter("GrpID");
@@ -670,6 +701,13 @@ public class LCGrpContPolController {
                     String mTaxBankAccNo = request.getParameter("TaxBankAccNo");
                     String mTaxPhone = request.getParameter("TaxPhone");
                     String mTaxAddress = request.getParameter("TaxAddress");
+                    //
+                    String fuli = request.getParameter("fuli");
+                    String taxpayer = request.getParameter("Taxpayer");
+                    String invoice = request.getParameter("Invoice");
+                    mLCGrpInvoiceDetailSchema.setFuli(fuli);
+                    mLCGrpInvoiceDetailSchema.setTaxpayer(taxpayer);
+                    mLCGrpInvoiceDetailSchema.setInvoice(invoice);
 
 
                     mLCGrpInvoiceDetailSchema.setGrpContNo(mGrpPropNo);

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/g_app/LCContPrtPrintBL.java

@@ -10,6 +10,8 @@ import com.sinosoft.lis.sql.easyquery.g_print.TBNoticePrintSql;
 import com.sinosoft.lis.sql.g_app.LCContPrtPrintBLSQL;
 import com.sinosoft.lis.sql.g_app.LCInsuredDealBLSQL;
 import com.sinosoft.lis.sql.g_app.LCPolicySignBLSQL;
+import com.sinosoft.lis.sql.repository.LCCustomerIDSQL;
+import com.sinosoft.lis.sql.repository.LCCustomerImpartSQL;
 import com.sinosoft.lis.sql.repository.LCGrpContSQL;
 import com.sinosoft.lis.sql.repository.LCInsuredSQL;
 import com.sinosoft.persistence.SQLProxy;
@@ -56,6 +58,8 @@ public class LCContPrtPrintBL  implements BusinessService {
     private LCPolicySignBLSQL lcPolicySignBLSQL = SQLProxy.getInstance(LCPolicySignBLSQL.class);
     private ExeSQL mExeSQL = new ExeSQL();
     private LCContPrtPrintBLSQL lcContPrtPrintBLSQL = SQLProxy.getInstance(LCContPrtPrintBLSQL.class);
+    private LCCustomerIDSQL lcCustomerIDSQL = SQLProxy.getInstance(LCCustomerIDSQL.class);
+    private LCCustomerImpartSQL lcCustomerImpartSQL = SQLProxy.getInstance(LCCustomerImpartSQL.class);
 
     private TBNoticePrintSql tbNoticePrintSql = SQLProxy.getInstance(TBNoticePrintSql.class);
     private LCGrpContSQL lcGrpContSQL = SQLProxy.getInstance(LCGrpContSQL.class);
@@ -334,27 +338,29 @@ public class LCContPrtPrintBL  implements BusinessService {
                 buildError("dealData", new I18nMessage("查询投保单模板信息失败！", ""));
                 return false;
             }
-
+            /********************************************************
-            jsonXmlExport.put("fromSystem","GRP");
+             * 投保单模板信息
+             *******************************************************/
+            jsonXmlExport.put("fromSystem","GRP");//系统
             jsonXmlExport.put("fromModule","NB");
-            jsonXmlExport.put("businessNumber",mGrpPropNo);
+            jsonXmlExport.put("businessNumber",mGrpPropNo);//投保单号
-            jsonXmlExport.put("businessType",Code);
+            jsonXmlExport.put("businessType",Code);//行业类别
-            jsonXmlExport.put("requestId",PubFun1.CreateMaxNo("requestId", 10));
+            jsonXmlExport.put("requestId",PubFun1.CreateMaxNo("requestId", 10));//请求ID
-            jsonXmlExport.put("templateCode",nbPrintModelInfoByCode.GetText(1, 2));
+            jsonXmlExport.put("templateCode",nbPrintModelInfoByCode.GetText(1, 2));//模板编码
-            jsonXmlExport.put("versionNumber",nbPrintModelInfoByCode.GetText(1, 3));
+            jsonXmlExport.put("versionNumber",nbPrintModelInfoByCode.GetText(1, 3));//版本号
-            jsonXmlExport.put("isSealAllowed",nbPrintModelInfoByCode.GetText(1, 4));
+            jsonXmlExport.put("isSealAllowed",nbPrintModelInfoByCode.GetText(1, 4));//其他标识
             JSONArray jsonArray = new JSONArray();
             jsonXmlExport.put("params",jsonArray);
 
             JSONObject objectOne = new JSONObject();
-            objectOne.put("filesOrder","1");
+            objectOne.put("filesOrder","1");//文件顺序
-            objectOne.put("filesType","docx");
+            objectOne.put("filesType","docx");//文件类型
             JSONObject objectOneData = new JSONObject();
             objectOne.put("data",objectOneData);
             jsonArray.add(objectOne);
 
             objectOneData.put("SubType", "21001");
-            objectOneData.put("AskPrtNo", mGrpPropNo);
+            objectOneData.put("AskPrtNo", mGrpPropNo);//投保单号
 //            jsonDATASET.put("Fax1", "");
 //            jsonDATASET.put("LinkMan2", "");
 //            jsonDATASET.put("Department2", "");
@@ -383,56 +389,81 @@ public class LCContPrtPrintBL  implements BusinessService {
 //            jsonDATASET.put("GrpNature1", "");
 //            objectOneData.put("PartnerName", "主要控股股东名称");
 
-            SSRS lcGrpInfoSSRS = lcContPrtPrintBLSQL.getLCGrpInfoByGrpPropNo(mGrpPropNo);
 
+
+            /********************************************************
+             * 投保信息
+             *******************************************************/
+            SSRS rowData = lcGrpContSQL.selectGrpContByGRPCONTNO(mGrpPropNo);
+            String grpType = rowData.GetText(1, 1); //组织类型
+            String grpNature = rowData.GetText(1, 2);//单位性质
+            this.getGrpType(grpType,objectOneData);
+            this.getGrpNature(grpNature,objectOneData);
+
+
+            SSRS ssrsByGrpContNo = lcCustomerIDSQL.getSSRSByGrpContNo(mGrpPropNo);//
+            String IDType = ssrsByGrpContNo.GetText(1, 1);//证件类型
+            this.getIDType(IDType,objectOneData);
+
+            String endDate = ssrsByGrpContNo.GetText(1, 1);//证件有效期
+            objectOneData.put("IDEndDate", endDate);
+
+
+            SSRS lcGrpInfoSSRS = lcContPrtPrintBLSQL.getLCGrpInfoByGrpPropNo(mGrpPropNo);
             if (lcGrpInfoSSRS.getMaxRow()==0 ) {
                 buildError("dealData", new I18nMessage("查询保单信息失败！", "LIS-99999"));
                 return false;
             }
+
+
+
             /********************************************************
              * 投保单位信息
              *******************************************************/
 //            jsonDATASET.put("AskNo", lcGrpInfoSSRS.GetText(1,1));
-            objectOneData.put("GrpName", lcGrpInfoSSRS.GetText(1,2));
+            objectOneData.put("GrpName", lcGrpInfoSSRS.GetText(1,2));//投保单位名称
-            objectOneData.put("GrpAddress",lcGrpInfoSSRS.GetText(1,3));
+            objectOneData.put("GrpAddress",lcGrpInfoSSRS.GetText(1,3));//投保单位地址
-            objectOneData.put("CorporationNo", lcGrpInfoSSRS.GetText(1,4));
+            objectOneData.put("CorporationNo", lcGrpInfoSSRS.GetText(1,4));//投保单位证件号(idtype='2')
-            objectOneData.put("SocialNo",lcGrpInfoSSRS.GetText(1,5));
+            objectOneData.put("SocialNo",lcGrpInfoSSRS.GetText(1,5));//投保单位证号(idtype='4')
-            objectOneData.put("GrpZipCode",lcGrpInfoSSRS.GetText(1,6));
+            objectOneData.put("GrpZipCode",lcGrpInfoSSRS.GetText(1,6));//单位邮政编码
-            objectOneData.put("GrpNature", lcGrpInfoSSRS.GetText(1,7));
+            objectOneData.put("GrpNature", lcGrpInfoSSRS.GetText(1,7));//单位性质
-            objectOneData.put("BusinessType", lcGrpInfoSSRS.GetText(1,8));
+            objectOneData.put("BusinessType", lcGrpInfoSSRS.GetText(1,8));//行业类别
-            objectOneData.put("Peoples", lcGrpInfoSSRS.GetText(1,9));
+            objectOneData.put("Peoples", lcGrpInfoSSRS.GetText(1,9));//单位总人数
-            objectOneData.put("AllOnWorkPeoples", lcGrpInfoSSRS.GetText(1,10));
+            objectOneData.put("AllOnWorkPeoples", lcGrpInfoSSRS.GetText(1,10));//单位在职人数
-            objectOneData.put("AllOffWorkPeoples", lcGrpInfoSSRS.GetText(1,11));
+            objectOneData.put("AllOffWorkPeoples", lcGrpInfoSSRS.GetText(1,11));//单位退休人数
-            objectOneData.put("MainPeoples", lcGrpInfoSSRS.GetText(1,12));
+            objectOneData.put("MainPeoples", lcGrpInfoSSRS.GetText(1,12));//单位主被保险人数
-            objectOneData.put("RelaPeoples", lcGrpInfoSSRS.GetText(1,13));
+            objectOneData.put("RelaPeoples", lcGrpInfoSSRS.GetText(1,13));//单位附属被保险人数
-            objectOneData.put("TotalPeoples", lcGrpInfoSSRS.GetText(1,14));
+            objectOneData.put("TotalPeoples", lcGrpInfoSSRS.GetText(1,14));//单位合计
-            objectOneData.put("LinkMan1", lcGrpInfoSSRS.GetText(1,15));
+            objectOneData.put("LinkMan1", lcGrpInfoSSRS.GetText(1,15));//经办人姓名
-            objectOneData.put("Department1", lcGrpInfoSSRS.GetText(1,16));
+            objectOneData.put("Department1", lcGrpInfoSSRS.GetText(1,16));//经办人所属部门
-            objectOneData.put("MobilePhone1", lcGrpInfoSSRS.GetText(1,17));
+            objectOneData.put("MobilePhone1", lcGrpInfoSSRS.GetText(1,17));//经办人联系电话
 //            jsonDATASET.put("Phone1", lcGrpInfoSSRS.GetText(1,18));
-            objectOneData.put("E_Mail1", lcGrpInfoSSRS.GetText(1,19));
+            objectOneData.put("E_Mail1", lcGrpInfoSSRS.GetText(1,19));//经办人所属邮箱
-            objectOneData.put("PayMode", lcGrpInfoSSRS.GetText(1,20));
+            objectOneData.put("PayMode", lcGrpInfoSSRS.GetText(1,20));//付款方式
-            objectOneData.put("BankCode", lcGrpInfoSSRS.GetText(1,21));
+            objectOneData.put("BankCode", lcGrpInfoSSRS.GetText(1,21));//开户银行
-            objectOneData.put("BankAccNo", lcGrpInfoSSRS.GetText(1,22));
+            objectOneData.put("BankAccNo", lcGrpInfoSSRS.GetText(1,22));//银行账号
-            objectOneData.put("DisputedFlag", lcGrpInfoSSRS.GetText(1,23));
+            objectOneData.put("DisputedFlag", lcGrpInfoSSRS.GetText(1,23));//合同争议处理方式
             objectOneData.put("CorpLicence", lcGrpInfoSSRS.GetText(1,24)); //企业法人营业执照
             objectOneData.put("TaxRegNo",lcGrpInfoSSRS.GetText(1,25));  //税务登记证
             objectOneData.put("SchoolLicence", lcGrpInfoSSRS.GetText(1,26)); //办学许可证
-            objectOneData.put("PersonPrintFlag", lcGrpInfoSSRS.GetText(1,27));
+            objectOneData.put("PersonPrintFlag", lcGrpInfoSSRS.GetText(1,27));//打印个人保险凭证
 
             String tValDateType =lcGrpInfoSSRS.GetText(1,46);
 
+            //保险生效日期
             if ("0".equals(tValDateType)) {
                 objectOneData.put("CValiDate", "保费到帐日次日零时");
             } else {
                 objectOneData.put("CValiDate", lcGrpInfoSSRS.GetText(1,28));
             }
 
-            objectOneData.put("PremApporFund", lcGrpInfoSSRS.GetText(1,29));
+            objectOneData.put("PremApporFund", lcGrpInfoSSRS.GetText(1,29));//保险负担原则
-            objectOneData.put("PayIntv", lcGrpInfoSSRS.GetText(1,30));
+            objectOneData.put("PayIntv", lcGrpInfoSSRS.GetText(1,30));//缴费方式
-            objectOneData.put("PrintType", lcGrpInfoSSRS.GetText(1,31));
+            objectOneData.put("PrintType", lcGrpInfoSSRS.GetText(1,31));//打印保单类型
-            objectOneData.put("InsuYear",lcGrpInfoSSRS.GetText(1,32));
+            objectOneData.put("InsuYear",lcGrpInfoSSRS.GetText(1,32));//保险期限
             double sumPrem=Double.parseDouble(lcGrpInfoSSRS.GetText(1,33));
+
+            //投保保险费合计大写(小写)
             if("3".equals(lcGrpInfoSSRS.GetText(1,59))){
                 double sumEnterPriseBurden = Double.parseDouble(lcGrpInfoSSRS.GetText(1,57));
                 double sumPersonBurden = Double.parseDouble(lcGrpInfoSSRS.GetText(1,58));
@@ -440,11 +471,12 @@ public class LCContPrtPrintBL  implements BusinessService {
             }else {
                 objectOneData.put("AskSumPrem", PubFun.getChnMoney(sumPrem)+"("+new DecimalFormat("0.00").format(sumPrem)+")");
             }
-            objectOneData.put("GrpSpec",lcGrpInfoSSRS.GetText(1,34));
+            objectOneData.put("GrpSpec",lcGrpInfoSSRS.GetText(1,34));//备注及特别约定
-            objectOneData.put("Satrap",lcGrpInfoSSRS.GetText(1,35));
+            objectOneData.put("Satrap",lcGrpInfoSSRS.GetText(1,35));//法人
-            objectOneData.put("Corporation", lcGrpInfoSSRS.GetText(1,36));
+            objectOneData.put("Corporation", lcGrpInfoSSRS.GetText(1,36));//负责人
+
 
-            objectOneData.put("ComArea", lcGrpInfoSSRS.GetText(1,47));
+            objectOneData.put("ComArea", lcGrpInfoSSRS.GetText(1,47));//
 
 
 //            String tDescriptionSolvency = getSolvency(lcGrpInfoSSRS.GetText(1, 50));
@@ -466,6 +498,29 @@ public class LCContPrtPrintBL  implements BusinessService {
             objectOneData.put("ControlTRType", lcGrpInfoSSRS.GetText(1,63));//税收类型
             objectOneData.put("InstitutionsCategory", lcGrpInfoSSRS.GetText(1,64));//机构类别
             objectOneData.put("Satrap", lcGrpInfoSSRS.GetText(1,65));//负责人
+            String areaCode = lcGrpInfoSSRS.GetText(1, 66);
+            this.getBussArea(objectOneData,areaCode);//运营区域
+            objectOneData.put("MainBusiness",lcGrpInfoSSRS.GetText(1,67));//经营范围
+            objectOneData.put("CorID", lcGrpInfoSSRS.GetText(1,68));//负责人证件号
+            objectOneData.put("CorIDExpiryDate", lcGrpInfoSSRS.GetText(1,69));//负责人证件有效期
+            objectOneData.put("Corporation1", lcGrpInfoSSRS.GetText(1,70));//法人
+            objectOneData.put("CorID1", lcGrpInfoSSRS.GetText(1,71));//法人证件号
+            objectOneData.put("CorIDExpiryDate1", lcGrpInfoSSRS.GetText(1,72));//法人证件有效期
+            objectOneData.put("LinkIdNo", lcGrpInfoSSRS.GetText(1,73));//经办人证件号码
+            objectOneData.put("TaxpayerNo", lcGrpInfoSSRS.GetText(1,74));//纳税人识别号
+            objectOneData.put("TaxAddress", lcGrpInfoSSRS.GetText(1,75));//税务登记地址
+            objectOneData.put("TaxPhone", lcGrpInfoSSRS.GetText(1,76));//税务登记电话
+            objectOneData.put("TaxBankName", lcGrpInfoSSRS.GetText(1,77));//税务等户开户行
+
+
+
+            /********************************************************
+             * 健康告知
+             *******************************************************/
+            this.getCustomerImpart(objectOneData);
+
+
+
 
             /********************************************************
              * 投保险种信息
@@ -1387,4 +1442,194 @@ public class LCContPrtPrintBL  implements BusinessService {
         return mErrors;
     }
 
+
+    public void getGrpType (String grpType,JSONObject objectOneData) {
+            objectOneData.put("Z1", "£");
+            objectOneData.put("Z2", "£");
+            objectOneData.put("Z3", "£");
+            objectOneData.put("Z4", "£");
+            objectOneData.put("Z5", "£");
+            objectOneData.put("Z6", "£");
+            objectOneData.put("Z7", "£");
+            objectOneData.put("Z8", "£");
+            objectOneData.put("Z9", "£");
+        switch (grpType) {
+            case "01":objectOneData.put("Z1", "R");
+            case "02":objectOneData.put("Z2", "R");
+            case "03":objectOneData.put("Z3", "R");
+            case "04":objectOneData.put("Z4", "R");
+            case "05":objectOneData.put("Z5", "R");
+            case "06":objectOneData.put("Z6", "R");
+            case "07":objectOneData.put("Z7", "R");
+            case "08":objectOneData.put("Z8", "R");
+            case "09":objectOneData.put("Z9", "R");
+            break;
+        }
+    }
+
+
+
+    public void getGrpNature (String grpNature,JSONObject objectOneData) {
+        objectOneData.put("D1", "£");
+        objectOneData.put("D2", "£");
+        objectOneData.put("D3", "£");
+        objectOneData.put("D4", "£");
+        objectOneData.put("D5", "£");
+        objectOneData.put("D6", "£");
+        objectOneData.put("D7", "£");
+        objectOneData.put("D8", "£");
+        objectOneData.put("D9", "£");
+        switch (grpNature) {
+            case "02":objectOneData.put("D2", "R");
+            case "03":objectOneData.put("D1", "R");
+            case "04":objectOneData.put("D7", "R");
+            case "05":objectOneData.put("D4", "R");
+            case "06":objectOneData.put("D6", "R");
+            case "07":objectOneData.put("D5", "R");
+            case "08":objectOneData.put("D3", "R");
+            case "09":objectOneData.put("D8", "R");
+            case "10":objectOneData.put("D9", "R");
+                      objectOneData.put("grpNature", grpNature);
+                      break;
+        }
+    }
+
+    public void getIDType (String IdType,JSONObject objectOneData) {
+        objectOneData.put("A1", "£");
+        objectOneData.put("A2", "£");
+        objectOneData.put("A3", "£");
+        objectOneData.put("A4", "£");
+        objectOneData.put("A5", "£");
+        switch (IdType) {
+            case "1":objectOneData.put("A2", "R");
+            case "6":objectOneData.put("A1", "R");
+            case "9":objectOneData.put("A5", "R");
+                objectOneData.put("IdType", IdType);
+                break;
+        }
+    }
+
+    public void getCustomerImpart (JSONObject objectOneData) {
+        SSRS lcCustomerList = lcCustomerImpartSQL.selectCustomerImpartByGrpContNo(mGrpPropNo);
+            objectOneData.put("H1","£");
+            objectOneData.put("H2","£");
+            objectOneData.put("H3","£");
+            objectOneData.put("H4","£");
+            objectOneData.put("H5","£");
+            objectOneData.put("H6","£");
+            objectOneData.put("H7","£");
+            objectOneData.put("H8","£");
+            objectOneData.put("H9","£");
+            objectOneData.put("H10","£");
+            objectOneData.put("H11","£");
+            objectOneData.put("H12","£");
+            objectOneData.put("H13","£");
+            objectOneData.put("H14","£");
+            objectOneData.put("H15","£");
+            objectOneData.put("H16","£");
+            objectOneData.put("H17","£");
+            objectOneData.put("H18","£");
+            objectOneData.put("H19","£");
+            objectOneData.put("H20","£");
+
+            if (lcCustomerList.getMaxRow() > 0) {
+                String impartParamModle = lcCustomerList.GetText(1, 4);
+                if (StringUtils.isNotBlank(impartParamModle)) {
+                    String[] split = impartParamModle.split("/");
+
+                    if (StringUtils.isNotEmpty(split[0])){
+                        objectOneData.put("HM1", split[0]);
+                    }
+                    if (StringUtils.isNotEmpty(split[1])){
+                        objectOneData.put("HM2", split[1]);
+                    }
+
+                    objectOneData.put("H19", "R");
+                }
+
+
+                String impartParamModl1 = lcCustomerList.GetText(2, 4);
+
+                if (StringUtils.isNotBlank(impartParamModl1)) {
+
+                        String[] split = impartParamModl1.split("/");
+
+                        if (StringUtils.isNotEmpty(split[0])){
+                            objectOneData.put("HY", split[0]);
+                        }
+                        if (StringUtils.isNotEmpty(split[1])){
+                            objectOneData.put("HP1", split[1]);
+                        }
+
+                        if (StringUtils.isNotEmpty(split[2])){
+                            objectOneData.put("HP2", split[2]);
+                        }
+
+                        if (StringUtils.isNotEmpty(split[3])){
+                            objectOneData.put("HP3", split[3]);
+                        }
+
+                        if (StringUtils.isNotEmpty(split[4])){
+                            objectOneData.put("HP4", split[4]);
+                        }
+                        objectOneData.put("H1", "R");
+                    }
+
+
+                String impartParamModl2 = lcCustomerList.GetText(3, 4);
+                if (StringUtils.isNotBlank(impartParamModl2) && impartParamModl2.equals("是")) {
+                    objectOneData.put("H3", "R");
+                }
+
+                String impartParamModl3 = lcCustomerList.GetText(4, 4);
+                if (StringUtils.isNotBlank(impartParamModl3) && impartParamModl3.equals("是")) {
+                    objectOneData.put("H5", "R");
+                }
+                String impartParamModl4 = lcCustomerList.GetText(5, 4);
+                if (StringUtils.isNotBlank(impartParamModl4) && impartParamModl4.equals("是")) {
+                    objectOneData.put("H7", "R");
+                }
+                String impartParamModl5 = lcCustomerList.GetText(6, 4);
+                if (StringUtils.isNotBlank(impartParamModl5) && impartParamModl5.equals("是")) {
+                    objectOneData.put("H9", "R");
+                }
+                String impartParamModl6 = lcCustomerList.GetText(7, 4);
+                if (StringUtils.isNotBlank(impartParamModl6) && impartParamModl6.equals("是")) {
+                    objectOneData.put("H11", "R");
+                }
+                String impartParamModl7 = lcCustomerList.GetText(8, 4);
+                if (StringUtils.isNotBlank(impartParamModl7) && impartParamModl7.equals("是")) {
+                    objectOneData.put("H13", "R");
+                }
+                String impartParamModl8 = lcCustomerList.GetText(9, 4);
+                if (StringUtils.isNotBlank(impartParamModl8) && impartParamModl8.equals("是")) {
+                    objectOneData.put("H15", "R");
+                }
+                String impartParamModl9 = lcCustomerList.GetText(10, 4);
+                if (StringUtils.isNotBlank(impartParamModl9) && impartParamModl9.equals("是")) {
+                    objectOneData.put("H17", "R");
+                }
+                }
+            }
+    public void getBussArea(JSONObject objectOneData,String areaCode){
+
+        objectOneData.put("B1", "£");
+        objectOneData.put("B2", "£");
+        objectOneData.put("B3", "£");
+
+        if (StringUtils.isNotBlank(areaCode)) {
+            switch (areaCode) {
+                case "01": objectOneData.put("B1","R");
+                case "02": objectOneData.put("B2","R");
+                case "03": objectOneData.put("B3","R");
+                break;
+            }
+
+        }
+
+
+    }
+
+
+
 }

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java

@@ -16,7 +16,7 @@ public interface LCGrpPropQuerySql {
 //            @Clause(key = 3, clause = "and a.salechnl = '#{para3}' ", expression = "#{para3} != empty"),
 //            @Clause(key = 4, clause = "and exists(select 1 from lcagenttocont c where c.policyno=a.grpcontno and c.agentcode = '#{para4}')", expression = "#{para4} != empty")})
 //    SSRS LCGrpPropQuerySql1(@Param("para0") String para0, @Param("para1") String para1, @Param("para2") String para2, @Param("para3") String para3, @Param("para4") String para4);
-    @SQL(value = "select * from (select a.grpcontno,a.prtno,(select codename from ldcode where codetype = 'salechannel' AND code = a.agenttype),b.name,a.CValiDate,(SELECT f.activityname FROM lwactivity f WHERE f.ActivityID=w.ActivityID),( SELECT codename FROM ldcode where codetype = 'contstate' AND code = a.state),( SELECT sum(j.sumduepaymoney) FROM ljspay j where j.otherno = a.grpcontno AND j.paycount = '1' AND j.state = '2'),a.firstpaydate,( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom,c.AgentCode CustomerNo , a.agenttype,a.makedate  from lcgrpcont a,lwmission w,lcgrpappnt b ,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo  and a.GrpContNo = w.MissionProp1  AND a.state = '00' and w.ActivityID !='1800201005' union SELECT a.grpcontno, a.prtno, (SELECT codename from ldcode WHERE codetype = 'salechannel' AND code = a.agenttype), b.name, a.CValiDate, '',( SELECT codename FROM ldcode WHERE codetype = 'contstate' AND code = a.state),'', '', ( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom, c.AgentCode CustomerNo , a.agenttype,a.makedate  FROM lcgrpcont a, lcgrpappnt b,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo  AND a.state in (01,02)) g where 1=1   @{1} @{2} @{3} @{4} group by g.makedate desc,g.grpcontno ", clauses = {
+    @SQL(value = "select * from (select a.grpcontno,a.prtno,(select codename from ldcode where codetype = 'salechannel' AND code = a.agenttype),b.name,a.CValiDate,(SELECT f.activityname FROM lwactivity f WHERE f.ActivityID=w.ActivityID),( SELECT codename FROM ldcode where codetype = 'contstate' AND code = a.state),( SELECT sum(j.sumduepaymoney) FROM ljspay j where j.otherno = a.grpcontno AND j.paycount = '1' AND j.state = '2'),a.firstpaydate,( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom,c.AgentCode CustomerNo , a.agenttype,a.makedate  from lcgrpcont a,lwmission w,lcgrpappnt b ,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo  and a.GrpContNo = w.MissionProp1  AND a.state = '00' and w.ActivityID !='1800201005' union SELECT a.grpcontno, a.prtno, (SELECT codename from ldcode WHERE codetype = 'salechannel' AND code = a.agenttype), b.name, a.CValiDate, '',( SELECT codename FROM ldcode WHERE codetype = 'contstate' AND code = a.state),'', '', ( SELECT t.contplantype FROM lcproposal t WHERE t.grppropno = a.prtno), a.manageCom, c.AgentCode CustomerNo , a.agenttype,a.makedate  FROM lcgrpcont a, lcgrpappnt b,LCAgentToCont c WHERE a.grpcontno = b.grpcontno and c.PolicyNo = b.GrpContNo  AND a.state in (01,02)) g where 1=1   @{1} @{2} @{3} @{4}  ", clauses = {
             @Clause(key = 0, clause = "#{para0}", expression = "#{para0} != empty"),
             @Clause(key = 1, clause = "and g.managecom like  concat('#{para1}','%')", expression = "#{para1} != empty"),
             @Clause(key = 2, clause = "and g.prtno = '#{para2}' ", expression = "#{para2} != empty"),

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/g_app/LCContPrtPrintBLSQL.java

@@ -70,8 +70,8 @@ public interface LCContPrtPrintBLSQL {
                 ),
                 a.prem,
                 a.GrpSpec,
-                a.Corporation,
+                b.Corporation,
-                a.Corporation,
+                b.Corporation,
                 (select Name from ldcom where comcode=a.ManageCom),
                 (select codename from ldcode ld where codetype='opersource' and code=e.opersource),
                 (select codename from ldcode ld where codetype='opersourcetype' and code=e.OperSourceType),
@@ -110,13 +110,25 @@ public interface LCContPrtPrintBLSQL {
                 b.ControlTRType,
                 b.InstitutionsCategory,
                 b.Satrap,
-                a.OutPayFlag
+                a.bussarea,
+                a.MainBussiness,
+                b.corID,
+                TO_CHAR(b.CorIDExpiryDate, 'YYYY"年"FMmm"月"FMDD"日"')AS CorIDExpiryDate,
+                a.Corporation1,
+                a.CorID1,
+                TO_CHAR(a.CorIDExpiryDate1, 'YYYY"年"FMmm"月"FMDD"日"')AS CorIDExpiryDate1,
+                d.IDNo,
+                f.TaxpayerNo,
+                f.Address,
+                f.Phone,
+                f.BankName
             from lcgrpcont a
             JOIN LCGrpAppnt b ON a.GrpContNo = b.GrpContNo
             JOIN LCGrpContactInfo c ON a.GrpContNo = c.GrpContNo
             JOIN LCGrpLink d ON a.GrpContNo = d.GrpContNo
             JOIN LCCustomerAccount lcc ON lcc.PolicyNo = a.GrpContNo
             JOIN lcgrpcontexpand e ON a.GrpContNo = e.GrpContNo
+            JOIN LCGrpInvoiceDetail f ON a.GrpContNo = f.GrpContNo
             WHERE d.LinkManFlag='00'  and a.GrpContNo ='?mGrpPropNo?'
             """)
     SSRS getLCGrpInfoByGrpPropNo(@Param("mGrpPropNo") String mGrpPropNo);

lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/vo/g_app/LCCustomerImpartAddVO.java

@@ -0,0 +1,54 @@
+package com.sinosoft.lis.vo.g_app;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class LCCustomerImpartAddVO {
+
+    @ApiModelProperty("投保单号")
+    private String grpContNo;
+
+    @ApiModelProperty("操作")
+    private String action;
+
+    @ApiModelProperty("详细数据")
+    private List<LCCustomerImpartAddParam> body;
+
+
+    @Data
+    public static class LCCustomerImpartAddParam{
+
+
+        @ApiModelProperty("投保单号")
+        private String grpContNo;
+
+        @ApiModelProperty("告知版别")
+        private String impartVer;
+
+        @ApiModelProperty("告知编码")
+        private String impartCode;
+
+        @ApiModelProperty("告知内容")
+        private String impartContent;
+
+        @ApiModelProperty("填写内容")
+        private String impartParam;
+
+        @ApiModelProperty("详细说明")
+        private String descVal;
+    }
+
+
+
+
+}

lis-module-grp-nb-web/src/main/webapp/g_app/LCContCommonInput.js

@@ -545,6 +545,21 @@ function showAttachment() {
 	}
 }
 
+/**
+ * 附件管理(健康告知书)
+ */
+function showHealthAttachment() {
+	if(tFlag == '4'|| tFlag == '5'){
+		mainRequest();
+		window.open("../g_busicommon/LDHealthAttachmentMain.jsp?OtherNoType=NB&OtherNo="+tGrpContNo+"&UploadNode="+tActivityID,"附件管理",'width=950,height=520,top=0,left=0,toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=1,status=0');
+
+	}else{
+		mainRequest();
+		window.open("../g_busicommon/LDHealthAttachmentMain.jsp?OtherNoType=NB&OtherNo="+tGrpPropNo+"&UploadNode="+tActivityID,"附件管理",'width=950,height=520,top=0,left=0,toolbar=0,location=0,directories=0,menubar=0,scrollbars=1,resizable=1,status=0');
+
+	}
+}
+
 /**
  * 保单保全查询窗口
  */

lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompContPolInput.js

@@ -1312,10 +1312,10 @@ function saveClick(){
 	// 	tBFFlag = "0";
 	// }
 
-	/*if(relationbtn == 0) {
+	if(relationbtn == 0) {
 		alert("请进行关联方模糊认定查询后，再进行下一步");
 		return false;
-	}*/
+	}
 	if(!checkPeriod()){
 		return false;
 	}
@@ -4141,7 +4141,7 @@ function InsureListProtect(){
 /**
  * 	关联方模糊认定结果
  */
-var relationbtn=1;
+var relationbtn=0;
 function relationresult() {
 	relationbtn+=1;
 	var numFlag = 0;

lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpCompNewContPolInput.js

@@ -1383,10 +1383,10 @@ function saveClick(){
 	// 	tBFFlag = "0";
 	// }
 
-	// if(relationbtn == 0) {
+	if(relationbtn == 0) {
-	// 	alert("请进行关联方模糊认定查询后，再进行下一步");
+		alert("请进行关联方模糊认定查询后，再进行下一步");
-	// 	return false;
+		return false;
-	// }
+	}
 	if(!checkPeriod()){
 		return false;
 	}

lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js

@@ -334,6 +334,19 @@ 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 = "";
+}
+
 /**
  * 清空关联查询的项目
  */
@@ -1022,6 +1035,17 @@ function initEntry1(tGContNo){
 		document.all("GrpNatureName3").value=tPropEntry[0][58];
 		document.all("OtherIDType").value=tPropEntry[0][59];
 		document.all("OtherIDNo").value=tPropEntry[0][60];
+		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];
 	}
 }
 //初始化省市县
@@ -1043,6 +1067,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];
 	}
 }
 //初始化联系人信息
@@ -1198,6 +1229,12 @@ 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];
 	}
 }
 //客户经理
@@ -1403,10 +1440,10 @@ function saveClick(){
 	// 	tBFFlag = "0";
 	// }
 
-	// if(relationbtn == 0) {
+	if(relationbtn == 0) {
-	// 	alert("请进行关联方模糊认定查询后，再进行下一步");
+		alert("请进行关联方模糊认定查询后，再进行下一步");
-	// 	return false;
+		return false;
-	// }
+	}
 	if(!checkPeriod()){
 		return false;
 	}
@@ -2925,6 +2962,32 @@ function checkCoridtype(){
 }
 
 
+function checkCoridtype2(){
+
+	if(document.all("CorID1").value.length>0 && document.all("CorIDType1").value=="") {
+		i18nAlert("请先选择证件类型！", "LIS-00574");
+		return false;
+	}
+
+	if(document.all("CorIDType1").value=="0"&&document.all("CorID1").value.length>0) {
+
+		if((document.all("CorID1").value.length!=15) &&(document.all("CorID1").value.length!=18)){
+			i18nAlert("输入的身份证号位数错误", "LIS-00575");
+			document.all('CorID1').value="";
+			return false;
+		}
+
+		if(!checkIdCard(document.all("CorID1").value)) {
+
+			i18nAlert("身份证号码不合法", "LIS-01833") ;
+			document.all('CorID1').value="";
+			document.all('CorID1').className = "warn";
+			return false;
+		}
+	}
+}
+
+
 function checkCity(){
 	var ManageCom =document.all('ManageCom').value;
 	var ProvinceCode =document.all('ProvinceCode').value;
@@ -3014,7 +3077,6 @@ function returnShowCodeList(value1, value2, value3) {
 
 	returnShowCode(value1, value2, value3, '0');
 }
-
 function returnShowCodeListKey(value1, value2, value3) {
 
 	returnShowCode(value1, value2, value3, '1');
@@ -3031,6 +3093,21 @@ function returnShowCode(value1, value2, value3, returnType) {
 
 		var tProvince = document.all("ProvinceCode").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=='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 {
@@ -3064,6 +3141,25 @@ function returnShowCode(value1, value2, value3, returnType) {
 
 		var tCity = document.all("CityCode").value;
 
+		if (returnType=='0') {
+			return showCodeList('district',value2,value3,null,tCity,'UpPlaceName','1',180);
+		} else {
+			return showCodeListKey('district',value2,value3,null,tCity,'UpPlaceName','1',180);
+		}
+	}else if (value1=='Linkdistrict') {
+
+		if (isEmpty(fm.LinkProvinceCode2)) {
+			i18nAlert("请选择省！", "LIS-00795");
+			return false;
+		}
+
+		if (isEmpty(fm.LinkCityCode2)) {
+			i18nAlert("请选择市！", "LIS-00796");
+			return false;
+		}
+
+		var tCity = document.all("LinkCityCode2").value;
+
 		if (returnType=='0') {
 			return showCodeList('district',value2,value3,null,tCity,'UpPlaceName','1',180);
 		} else {
@@ -3403,7 +3499,11 @@ function afterCodeSelect(o, p){
 		if(p.name=="BankProvince"){
 			document.all("BankCity").value="";
 			document.all("BankCityName").value="";
-
+		} else if(p.name=="LinkProvince2"){
+			document.getElementById("LinkCityCode2").value="";
+			document.getElementById("LinkCity2").value="";
+			document.getElementById("LinkCounty2").value="";
+			document.getElementById("LinkCountyCode2").value="";
 		} else {
 			document.all("CityCode").value="";
 			document.all("CityName").value="";
@@ -3411,7 +3511,10 @@ function afterCodeSelect(o, p){
 			document.all("CountyCode").value="";
 		}
 	} else if(o=="city"){
-		if(p.name=="CityName"){
+		if(p.name=="LinkCity2"){
+			document.getElementById("LinkCounty2").value="";
+			document.getElementById("LinkCountyCode2").value="";
+		} else if(p.name=="CityName"){
 			document.all("CountyName").value="";
 			document.all("CountyCode").value="";
 		}
@@ -3684,6 +3787,48 @@ function calEndDate(code, type) {
 	}
 }
 
+
+function calEndDate2(code, type) {
+
+	if (fm.IDType.value == '0' && type == "IDType1") {
+		var tapage = getAgeFromIdCard(fm.IDNo.value,fm.IDStartDate.value);
+		if (tapage < 16) {
+			var tyear = caldateYear(fm.IDStartDate.value, 5);
+			fm.IDEndDate.value = tyear;
+		}
+		if (16 <= tapage && tapage <= 25) {
+			var tyear = caldateYear(fm.IDStartDate.value, 10);
+			fm.IDEndDate.value = tyear;
+		}
+		if (26 <= tapage && tapage <= 45) {
+			var tyear = caldateYear(fm.IDStartDate.value, 20);
+			fm.IDEndDate.value = tyear;
+		}
+		if (tapage >= 46) {
+			fm.IDExpDate.value = '9999-01-01';
+		}
+	}
+
+	if (fm.CorIDType.value == '0' && type == "CorIDType") {
+		var tapage = getAgeFromIdCard(fm.CorID.value,fm.CorIDStartDate.value);
+		if (tapage < 16) {
+			var tyear = caldateYear(fm.CorIDStartDate.value, 5);
+			fm.CorIDExpiryDate.value = tyear;
+		}
+		if (16 <= tapage && tapage <= 25) {
+			var tyear = caldateYear(fm.CorIDStartDate.value, 10);
+			fm.CorIDExpiryDate.value = tyear;
+		}
+		if (26 <= tapage && tapage <= 45) {
+			var tyear = caldateYear(fm.CorIDStartDate.value, 20);
+			fm.CorIDExpiryDate.value = tyear;
+		}
+		if (tapage >= 46) {
+			fm.CorIDExpiryDate.value = '9999-01-01';
+		}
+	}
+}
+
 function getAgeFromIdCard(idCard,StartDate) {
 	// 校验身份证号基本格式
 	if (!idCard || (idCard.length !== 15 && idCard.length !== 18)) {
@@ -4489,7 +4634,7 @@ function InsureListProtect(){
 /**
  * 	关联方模糊认定结果
  */
-var relationbtn= 1 ;
+var relationbtn= 0 ;
 function relationresult() {
 	relationbtn+=1;
 	var numFlag = 0;

lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp

@@ -109,8 +109,8 @@
 				<td class=input><input class=codeno name=OperSource  id=OperSource   verify="客户来源|notnull" onchange="verifyField(this)"   ondblclick="return showCodeList('opersource', [this,OperSourceName], [0,1], null, null, null, '1', null);" onkeyup="return showCodeListKey('opersource', [this,OperSourceName], [0,1], null, null, null, '1', null);" readonly><input class=codename name=OperSourceName id=OperSourceName readonly elementtype=nacessary>
 				</td>
 				<td class=title data-i18n="CoverageTerm-1">保险期间</td>
-				<%--				<td class=input><input class="common" style="width:35%" name=InsuPeriod verify="保险期间~CoverageTerm-1|notnull&int&value>0" ><input class="code" style="width:44%" name=InsuPeriodFlagName verify="保险期间单位~CoverageTermUnit|notnull" readonly  ondblclick="return showCodeList('insuperiodflag',[this, InsuPeriodFlag],[1, 0],null,null,null,'1',null);" onkeyup="return showCodeListKey('insuperiodflag',[this, InsuPeriodFlag],[1,0],null,null,null,'1',null);"><input type=hidden name=InsuPeriodFlag  elementtype=nacessary readonly></td>--%>
+				<td class=input><input class="common" style="width:35%" name=InsuPeriod verify="保险期间~CoverageTerm-1|notnull&int&value>0" ><input class="code" style="width:44%" name=InsuPeriodFlagName verify="保险期间单位~CoverageTermUnit|notnull" readonly  ondblclick="return showCodeList('insuperiodflag',[this, InsuPeriodFlag],[1, 0],null,null,null,'1',null);" onkeyup="return showCodeListKey('insuperiodflag',[this, InsuPeriodFlag],[1,0],null,null,null,'1',null);"><input type=hidden name=InsuPeriodFlag  elementtype=nacessary readonly></td>
-				<td class=input><input class="common" style="width:32%" name=InsuPeriod  readonly ><input class="common" style="width:47.5%" name=InsuPeriodFlagName  readonly  ><input class="displayNone" name=InsuPeriodFlag  readonly></td>
+<%--				<td class=input><input class="common" style="width:32%" name=InsuPeriod  readonly ><input class="common" style="width:47.5%" name=InsuPeriodFlagName  readonly  ><input class="displayNone" name=InsuPeriodFlag  readonly></td>--%>
 			</tr>
 			<tr class=common>
 				<td class=title data-i18n="InsurApplDate">投保申请日期</td>
@@ -138,8 +138,7 @@
 				<td class=input style="display: none"><input class=codeno  style="display: none" value="0" name=IsElecFlag id=IsElecFlag readonly verify="电E金服标识|notnull"  ><input class=codename style="display: none" name=IsElecFlagName readonly elementtype=nacessary></td>
 				<td class=title >是否为关联交易</td>
 				<td class=input><input class=codeno name=Relateflag id=Relateflag readonly verify="是否为关联交易|notnull"   ondblclick="return showCodeList('trueflag',[this,RelateflagName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('trueflag',[this,RelateflagName],[0,1],null,null,null,'1',null);"><input class=codename name=RelateflagName readonly elementtype=nacessary></td>
-<%--				<td class=title><input id="relationresultBtn" class=cssButton type=button value="关联方模糊认定结果"  onclick="relationresult();"></td>--%>
+				<td class=title><input id="relationresultBtn" class=cssButton type=button value="关联方模糊认定结果"  onclick="relationresult();"></td>
-
 
 			</tr>
 			<tr class=common>
@@ -336,6 +335,42 @@
 					<td class=title >合计</td>
 					<td class=input><input class="common" name=SumInsuPeoples id=SumInsuPeoples verify = "合计|INT&NOTNULL" onchange="verifyField(this);" elementtype=nacessary> </td>
 				</tr>
+
+				<tr class="common">
+					<td class=title data-i18n="CoProperty1">组织类型</td>
+					<td class=input><input class=codeno name=grpType  readonly  ondblclick="return showCodeList('grptype',[this,grpTypeName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('grptype',[this,grpTypeName],[0,1],null,null,null,'1',null);"><input class=codename name=grpTypeName readonly > </td>
+
+					<td class=title >成立日期</td>
+					<td class=input><Input class="coolDatePicker"  dateFormat="short"  name=cDate onClick="laydate({elem: '#cDate'});" id="cDate"><span class="icon" ><a onClick="laydate({elem: '#cDate'});" ></a></span> </td>
+
+					<td class=title >经营区域</td>
+					<td class=input><input class=codeno name=bussarea  readonly  ondblclick="return showCodeList('bussarea',[this,bussareaName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('bussarea',[this,bussareaName],[0,1],null,null,null,'1',null);"><input class=codename name=bussareaName readonly > </td>
+
+				</tr>
+
+<%--				<tr class="common">--%>
+
+<%--					<td class=title >联系地址</td>--%>
+<%--					<td class=input colspan=3>--%>
+<%--						<input class=code id="LinkProvince2" name=LinkProvince2   style="width:100px" onChange="clearCityAndCounty2()"  ondblclick="return showCodeList('province',[this, LinkProvinceCode2],[1,0],null,null,null,'1',180);" onkeyup="return showCodeListKey('province',[this, LinkProvinceCode2],[1,0],null,null,null,'1',180);" readonly><input class="displayNone" name=LinkProvinceCode2 readonly><span data-i18n="Prov">省</span>--%>
+<%--						<input class=code  id="LinkCity2" name=LinkCity2   style="width:100px"  onChange="clearCounty2()"  ondblclick="return returnShowCodeList('city',[this, LinkCityCode2],[1,0],null,null,null,'1',null);" onkeyup="return returnShowCodeLisKey('city',[this, LinkCityCode2],[1,0],null,null,null,'1',null);" readonly><input class="displayNone" name=LinkCityCode2 readonly><span data-i18n="City">市</span>--%>
+<%--						<input class=code  id="LinkCounty2" name=LinkCounty2   style="width:100px"   ondblclick="return returnShowCodeList('district',[this, LinkCountyCode2],[1,0],null,null,null,'1',null);" onkeyup="return returnShowCodeLisKey('district',[this, LinkCountyCode2],[1,0],null,null,null,'1',null);" readonly><input class="displayNone" name=LinkCountyCode2 readonly><span data-i18n="DistrictCounty">区/县</span>--%>
+<%--						<input class=common name=LinkDetailAddr    maxlength=200 style="width:415px"  >--%>
+<%--					</td>--%>
+<%--				</tr>--%>
+
+				<tr class="common">
+
+					<td class=title >联系地址</td>
+					<td class=input colspan=3>
+						<input class=code id="LinkProvince2" name=LinkProvince2   style="width:100px" onChange="clearCityAndCounty2();"  ondblclick="return showCodeList('province',[this, LinkProvinceCode2],[1,0],null,null,null,'1',180);"  readonly><input type="hidden" name=LinkProvinceCode2 readonly><span data-i18n="Prov">省</span>
+						<input class=code  id="LinkCity2" name=LinkCity2   style="width:100px"  onChange="clearCounty2();"  ondblclick="return returnShowCodeList('Linkcity',[this, LinkCityCode2],[1,0],null,null,null,'1',null);" onkeyup="return returnShowCodeLisKey('city',[this, LinkCityCode2],[1,0],null,null,null,'1',null);" readonly><input type="hidden" name=LinkCityCode2 readonly><span data-i18n="City">市</span>
+						<input class=code  id="LinkCounty2" name=LinkCounty2   style="width:100px"   ondblclick="return returnShowCodeList('Linkdistrict',[this, LinkCountyCode2],[1,0],null,null,null,'1',null);" onkeyup="return returnShowCodeLisKey('district',[this, LinkCountyCode2],[1,0],null,null,null,'1',null);" readonly><input type="hidden" name=LinkCountyCode2 readonly><span data-i18n="DistrictCounty">区/县</span>
+						<input class=common name=LinkDetailAddr    maxlength=200 style="width:415px"  >
+					</td>
+				</tr>
+
+
 				<tr class=common>
 					<td class=title data-i18n="CoProperty">单位性质</td>
 					<td class=input><input class=codeno name=GrpNature verify="单位性质~CoProperty|notnull" readonly  ondblclick="return showCodeList('grpnature',[this,GrpNatureName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('grpnature',[this,GrpNatureName],[0,1],null,null,null,'1',null);"><input class=codename name=GrpNatureName readonly elementtype=nacessary> </td>
@@ -346,22 +381,40 @@
 					<td class=title data-i18n="CoContactTelNum">单位联系电话</td>
 					<td class=input><input class="common" name=Phone1 verify = "单位联系电话|NOTNULL" onchange="verifyField(this);" elementtype=nacessary></td>
 				</tr>
+
 				<tr class=common>
 					<%--					<td class=title data-i18n="CoFax">单位传真</td>--%>
 					<%--					<td class=input><input class="common" name=Fax verify="单位传真~CoFax|PHONE&len<20"></td>--%>
-					<td class=title >法人/负责人姓名</td>
+					<td class=title >法人姓名</td>
-					<td class=input><input class="common" name=Corporation verify="法人/负责人姓名|LEN<=30&NOTNULL" onchange="verifyField(this);" elementtype=nacessary> </td>
+					<td class=input><input class="common" name=Corporation1  > </td>
-					<td class=title>法人/负责人证件类型</td>
+					<td class=title>法人证件类型</td>
-					<td class=input><input class=codeno name=CorIDType readonly verify="法人/负责人证件类型|NOTNULL" onchange="verifyField(this);"  ondblclick="return showCodeList('idtype',[this,CorIDTypeName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('idtype',[this,CorIDTypeName],[0,1],null,null,null,'1',null);" ><input class=codename readonly name=CorIDTypeName elementtype=nacessary> </td>
+					<td class=input><input class=codeno name=CorIDType1 readonly   ondblclick="return showCodeList('idtype',[this,CorIDTypeName1],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('idtype',[this,CorIDTypeName1],[0,1],null,null,null,'1',null);" ><input class=codename readonly name=CorIDTypeName1 > </td>
-					<td class=title >法人/负责人证件号码</td>
+					<td class=title >法人证件号码</td>
-					<td class=input><input class="common" name=CorID id=CorID  verify="法人/负责人证件号码|NOTNULL&LEN<=20" onchange="verifyField(this);" onblur="checkCoridtype();" elementtype=nacessary> </td>
+					<td class=input><input class="common" name=CorID1 id=CorID1   onblur="checkCoridtype2();" > </td>
 				</tr>
 				<tr class=common>
-					<td class=title >法人/负责人证件有效起期</td>
+					<td class=title >法人证件有效起期</td>
-					<td class=input><Input class="coolDatePicker" elementtype=nacessary  verify="法人/负责人证件有效起期|notnull&date" dateFormat="short" onblur="calEndDate(this,'CorIDType');"  name=CorIDStartDate onClick="laydate({elem: '#CorIDStartDate'});" id="CorIDStartDate"><span class="icon" ><a onClick="laydate({elem: '#CorIDStartDate'});" ></a></span> </td>
+					<td class=input><Input class="coolDatePicker"    dateFormat="short" onblur="calEndDate(this,'CorIDType1');"  name=CorIDStartDate1 onClick="laydate({elem: '#CorIDStartDate1'});" id="CorIDStartDate1"><span class="icon" ><a onClick="laydate({elem: '#CorIDStartDate1'});" ></a></span> </td>
 
-					<td class=title >法人/负责人证件有效止期</td>
+					<td class=title >法人证件有效止期</td>
-					<td class=input><Input class="coolDatePicker" elementtype=nacessary  verify="法人/负责人证件有效止期|notnull&date" dateFormat="short"  name=CorIDExpiryDate onClick="laydate({elem: '#CorIDExpiryDate'});" id="CorIDExpiryDate"><span class="icon" ><a onClick="laydate({elem: '#CorIDExpiryDate'});" ></a></span> </td>
+					<td class=input><Input class="coolDatePicker"    dateFormat="short"  name=CorIDExpiryDate1 onClick="laydate({elem: '#CorIDExpiryDate1'});" id="CorIDExpiryDate1"><span class="icon" ><a onClick="laydate({elem: '#CorIDExpiryDate1'});" ></a></span> </td>
+				</tr>
+				<tr class=common>
+<%--					<td class=title data-i18n="CoFax">单位传真</td>--%>
+<%--					<td class=input><input class="common" name=Fax verify="单位传真~CoFax|PHONE&len<20"></td>--%>
+					<td class=title >负责人姓名</td>
+					<td class=input><input class="common" name=Corporation  > </td>
+					<td class=title>负责人证件类型</td>
+					<td class=input><input class=codeno name=CorIDType readonly   ondblclick="return showCodeList('idtype',[this,CorIDTypeName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('idtype',[this,CorIDTypeName],[0,1],null,null,null,'1',null);" ><input class=codename readonly name=CorIDTypeName > </td>
+					<td class=title >负责人证件号码</td>
+					<td class=input><input class="common" name=CorID id=CorID   onblur="checkCoridtype();" > </td>
+				</tr>
+				<tr class=common>
+					<td class=title >负责人证件有效起期</td>
+					<td class=input><Input class="coolDatePicker"    dateFormat="short" onblur="calEndDate(this,'CorIDType');"  name=CorIDStartDate onClick="laydate({elem: '#CorIDStartDate'});" id="CorIDStartDate"><span class="icon" ><a onClick="laydate({elem: '#CorIDStartDate'});" ></a></span> </td>
+
+					<td class=title >负责人证件有效止期</td>
+					<td class=input><Input class="coolDatePicker"    dateFormat="short"  name=CorIDExpiryDate onClick="laydate({elem: '#CorIDExpiryDate'});" id="CorIDExpiryDate"><span class="icon" ><a onClick="laydate({elem: '#CorIDExpiryDate'});" ></a></span> </td>
 				</tr>
 				<tr class=common>
 					<td class=title data-i18n="CoAddr">单位地址</td>
@@ -535,6 +588,14 @@
 				<td class=input colspan=3><input class="common" name=TaxAddress verify="地址|LEN<=500" onchange="verifyField(this);" style="width:554px"></td>
 			</tr>
 			<%--电子发票--%>
+			<tr class="common">
+				<td class=title >开通弹性福利平台</td>
+				<td class=input><input class=codeno name=fuli id=fuli readonly   ondblclick="return showCodeList('trueflag', [this,fuliName], [0,1], null, null, null, '1', null);" onkeyup="return showCodeListKey('trueflag', [this,fuliName], [0,1], null, null, null, '1', null);" ><input class=codename name=fuliName readonly ></td>
+				<td class="title">纳税人类型</td>
+				<td class=input><input class=codeno name=Taxpayer id=Taxpayer readonly   ondblclick="return showCodeList('taxpayer', [this,TaxpayerName], [0,1], null, null, null, '1', null);" onkeyup="return showCodeListKey('taxpayer', [this,TaxpayerName], [0,1], null, null, null, '1', null);" ><input class=codename name=TaxpayerName readonly ></td>
+				<td class="title">开票样式</td>
+				<td class=input><input class=codeno name=Invoice id=Invoice readonly   ondblclick="return showCodeList('invoice', [this,InvoiceName], [0,1], null, null, null, '1', null);" onkeyup="return showCodeListKey('invoice', [this,InvoiceName], [0,1], null, null, null, '1', null);" ><input class=codename name=InvoiceName readonly ></td>
+			</tr>
 			<tr class=common>
 				<td class=title>电子发票</td>
 				<td class=input><input class=codeno name=IsElecInvoicePrint verify="电子发票|notnull" readonly   ondblclick="return showCodeList('iselecinvoiceprint',[this,IsElecInvoicePrintName],[0,1],null,null,null,'1',null);" onkeyup="return showCodeListKey('iselecinvoiceprint',[this,IsElecInvoicePrintName],[0,1],null,null,null,'1',null);"><input class=codename name=IsElecInvoicePrintName   elementtype=nacessary readonly></td>

lis-module-grp-nb-web/src/main/webapp/g_app/LCInsuredInfoInput.jsp

@@ -118,7 +118,7 @@
 <%--		<input class=cssButton value="影像件查询" data-i18n="ImgEnquiry-1" type=button onclick="queryScanPage();"></div>--%>
 	<div id="divUplond" style="display: none">
 		<div id="divUplondInfo" class=container showname="健康告知书附件上载" style="display: ''">
-		<input class=cssButton type=button value="健康告知书附件上载" data-i18n="HlthDisclAttachmentUpload" onclick="showAttachment();">
+		<input class=cssButton type=button value="健康告知书附件上载" data-i18n="HlthDisclAttachmentUpload" onclick="showHealthAttachment();">
 	</div>
 		<br />
 	<div id="divConfime" align=left style="display: none" >

lis-module-grp-nb-web/src/main/webapp/g_app/UWGErrInput.jsp

@@ -187,29 +187,29 @@
 					</div>
 
 					<%--个人核保信息--%>
-<%--					<table>--%>
+					<table>
-<%--						<tr>--%>
+						<tr>
-<%--							<td class=common>--%>
+							<td class=common>
-<%--								<img src="../common/images/butExpand.gif" style="cursor:hand;" onclick="showPage(this, divCCErr);">--%>
+								<img src="../common/images/butExpand.gif" style="cursor:hand;" onclick="showPage(this, divCCErr);">
-<%--								</td>--%>
+								</td>
-<%--							<td class=titleImg data-i18n="MemberLevelUWInfo">个人核保信息</td>--%>
+							<td class=titleImg data-i18n="MemberLevelUWInfo">个人核保信息</td>
-<%--						</tr>--%>
+						</tr>
-<%--				</table>--%>
+				</table>
-<%--				<div id="divCCErr" style="display:''">--%>
+				<div id="divCCErr" style="display:''">
-<%--					<table class=common>--%>
+					<table class=common>
-<%--						<tr class=common>--%>
+						<tr class=common>
-<%--							<td text-align: left colSpan=1>--%>
+							<td text-align: left colSpan=1>
-<%--								<span id="spanCCErrGrid"></span>--%>
+								<span id="spanCCErrGrid"></span>
-<%--							</td>--%>
+							</td>
-<%--						</tr>--%>
+						</tr>
-<%--					</table>--%>
+					</table>
-<%--					<center>--%>
+					<center>
-<%--						<input value="首  页" data-i18n="FirstPage" class=cssButton90 type=button onclick="turnPage4.firstPage();">--%>
+						<input value="首  页" data-i18n="FirstPage" class=cssButton90 type=button onclick="turnPage4.firstPage();">
-<%--						<input value="上一页" data-i18n="PreviousPage" class=cssButton91 type=button onclick="turnPage4.previousPage();">--%>
+						<input value="上一页" data-i18n="PreviousPage" class=cssButton91 type=button onclick="turnPage4.previousPage();">
-<%--						<input value="下一页" data-i18n="NextPage" class=cssButton92 type=button onclick="turnPage4.nextPage();">--%>
+						<input value="下一页" data-i18n="NextPage" class=cssButton92 type=button onclick="turnPage4.nextPage();">
-<%--						<input value="尾  页" data-i18n="LastPage" class=cssButton93 type=button onclick="turnPage4.lastPage();">--%>
+						<input value="尾  页" data-i18n="LastPage" class=cssButton93 type=button onclick="turnPage4.lastPage();">
-<%--					</center>--%>
+					</center>
-<%--				</div>--%>
+				</div>
 
 				<%--个人险种信息--%>
 				<div id="divCpolErr" class="container grid" showname="个人险种责任信息" style="display:''">