diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
index ffe4b3c3..1e6110fa 100644
--- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
+++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/util/IdCardCryptoUtil.java
@@ -29,31 +29,36 @@ public class IdCardCryptoUtil {
     public static final String PRIVATE_KEY = "MIICdAIBADANBgkqhkiG9w0BAQEFAASCAl4wggJaAgEAAoGBAMAMhV1Fc3JPmmYbFJR/AS6nZjVgLPtV+JszLJCGSlU/cHIqygUONnfTJbmC/vSxBuqf8wK2FMWrCHf8j9gt+2Eze9TtN2WY1+eUpxDqmvFih8uRfxqSuGBBUV6tv/gOFxsCTnG/HXYOR6H+fMN/lDDYrcLKZE+evjM3pmMAvv0fAgMBAAECf2rTWPVVrHuC/ywzFz+CmSXAxLNSZbMCH0doYvs0hIrmvtjCjgN1F6P1z2yUpHBEbsetZEwdyQnEf74+WCuBaFIYjmQm/05grIxam/QrGibnV5qNiA0VeCkj6bUy+z5mt3/ithgzjmOiYIgMenjf6ut6RmgRDodgJiFbvSvfskECQQDoqGMNaUV+Y/O9h+l9eOCkSUOjOsL9WDRL34ei/jf7VFFYBZLs2GMzLunDkDz1dHvufDiMPeHUTTN8zIEEpNMVAkEA01Ehf9Np2zUqFQp3SW/fHVsaGM97JsbsTQrsDdUWwZLJTSQ7Yf+yg21GkNa8Mmlsp1OLyS607HV7lPlKO0LsYwJBAN1LTOv0taUCbVRZcj1mPEYHac5Ylh9jRlrkwp7GL3lfOf//TUD6kWCdvrvE9jaCFV9ByIecVLEavV53JkDEhgECQHgR40z0XXOWs8Cc38a0cDwH5b4vNjSEVwQ3roT1jSaUNxlD+xHl7hLLZosp2Gl0ia5RxF2d0mOBJaUyOMGPdy0CQCLBU3995JMoUyLgt2+Riw0PFbdxFEnKGyshAt5Q957/hC6L/V5tQNnh/AM9q23DIUQGb1whhxdIzV12qFSSS34=";
 
     public static void main(String[] args) {
-        //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
-        //VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0
-        //SXRpWEhVN3RHM3ZFbzRQcQ==
-        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "18361639869");
-        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");
-        System.out.println(userIdCode);
-//        String secret = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "439e0031b9b65409baf00447c24dc3e2");
-//        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "3qQTst9aURL3pN5EzKtqVJnQv2Q0Ob3r+Gc9DXX/I30=");
-        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "ttdgYH5e/4R1rFL6lbJb+w==");
-        String sfz = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "9vtFzYM8BZMXg2wlaegdMdXaLufwHP8WOhqKl4Ld3IM=");
-
-        System.out.println(phone);
-        System.out.println(sfz);
-
+        String key = "VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0";
+        System.out.println("====================== 示例 ======================");
+        // 加密
+        String source_dec = "19925235717";
+        String enc = IdCardCryptoUtil.symmetricEncryptIdCard(key, source_dec);
+        System.out.println(source_dec+" 加密后 : "+enc);
+        // 解密
+        String source_enc = "LRMP+aj4E91RjfadXf1GbQ==";
+        String dec = IdCardCryptoUtil.symmetricDecryptIdCard(key, source_enc);
+        System.out.println(source_enc+" 解密后 : "+dec);
+
+//        String userIdCode = IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "18361639869");
+//        String userNameCode = IdCardCryptoUtil.symmetricEncryptIdCard("eWIzY3BMRVNEQXhvUUlXMA==", "汪鑫");
+//        System.out.println(userIdCode);
+//        String phone = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "0d17ehr8XLbrj2kbgeEiDg==");
+//        String sfz = IdCardCryptoUtil.symmetricDecryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", "9vtFzYM8BZMXg2wlaegdMdXaLufwHP8WOhqKl4Ld3IM=");
+//        System.out.println(phone);
+//        System.out.println(sfz);
+
+        System.out.println("====================== 实用 ======================");
         String[] strings={
-                "13510632969" ,"15818724642","18823711227"
-
+            "13631554532", "13692276207"
         };
