1.fix：特殊人群，调整，

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

@@ -20,7 +20,7 @@ public enum ZhzlResiCategoryEnum {
     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),
-    xidurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7);
+    jiedurenyuan("jiedurenyuan", "戒毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7);
 
     private String code;
     private String name;

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/LingShanSpecialCrowdController.java

@@ -251,14 +251,13 @@ public class LingShanSpecialCrowdController {
      */
     @PostMapping("deleteByType")
     public Result deleteByType(@RequestBody Map<String, String> params) {
-        String specialType = params.get("specialType");
         String resiId = params.get("resiId");
 
-        if (StringUtils.isAnyBlank(specialType, resiId)) {
+        if (StringUtils.isAnyBlank(resiId, resiId)) {
             throw new ValidateException("特殊人群类型或身份证不能为空");
         }
 
-        lingShanSpecialCrowdService.deleteByType(specialType, resiId);
+        lingShanSpecialCrowdService.deleteByType(resiId);
         return new Result();
     }
 

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/LingshanSpecialCrowdPersonTypeDao.java

@@ -27,5 +27,5 @@ public interface LingshanSpecialCrowdPersonTypeDao extends BaseDao<LingshanSpeci
                                                               @Param("mobile") String mobile,
                                                               @Param("idCard") String idCard);
 
-    void deletePhysical(@Param("specialType") String specialType, @Param("resiId") String resiId);
+    void deletePhysical(@Param("resiId") String resiId);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/LingShanSpecialCrowdService.java

@@ -82,7 +82,7 @@ public interface LingShanSpecialCrowdService {
     PageData<LingShanSpecialCrowdListResultDTO> listSpecialCrowds(String orgId, String orgType, String specialType, String name, String mobile,
                                                                   String idCard, Integer pageNo, Integer pageSize);
 
-    void deleteByType(String specialType, String resiId);
+    void deleteByType(String resiId);
 
     /**
      * @description: 保存或修改

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/LingShanSpecialCrowdServiceImpl.java

@@ -608,24 +608,17 @@ public class LingShanSpecialCrowdServiceImpl implements LingShanSpecialCrowdServ
 
     @Transactional
     @Override
-    public void deleteByType(String specialType, String resiId) {
+    public void deleteByType(String resiId) {
-        LambdaQueryWrapper<LingshanSpecialCrowdPersonTypeEntity> q = new LambdaQueryWrapper<>();
-        q.eq(LingshanSpecialCrowdPersonTypeEntity::getSpecialType, specialType);
-        q.eq(LingshanSpecialCrowdPersonTypeEntity::getResiId, resiId);
-
         // 先删除type
-        specialCrowdPersonTypeDao.deletePhysical(specialType, resiId);
+        specialCrowdPersonTypeDao.deletePhysical(resiId);
 
-        LingshanSpecialCrowdPersonTypeEntity personType = specialCrowdPersonTypeDao.selectOne(q);
+        IcResiUserEntity resiInfo = icResiUserDao.selectById(resiId);
-        if (personType == null) {
-            return;
-        }
 
         // 再删除detail
-        specialCrowdDetailAzbjDao.deletePhysical(personType.getIdCard());
+        specialCrowdDetailAzbjDao.deletePhysical(resiInfo.getIdCard());
-        specialCrowdDetailXfryDao.deletePhysical(personType.getIdCard());
+        specialCrowdDetailXfryDao.deletePhysical(resiInfo.getIdCard());
-        specialCrowdDetailJdryDao.deletePhysical(personType.getIdCard());
+        specialCrowdDetailJdryDao.deletePhysical(resiInfo.getIdCard());
-        specialCrowdDetailSqjzDao.deletePhysical(personType.getIdCard());
+        specialCrowdDetailSqjzDao.deletePhysical(resiInfo.getIdCard());
-        specialCrowdDetailJzhzDao.deletePhysical(personType.getIdCard());
+        specialCrowdDetailJzhzDao.deletePhysical(resiInfo.getIdCard());
     }
 }

epmet-user/epmet-user-server/src/main/resources/mapper/LingshanSpecialCrowdPersonTypeDao.xml

@@ -32,7 +32,7 @@
                  ,      UPDATED_TIME = values(UPDATED_TIME)
     </insert>
     <delete id="deletePhysical">
-        delete from lingshan_special_crowd_person_type where RESI_ID = #{resiId} and SPECIAL_TYPE = #{specialType}
+        delete from lingshan_special_crowd_person_type where RESI_ID = #{resiId}
     </delete>
 
     <select id="listSpecialCrowds"