diff --git a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
index 3be8046..3f8da86 100644
--- a/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
+++ b/src/main/java/com/chinaweal/aiccs/aiccs/writs/service/impl/TswrittemplateServiceImpl.java
@@ -1,9 +1,12 @@
 package com.chinaweal.aiccs.aiccs.writs.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.EBaseinfo;
+import com.chinaweal.aiccs.aiccs.abnormal.entity.Gzaiccode;
 import com.chinaweal.aiccs.aiccs.abnormal.entity.TSBizRemList;
 import com.chinaweal.aiccs.aiccs.abnormal.service.EBaseinfoService;
+import com.chinaweal.aiccs.aiccs.abnormal.service.IGzaiccodeService;
 import com.chinaweal.aiccs.aiccs.abnormal.service.TSBizRemListService;
 import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSBizSerIllegalRem;
 import com.chinaweal.aiccs.aiccs.seriousillegal.entity.TSSerIllegalList;
@@ -30,8 +33,10 @@ import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -53,6 +58,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
     private TRBaseCodeService baseCodeService;
     @Autowired
     private AicorgService aicorgService;
+    @Resource
+    @Lazy
+    private IGzaiccodeService iGzaiccodeService;
 
     @Override
     public String contentFormatter(String content) {
@@ -145,7 +153,14 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
                         applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日");
                     }
                     String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日");
-                    String areaName = ConstantsUtil.getAreaName(regionId);
+
+//                    String areaName = ConstantsUtil.getAreaName(regionId);
+                    LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
+                    //查地市名称
+                    lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00");
+                    Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
+                    String areaName = gzaiccode.getScountryextcode();
+
                     String addr = ConstantsUtil.getAddr(regionId);
                     String phoneDW = ConstantsUtil.getPhone(regionId);
                     String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
@@ -163,10 +178,8 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
                             .replace("{{deadline1}}", "60日")
                             .replace("{{deadline2}}", StringUtils.EMPTY)
                             .replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY)
-                            .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "广州市人民政府")
-                            .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼")
-                            //电话为空先判断是否为花都
-                            .replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988");
+                            .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "内蒙古自治区人民政府");
+//                            .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼");
                     templateDB.setContent(replaceContent);
                 } else if (WorkNoUtil.WORKNOTYPE_55.equals(writsType) || WorkNoUtil.WORKNOTYPE_56.equals(writsType) ||
                         WorkNoUtil.WORKNOTYPE_58.equals(writsType) || WorkNoUtil.WORKNOTYPE_59.equals(writsType)) {//企业农专经营异常信用修复
@@ -213,7 +226,14 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
                         applyTimeStr = DateUtils.localDateFormat(applyTime.toLocalDate(), "yyyy年MM月dd日");
                     }
                     String acceptTimeStr = DateUtils.localDateFormat(acceptTime, "yyyy年MM月dd日");
-                    String areaName = ConstantsUtil.getAreaName(regionId);
+
+//                    String areaName = ConstantsUtil.getAreaName(regionId);
+                    LambdaQueryWrapper<Gzaiccode> lqw = Wrappers.lambdaQuery();
+                    //查地市名称
+                    lqw.eq(Gzaiccode::getScountrycode, regionId.substring(0, 4) + "00");
+                    Gzaiccode gzaiccode = iGzaiccodeService.getOne(lqw);
+                    String areaName = gzaiccode.getScountryextcode();
+
                     String addr = ConstantsUtil.getAddr(regionId);
                     String phoneDW = ConstantsUtil.getPhone(regionId);
                     String replaceContent = content.replace("{{party}}", StringUtils.isNotEmpty(eBaseinfo.getEntname()) ? eBaseinfo.getEntname() : StringUtils.EMPTY)
@@ -231,9 +251,9 @@ public class TswrittemplateServiceImpl extends BaseServiceImpl<TswrittemplateMap
                             .replace("{{deadline1}}", "60日")
                             .replace("{{deadline2}}", StringUtils.EMPTY)
                             .replace("{{reconsiderationOrg}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : StringUtils.EMPTY)
-                            .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "广州市人民政府")
-                            .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼")
-                            .replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988");
+                            .replace("{{government}}", StringUtils.isNotEmpty(areaName) ? areaName + "人民政府" : "内蒙古自治区人民政府");
+//                            .replace("{{address}}", StringUtils.isNotEmpty(addr) ? addr : "广州市越秀区小北路183号金和大厦2楼")
+//                            .replace("{{shphone}}", StringUtils.isNotEmpty(phoneDW) ? phoneDW : regionId.equals("440114") || regionId.equals("440121") ? "" : "020-83555988");
                     templateDB.setContent(replaceContent);
                 }
                 return templateDB;