特殊人群类别调整，使用新的类别

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java

@@ -14,13 +14,14 @@ public enum ZhzlResiCategoryEnum {
     // zhaoshizhaohuojingshenbing	肇事肇祸精神病
     // xidurenyuan	吸毒人员
 
-    resi_xfry("resi_xfry", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1),
+    xinfangrenyuan("xinfangrenyuan", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1),
     anzhibangjiao("anzhibangjiao", "安置帮教", "list_equal", "ic_special", "SPECIAL_RQLB", "anzhibangjiao", 2),
-    xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3),
+    // xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3),
-    buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4),
+    // buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4),
     shequjiaozheng("shequjiaozheng", "社区矫正", "list_equal", "ic_special", "SPECIAL_RQLB", "shequjiaozheng", 5),
-    zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6),
+    // zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6),
-    xidurenyuan("xidurenyuan", "吸毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7);
+    jingzhanghuanzhe("jingzhanghuanzhe", "精障患者", "list_equal", "ic_special", "SPECIAL_RQLB", "jingzhanghuanzhe", 6),
+    jiedurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7);
 
     private String code;
     private String name;

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java

@@ -75,7 +75,7 @@ public class IcResiServiceImpl implements IcResiService {
         query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。
         query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids));
         query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId);
-        if ("resi_xfry".equals(categoryKey)) {
+        if ("xinfangrenyuan".equals(categoryKey)) {
             // 信访人员
             query.eq(IcResiUserEntity::getIsXfry, true);
         } else if ("resi_snry".equals(categoryKey)) {