查询筛选条件护理机构变更

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

@@ -70,9 +70,9 @@ public class DisableController {
     public Result<List<DisableVO>> disableList(String organId, String districtProvincial, String isIncludeSubsidiaries,
                                                String districtCity, String districtArea,
                                                String realName, String certiCode, String dataFrom,
-                                               String srvOrganId, int pageNum, int pageSize) {
+                                               String srvOrganName, int pageNum, int pageSize) {
         IPage<DisableVO> iPage = disableService.disableList(organId, isIncludeSubsidiaries, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId, pageNum, pageSize);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName, pageNum, pageSize);
         return Result.success(iPage.getRecords());
     }
 

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

@@ -30,11 +30,11 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * @param name                  参保人员姓名
      * @param certiCode             参保人身份证号码
      * @param dataFrom              申请来源
-     * @param srvOrganId            护理机构
+     * @param srvOrganName          护理机构
      */
     Page<DisableVO> disableList(Page<DisableVO> page, List<String> organIds, String isIncludeSubsidiaries, String provincial,
                                 String city, String area, String name, String certiCode,
-                                String dataFrom, String srvOrganId);
+                                String dataFrom, String srvOrganName);
 
 
     DisableExamineInfoVO selectDisableExamineInfoByApplyId(String applyId);

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

@@ -59,7 +59,7 @@ public class DisableServiceImpl implements DisableService {
     @Override
     public Page<DisableVO> disableList(String organId, String isIncludeSubsidiaries, String districtProvincial, String districtCity,
                                        String districtArea, String realName, String certiCode, String dataFrom,
-                                       String srvOrganId, int page, int pageSize) {
+                                       String srvOrganName, int page, int pageSize) {
         // 没有organId参数的时候，这个集合就为null
         List<String> organIds = null;
         if (StrUtil.isNotBlank(organId)) {
@@ -89,7 +89,7 @@ public class DisableServiceImpl implements DisableService {
             }
         }
         return disableApplyMapper.disableList(new Page<>(page, pageSize), organIds, isIncludeSubsidiaries, districtProvincial,
-                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId);
+                districtCity, districtArea, realName, certiCode, dataFrom, srvOrganName);
     }
 
     @Override

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

@@ -26,6 +26,7 @@
         from CH_DISABLE_APPLY a
         LEFT JOIN CH_FND_ORGAN o ON a.organ_id = o.ORGAN_ID
         LEFT JOIN CH_FND_SRV_MODE m ON a.srv_mode_id = m.SRV_MODE_ID
+        LEFT JOIN CH_SRV_ORGAN s ON a.SRV_ORGAN_ID = s.SRV_ORGAN_ID
         <where>
             <if test="organIds != null">
                 and  a.organ_id in
@@ -43,7 +44,7 @@
                 and a.DISTRICT_AREA = #{area}
             </if>
             <if test="name != null and name != ''">
-                and a.REAL_NAME like CONCAT('%',#{name},'%')
+                and a.REAL_NAME like CONCAT(CONCAT('%',#{name}) ,'%')
             </if>
             <if test="certiCode != null and certiCode != ''">
                 and a.CERTI_CODE = #{certiCode}
@@ -51,8 +52,8 @@
             <if test="dataFrom != null and dataFrom != ''">
                 and a.DATA_FROM = #{dataFrom}
             </if>
-            <if test="srvOrganId != null and srvOrganId != ''">
-                and a.srvOrganId = #{srvOrganId}
+            <if test="srvOrganName != null and srvOrganName != ''">
+                and s.SRV_ORGAN_NAME like CONCAT(CONCAT('%',#{srvOrganName}) ,'%')
             </if>
         </where>
     </select>