diff --git a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java b/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java
index 5c60a067..4adae989 100644
--- a/lis-model-policy-schema/src/main/java/com/sinosoft/lis/schema/LCGrpContactInfoSchema.java
+++ b/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(); // 处理日期
 
diff --git a/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java b/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java
index e3b52b77..851958e8 100644
--- a/lis-module-grp-common-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCContSql.java
+++ b/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 = {
diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java
index 14d0a89f..022a5cdf 100644
--- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java
+++ b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/controller/g_app/LCGrpContPolController.java
@@ -520,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);
@@ -530,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");
diff --git a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java b/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java
index 144dd0a7..2fa794f1 100644
--- a/lis-module-grp-nb-service/src/main/java/com/sinosoft/lis/sql/easyquery/g_app/LCGrpPropQuerySql.java
+++ b/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"),
diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js
index 1e2903fd..56dd6603 100644
--- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js
+++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.js
@@ -1035,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];
 	}
 }
 //初始化省市县
@@ -1056,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];
 	}
 }
 //初始化联系人信息
@@ -1211,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];
 	}
 }
 //客户经理
@@ -3053,7 +3077,6 @@ function returnShowCodeList(value1, value2, value3) {
 
 	returnShowCode(value1, value2, value3, '0');
 }
-
 function returnShowCodeListKey(value1, value2, value3) {
 
 	returnShowCode(value1, value2, value3, '1');
@@ -3075,7 +3098,22 @@ function returnShowCode(value1, value2, value3, returnType) {
 		} else {
 			return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180);
 		}
-	} else if (value1=='bankcity') {
+	}else if (value1=='Linkcity') {
+
+		if (isEmpty(fm.LinkProvinceCode2)) {
+			i18nAlert("请选择省！", "LIS-00795");
+			return false;
+		}
+
+		var tProvince = document.all("LinkProvinceCode2").value;
+
+
+		if (returnType=='0') {
+			return showCodeList('city',value2,value3,null,tProvince,'UpPlaceName','1',180);
+		} else {
+			return showCodeListKey('city',value2,value3,null,tProvince,'UpPlaceName','1',180);
+		}
+	}else if (value1=='bankcity') {
 
 		if (isEmpty(fm.BankProvinceName)) {
 			i18nAlert("请选择省！", "LIS-00795");
@@ -3103,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 {
diff --git a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp
index ace49696..a67453da 100644
--- a/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp
+++ b/lis-module-grp-nb-web/src/main/webapp/g_app/LCGrpContPolInput.jsp
@@ -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: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: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>--%>
 			</tr>
 			<tr class=common>
 				<td class=title data-i18n="InsurApplDate">投保申请日期</td>
@@ -363,9 +363,9 @@
 
 					<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 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('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 type="hidden" 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 type="hidden" name=LinkCountyCode2 readonly><span data-i18n="DistrictCounty">区/县</span>
+						<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>