修改

@@ -315,10 +315,15 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
                 documentMap.put("qlr", map.get("QLRMC")==null ? "":(String) map.get("QLRMC"));
                 documentMap.put("zl", map.get("ZL")==null ? "":(String) map.get("ZL"));
                 documentMap.put("bdcdyh", map.get("BDCDYH")==null ? "":(String) map.get("BDCDYH"));
-                if(map.get("ZTS")!=null){
-                    documentMap.put("fj", "业务号："+ywh+";"+map.get("ZTS"));
-                }else{
+                String ISDZ=regBusBdcqzsdjxxMapper.selectIsDz(ywh);
+                if(ISDZ.equals("1")&&map.get("ZTS")!=null&&map.get("FJ")!=null){
+                    documentMap.put("fj", "业务号："+ywh+";"+map.get("FJ")+";"+map.get("ZTS"));
+                }else if(map.get("FJ")!=null){
                     documentMap.put("fj", "业务号："+ywh+";"+map.get("FJ"));
+                }else if(map.get("ZTS")!=null){
+                    documentMap.put("fj", "业务号："+ywh+";"+map.get("ZTS"));
+                }else if(map.get("ZTS")==null&&map.get("FJ")==null){
+                    documentMap.put("fj", "业务号："+ywh+";");
                 }
                 documentMap.put("qx", "汉台区");
                 String base64ewm =getBase64ewm((String) map.get("ID"),(String) map.get("QLRMC"),(String) map.get("ZJH"));
@@ -549,7 +554,9 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
                                     } else {
                                         hashMap.put("QLQTZK", qlqtzk);
                                     }
-                                    hashMap.put("FJ", (String) map.get("FJ"));
+                                    if(StringUtils.isNotBlank((String)map.get("FJ"))) {
+                                        hashMap.put("FJ", (String) map.get("FJ"));
+                                    }
                                 }
                                 list.add(hashMap);
                             }
@@ -612,7 +619,9 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
                                 } else {
                                     hashMap.put("QLQTZK", qlqtzk);
                                 }
-                                hashMap.put("FJ", (String) map.get("FJ"));
+                                if(StringUtils.isNotBlank((String)map.get("FJ"))) {
+                                    hashMap.put("FJ", (String) map.get("FJ"));
+                                }
                             }
                             list.add(hashMap);
                         }
@@ -703,9 +712,11 @@ public class EciServiceImpl extends ServiceImpl<ElecLicenseInfoMapper, ElecLicen
         map.put("ZTS", "本次登记包含"+list.size()+"(套、间)");
         Map qrlInfoMap=regBusBdcqzsdjxxMapper.getQlrInfoByYwh((String) map.get("YWH"));
         if(qrlInfoMap!=null){
-         String FJ=(String)map.get("FJ");
-         map.put("ZJH",FJ.replace("&ldquo;", "“").replace("&rdquo;", "”"));
-           /* map.put("ZJH",qrlInfoMap.get("ZJH"));*/
+            if(StringUtils.isNotBlank((String)map.get("FJ"))){
+                String FJ=(String)map.get("FJ");
+                map.put("FJ",FJ.replace("&ldquo;", "“").replace("&rdquo;", "”"));
+            }
+            map.put("ZJH",qrlInfoMap.get("ZJH"));
         }
         return map;
     }

@@ -88,6 +88,6 @@ public interface RegBusBdcqzsdjxxMapper extends BaseMapper<RegBusBdcqzsdjxxDo> {
 
     Map getHInfo(@Param("bdcdyh")String bdcdyh);
 
-
+    String selectIsDz(@Param("ywh")String ywh);
 
 }

@@ -224,4 +224,8 @@
     <select id="getHInfo" resultType="java.util.Map">
         select * from reg_base_h c where bdcdyh=#{bdcdyh} and  islogout='0' and del_flag='0'
     </select>
+
+    <select id="selectIsDz" resultType="java.lang.String">
+        select ISDZ from reg_bus_sz  where ywh=#{ywh} and del_flag='0'
+    </select>
 </mapper>