失能申请，服务地址是否以维护代码还原

apply/apply-service/src/main/java/com/hungraim/ltc/controller/DisableController.java

@@ -193,11 +193,10 @@ public class DisableController {
                                                String organId, String districtProvincial,
                                                String districtCity, String districtArea,
                                                String realName, String certiCode, String dataFrom,
-                                               String srvOrganName,String hasAcptSrvAddress) {
+                                               String srvOrganName) {
         Page<DisableVO> page = new Page<>(pageNum, pageSize);
         page = disableService.disableList(page, organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 1,
-                hasAcptSrvAddress);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 1);
         return Result.success(page);
     }
 
@@ -224,7 +223,7 @@ public class DisableController {
                                                String srvOrganName) {
         Page<DisableVO> page = new Page<>(pageNum, pageSize);
         page = disableService.disableList(page, organId, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 2,null);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, 2);
         return Result.success(page);
     }
 

apply/apply-service/src/main/java/com/hungraim/ltc/dao/DisableApplyMapper.java

@@ -34,7 +34,7 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
     Page<DisableVO> disableList(Page<DisableVO> page, @Param("organIds") List<String> organIds, @Param("provincial")String provincial,
                                 @Param("city")String city, @Param("area")String area, @Param("name")String name, @Param("certiCode")String certiCode,
                                 @Param("dataFrom")String dataFrom, @Param("srvOrganName")String srvOrganName,
-                                @Param("applyMethod")Integer applyMethod, @Param("hasAcptSrvAddress")String hasAcptSrvAddress);
+                                @Param("applyMethod")Integer applyMethod);
 
 
     DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);

apply/apply-service/src/main/java/com/hungraim/ltc/service/DisableService.java

@@ -23,7 +23,7 @@ public interface DisableService {
 
     Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                 String districtArea, String realName, String certiCode, String dataFrom,
-                                String srvOrganName, Integer applyMethod,String hasAcptSrvAddress);
+                                String srvOrganName, Integer applyMethod);
 
     /**
      * 失能审核信息详情

apply/apply-service/src/main/java/com/hungraim/ltc/service/impl/DisableServiceImpl.java

@@ -113,14 +113,14 @@ public class DisableServiceImpl implements DisableService {
     @Override
     public Page<DisableVO> disableList(Page<DisableVO> page, String organId, String districtProvincial, String districtCity,
                                        String districtArea, String realName, String certiCode, String dataFrom,
-                                       String srvOrganName, Integer applyMethod,String hasAcptSrvAddress) {
+                                       String srvOrganName, Integer applyMethod) {
         // 没有organId参数的时候，这个集合就为null
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
             organIds = Arrays.asList(organId.split(","));
         }
         Page<DisableVO> disableVOPage = disableApplyMapper.disableList(page, organIds, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, applyMethod,hasAcptSrvAddress);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, applyMethod);
         List<DisableVO> records = disableVOPage.getRecords();
         for (DisableVO record : records) {
             String birthday = record.getBirthday();

apply/apply-service/src/main/resources/mapper/ChDisableApplyMapper.xml

@@ -98,22 +98,6 @@
             <if test="srvOrganName != null and srvOrganName != ''">
                 and resu.srvOrganName like CONCAT(CONCAT('%',#{srvOrganName}) ,'%')
             </if>
-            <if test="hasAcptSrvAddress != null and hasAcptSrvAddress != '' ">
-                 <if test='hasAcptSrvAddress == "Y" '>
-                     and resu.acpt_srv_Provincial is not null
-                     and resu.acpt_Srv_City is not null
-                     and resu.acpt_Srv_Area is not null
-                     and resu.acpt_Srv_Address is not null
-                 </if>
-                <if test='hasAcptSrvAddress == "N"'>
-                    and (
-                    resu.acpt_srv_Provincial is  null
-                    or resu.acpt_Srv_City is  null
-                    or resu.acpt_Srv_Area is  null
-                    or resu.acpt_Srv_Address is  null
-                    )
-                </if>
-            </if>
         </where>
         order by resu.effTime desc
     </select>

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/disable/DisableVO.java

@@ -61,5 +61,4 @@ public class DisableVO implements Serializable {
 
     private String applyTime;
 
-    private String hasAcptSrvAddress;//接受服务地址是否已维护,Y是，N否
 }