-        String string="";
+//        String string="";
         for(String s:strings){
-            String phoneJM=IdCardCryptoUtil.symmetricEncryptIdCard("VRJHzFqJpsSZhwnsKTWNspv_GZMxTWl-bgH6DyE9Ty0", s);
-            System.out.println(s+":"+phoneJM);
-            string=string+"'"+phoneJM+"',";
+            String phoneJM=IdCardCryptoUtil.symmetricEncryptIdCard(key, s);
+            System.out.println(s+" 加密后: "+phoneJM);
+//            string=string+"'"+phoneJM+"',";
         }
-        System.out.println(string);
+//        System.out.println(string);
 
 /*        String[] strings={
                 "i4BpGrKBbN0LtUemOvlhd+coz3KcCkFyFLe2lqbwlog=","bNW1LELHjqRD1LhoqcVlppnQv2Q0Ob3r+Gc9DXX/I30=","ohDLgX+wBEXZcsI1GFhc29OgyhRw2fpn9cK5YItWBFA=","oi5Rqny8mo7ar+GOhZTmH9f65xsKpYaNWRWCdsBWyhM=","ZbhCWrGlvSkbC5xkMH8/DNK2D7TAjbMtaI4S8rK5prc=","wqTtpWcQtEnNlzUGEyqNTK2gs88ReMSCUVhfg29V7sU="
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
index 38a7e114..dd4ac534 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/statistical/home.html
@@ -203,29 +203,29 @@
     base_html += '  </div>';
     base_html += '  <div class="tab_inspect">';
     base_html += '    <div id="xzzf{idx}" class="tab_inspect_item">';
-    base_html += '      <div class="inspect_count">（行政执法总数：<b>{jc_num}</b>）</div>';
+    base_html += '      <div class="inspect_count">（行政执法总数：<b>{all_num}</b>）</div>';
     base_html += '        <ul>';
-    base_html += '          <li><label>单独检查</label><span>{jc_num}</span><span>{jc_pre}%</span></li>';
-    base_html += '          <li><label>联合检查</label><span>{nuite_jc_num}</span><span>{nuite_jc_per}%</span></li>';
-    base_html += '          <li><label>检查压减率</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '          <li><label>被检查企业</label><span>{qy_num}</span><span>{qy_pre}%</span></li>';
-    base_html += '          <li><label>涉企投诉次数</label><span>{com_jc_num}</span><span>{com_jc_per}%</span></li>';
+    base_html += '          <li><label>单独检查</label><span>{single_num}</span><span>{single_per}%</span></li>';
+    base_html += '          <li><label>联合检查</label><span>{nuite_num}</span><span>{nuite_per}%</span></li>';
+    base_html += '          <li><label>检查压减率</label><span>{cut_num}</span><span>{cut_per}</span></li>';
+    base_html += '          <li><label>被检查企业</label><span>{ent_num}</span><span>{ent_per}%</span></li>';
+    base_html += '          <li><label>涉企投诉次数</label><span>{com_num}</span><span>{com_per}%</span></li>';
     base_html += '        </ul>';
     base_html += '    </div>';
     base_html += '    <div id="fxzzf{idx}" class="tab_inspect_item" style="display: none;">';
     base_html += '      <div class="inspect_count">（非行政执法总数：<b>{njc_num}</b>）</div>';
     base_html += '      <ul>';
-    base_html += '        <li><label>日常巡查</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>普法宣传</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>企业服务</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>技术指导</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>检验检测</label><span>13,023</span><span>40.66%</span></li>';
+    base_html += '        <li><label>日常巡查</label><span>{type_4}</span><span>{type_p_4}%</span></li>';
+    base_html += '        <li><label>普法宣传</label><span>{type_3}</span><span>{type_p_3}%</span></li>';
+    base_html += '        <li><label>企业服务</label><span>{type_6}</span><span>{type_p_6}%</span></li>';
+    base_html += '        <li><label>技术指导</label><span>{type_7}</span><span>{type_p_7}%</span></li>';
+    base_html += '        <li><label>检验检测</label><span>{type_8}</span><span>{type_p_8}%</span></li>';
     base_html += '      </ul>';
     base_html += '      <ul>';
-    base_html += '        <li><label>诉求处理</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>培训</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>调研</label><span>13,023</span><span>40.66%</span></li>';
-    base_html += '        <li><label>其他</label><span>13,023</span><span>40.66%</span></li>';
+    base_html += '        <li><label>诉求处理</label><span>{type_5}</span><span>{type_p_5}%</span></li>';
+    base_html += '        <li><label>培训</label><span>{type_9}</span><span>{type_p_9}%</span></li>';
+    base_html += '        <li><label>调研</label><span>{type_10}</span><span>{type_p_10}%</span></li>';
+    base_html += '        <li><label>其他</label><span>{type_0}</span><span>{type_p_0}%</span></li>';
     base_html += '      </ul>';
     base_html += '    </div>';
     base_html += '  </div>';
@@ -238,154 +238,397 @@
         dataType: 'json',
         contentType: "application/json",
         success: function (result) {
-          q_jc_num += result.data.jc_num;
-          q_njc_num += result.data.njc_num;
+          console.log(result)
+          q_jc_num += result.data.allNum;
+          // q_njc_num += result.data.njc_num;
           $("#q_jc_num").text(q_jc_num);
-          $("#q_njc_num").text(q_njc_num);
+          // $("#q_njc_num").text(q_njc_num);
           console.log($("#jc_all").text() + " - "+ q_jc_num +" = "+ ($("#jc_all").text() - q_jc_num));
           $("#s_jc_num").text($("#jc_all").text() - q_jc_num);
-          $("#s_njc_num").text($("#njc_all").text() - q_njc_num);
+          // $("#s_njc_num").text($("#njc_all").text() - q_njc_num);
           switch (result.data.area) {
             case '光明区':
               let gmHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 8);
               $("#districtGM").html(gmHtml)
               break;
             case '宝安区':
               let baHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 4);
               $("#districtBA").html(baHtml)
               break;
             case '南山区':
               let nsHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 3);
               $("#districtNS").html(nsHtml)
               break;
             case '龙华区':
               let lhHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 6);
               $("#districtLH").html(lhHtml)
               break;
             case '福田区':
               let ftHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 0);
               $("#districtFT").html(ftHtml)
               break;
             case '罗湖区':
               let lhuHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 1);
               $("#districtLHu").html(lhuHtml)
               break;
             case '龙岗区':
               let lgHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 5);
               $("#districtLG").html(lgHtml)
               break;
             case '盐田区':
               let ytHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 2);
               $("#districtYT").html(ytHtml)
               break;
             case '坪山区':
               let psHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 7);
               $("#districtPS").html(psHtml)
               break;
             case '大鹏新区':
               let dpHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 9);
               $("#districtDP").html(dpHtml);
               break;
             case '深汕特别合作区':
               let ssHtml = base_html.replaceAll("{area}", result.data.area)
-                      .replaceAll("{jc_num}", result.data.jc_num)
-                      .replaceAll("{njc_num}", result.data.njc_num)
-                      .replaceAll("{qy_num}", result.data.qy_num)
-                      .replaceAll("{nqy_num}", result.data.nqy_num)
-                      .replaceAll("{nuite_jc_num}", result.data.nuite_jc_num)
-                      .replaceAll("{per_jc_num}", result.data.per_jc_num)
-                      .replaceAll("{law_jc_num}", result.data.law_jc_num)
-                      .replaceAll("{com_jc_num}", result.data.com_jc_num)
+                      .replaceAll("{all_num}", result.data.allNum)
+                      .replaceAll("{single_num}", result.data.singleNum)
+                      .replaceAll("{single_per}", result.data.singlePer)
+                      .replaceAll("{nuite_num}", result.data.unionNum)
+                      .replaceAll("{nuite_per}", result.data.unionPer)
+                      .replaceAll("{cut_num}", result.data.cutNum)
+                      .replaceAll("{cut_per}", result.data.cutPer)
+                      .replaceAll("{ent_num}", result.data.entNum)
+                      .replaceAll("{ent_per}", result.data.entPer)
+                      .replaceAll("{com_num}", result.data.comNum)
+                      .replaceAll("{com_per}", result.data.comPer)
+                      .replaceAll("{njc_num}", result.data.njcNum)
+                      .replaceAll("{type_3}", result.data.resNonTyps.key_3.num)
+                      .replaceAll("{type_p_3}", result.data.resNonTyps.key_3.per)
+                      .replaceAll("{type_4}", result.data.resNonTyps.key_4.num)
+                      .replaceAll("{type_p_4}", result.data.resNonTyps.key_4.per)
+                      .replaceAll("{type_5}", result.data.resNonTyps.key_5.num)
+                      .replaceAll("{type_p_5}", result.data.resNonTyps.key_5.per)
+                      .replaceAll("{type_6}", result.data.resNonTyps.key_6.num)
+                      .replaceAll("{type_p_6}", result.data.resNonTyps.key_6.per)
+                      .replaceAll("{type_7}", result.data.resNonTyps.key_7.num)
+                      .replaceAll("{type_p_7}", result.data.resNonTyps.key_7.per)
+                      .replaceAll("{type_8}", result.data.resNonTyps.key_8.num)
+                      .replaceAll("{type_p_8}", result.data.resNonTyps.key_8.per)
+                      .replaceAll("{type_9}", result.data.resNonTyps.key_9.num)
+                      .replaceAll("{type_p_9}", result.data.resNonTyps.key_9.per)
+                      .replaceAll("{type_10}", result.data.resNonTyps.key_10.num)
+                      .replaceAll("{type_p_10}", result.data.resNonTyps.key_10.per)
+                      .replaceAll("{type_0}", result.data.resNonTyps.key_0.num)
+                      .replaceAll("{type_p_0}", result.data.resNonTyps.key_0.per)
                       .replaceAll("{idx}", 10);
               $("#districtSS").html(ssHtml)
               break;
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
index c5edb41e..207dc99d 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/StatisticalPanelController.java
@@ -9,6 +9,7 @@ import com.zdxt.code.domain.dto.StatisticalPanelDto;
 import com.zdxt.code.service.StatisticalPaneService;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.domain.auth.DictData;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -388,39 +389,73 @@ public class StatisticalPanelController extends BaseController {
     @PostMapping("/areaRegistration")
     @ResponseBody
     public ZDResponse areaRegistration(@RequestBody SixAnalysisParams params){
+        Map<String, Object> resMap = new HashMap<String, Object>();
         DeptBean deptParams = new DeptBean();
         deptParams.setZone(2);
         deptParams.setDeptName(params.getDeptId());
         List<DeptBean> depts = deptApi.selectDepts(deptParams);
         params.setDeptId(depts.get(0).getDeptId());
-        Integer jc_num = statisticalPaneService.analysisEnterprisesAll(params);
-        Integer qy_num = statisticalPaneService.analysisEnterprises(params);
-        Integer njc_num = statisticalPaneService.analysis_non_enterprisesIns(params);
-        Integer nqy_num = statisticalPaneService.analysis_non_enterprises(params);
-
-        // 下转弹出层需要的数据(联合检查, 涉企检查频次压缩率, 行政检查预告次数, 涉企投诉次数)
-        params.setUniteCheck("1");
-        Integer nuite_jc_num_all = statisticalPaneService.analysis_enterprisesIns_all(params);
-        Integer nuite_jc_num = statisticalPaneService.analysisEnterprisesAll(params);
-        params.setUniteCheck(null);
-        Integer law_jc_num = statisticalPaneService.analysisInsNotice(params);
-        Integer com_jc_num = statisticalPaneService.analysisEnterprisesComplaint(params);
-
-        Map<String, Object> resMap = new HashMap<String, Object>();
         resMap.put("area", deptParams.getDeptName());
-        resMap.put("jc_num", jc_num);
-        resMap.put("qy_num", qy_num);
-        resMap.put("njc_num", njc_num);
-        resMap.put("nqy_num", nqy_num);
-
-        resMap.put("nuite_jc_num", nuite_jc_num);
-        if(null == nuite_jc_num || 0 == nuite_jc_num) {
-            resMap.put("per_jc_num", 0+"%");
-        } else {
-            resMap.put("per_jc_num", ((double)nuite_jc_num/nuite_jc_num_all)*100+"%");
+
+        // 全市行政检查数量
+        Integer all_num = statisticalPaneService.analysisEnterprisesAll(params);
+        resMap.put("allNum", all_num);
+
+        // 全市行政联合检查数量
+        Integer union_num = statisticalPaneService.analysisEnterprisesUnion(params);
+        String union_per = this.setPercentage((double)union_num / all_num);
+        resMap.put("unionNum", union_num);
+        resMap.put("unionPer", union_per);
+
+        // 全市行政单条检查数量
+        Integer single_num = statisticalPaneService.analysisEnterprisesSingle(params);
+        String single_per = this.setPercentage((double)single_num / all_num);
+        resMap.put("singleNum", single_num);
+        resMap.put("singlePer", single_per);
+
+        // 执法压减数据
+        Integer cut_num = all_num - (union_num + single_num);
+        String cut_per = this.setPercentage((double)cut_num / all_num);
+        resMap.put("cutNum", cut_num);
+        resMap.put("cutPer", cut_per);
+
+        // 被检查企业数
+        params.setQy(deptParams.getDeptName());
+        Integer ent_all_num = statisticalPaneService.analysisEnterprisesCountAll(params);
+        Integer ent_num = statisticalPaneService.analysisEnterprises(params);
+        String ent_per = this.setPercentage((double)ent_num / ent_all_num);
+        resMap.put("entNum", ent_num);
+        resMap.put("entPer", ent_per);
+
+        // 投诉
+        Integer com_num = statisticalPaneService.analysisEnterprisesComplaint(params);
+        String com_per = this.setPercentage((double)com_num / all_num);
+        resMap.put("comNum", com_num);
+        resMap.put("comPer", com_per);
+
+        // 非行政执法
+        Map<String, Object> resNonTyps = new HashMap<>();
+        List<DictData> checkCategory = iDictDataService.selectDictDataByType("no_check_category");
+        List<Map<String, Object>> nonTypes = statisticalPaneService.analysisNonRegistrationType(params);
+        Integer nonAll = statisticalPaneService.analysis_non_enterprisesIns(params);
+        resMap.put("njcNum", nonAll);
+        for (DictData dictData : checkCategory) {
+            Map<String, Object> tmp = new HashMap<>();
+            tmp.put("label", dictData.getDictLabel());
+            tmp.put("num", 0);
+            tmp.put("per", 0.0);
+            for (Map<String, Object> map : nonTypes) {
+                if (map.get("dict_label").toString().equals(dictData.getDictLabel())) {
+                    double num = Double.parseDouble(map.get("num").toString());
+                    String per = this.setPercentage((num / nonAll));
+                    tmp.put("num", num);
+                    tmp.put("per", per);
+                }
+            }
+            resNonTyps.put("key_"+dictData.getDictValue(), tmp);
         }
-        resMap.put("law_jc_num", law_jc_num);
-        resMap.put("com_jc_num", com_jc_num);
+        resMap.put("resNonTyps", resNonTyps);
+
         return ZDResponse.success(deptParams.getDeptName()+"的行政/非行政", resMap);
     }
 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
index cd3eb0e2..a74641dd 100644
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/StatisticalPanelMapper.xml
@@ -1666,11 +1666,19 @@
     <select id="analysis_enterprises_countAll" parameterType="SixAnalysisParams" resultType="integer">
         select
         count(distinct enterprise_number) as num
-        from enterprise_information r
-        where r.is_unsubscribe = 0
-        and r.is_delete = 0
-        and r.enterprise_number is not null
-        and r.enterprise_number is not null
+        from enterprise_information e
+        where e.is_unsubscribe = 0
+        and e.is_delete = 0
+        and e.enterprise_number is not null
+        and e.enterprise_number is not null
+        <if test="qy != null  and qy != ''">
+            and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区%')or
+            e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区%'))
+            <if test="jd != null  and jd != ''">
+                and (e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '区',#{jd},'%')or
+                e.enterprise_address like concat('深圳市',substring_index(#{qy}, "区",1), '新区',#{jd},'%'))
+            </if>
+        </if>
     </select>
 
     <!-- 时间维度统计 -->