失能人员信息列表省市区、机构

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

@@ -54,6 +54,7 @@ public class DisableController {
      * 失能人员信息列表
      *
      * @param organId               适用机构代码
+     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param districtProvincial    所在省
      * @param districtCity          所在市
      * @param districtArea          所在区域
@@ -66,11 +67,11 @@ public class DisableController {
      * @return 失能人员信息列表
      */
     @RequestMapping("/disableList")
-    public Result<List<DisableVO>> disableList(String organId, String districtProvincial,
+    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) {
-        IPage<DisableVO> iPage = disableService.disableList(organId, districtProvincial,
+        IPage<DisableVO> iPage = disableService.disableList(organId, isIncludeSubsidiaries, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId, pageNum, pageSize);
         return Result.success(iPage.getRecords());
     }

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

@@ -23,6 +23,7 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * 查询待遇申请管理列表
      *
      * @param organId               机构代码
+     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param provincial            省
      * @param city                  市
      * @param area                  区
@@ -31,7 +32,7 @@ public interface DisableApplyMapper extends BaseMapper<ChDisableApply> {
      * @param dataFrom              申请来源
      * @param srvOrganId            护理机构
      */
-    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String provincial,
+    Page<DisableVO> disableList(Page<DisableVO> page, String organId, String isIncludeSubsidiaries, String provincial,
                                 String city, String area, String name, String certiCode,
                                 String dataFrom, String srvOrganId);
 

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

@@ -22,6 +22,7 @@ public interface DisableService {
      * 查询所有资源对应的角色
      *
      * @param organId               适用机构代码
+     * @param isIncludeSubsidiaries 是否包含子机构 0包含,1不包含
      * @param districtProvincial    所在省
      * @param districtCity          所在市
      * @param districtArea          所在区域
@@ -33,7 +34,7 @@ public interface DisableService {
      * @param pageSize              每页几条数据
      * @return list
      */
-    Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+    Page<DisableVO> disableList(String organId, String isIncludeSubsidiaries, String districtProvincial, String districtCity,
                                 String districtArea, String realName, String certiCode, String dataFrom,
                                 String srvOrganId, int pageNum, int pageSize);
 

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

@@ -33,10 +33,10 @@ public class DisableServiceImpl implements DisableService {
     private FndStreetMapper fndStreetMapper;
 
     @Override
-    public Page<DisableVO> disableList(String organId, String districtProvincial, String districtCity,
+    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) {
-        return disableApplyMapper.disableList(new Page<>(page, pageSize), organId, districtProvincial,
+        return disableApplyMapper.disableList(new Page<>(page, pageSize), organId, isIncludeSubsidiaries, districtProvincial,
                 districtCity, districtArea, realName, certiCode, dataFrom, srvOrganId);
     }
 

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

@@ -21,11 +21,17 @@
         a.eff_time effTime,
         a.data_from dataFrom,
         a.ADRESS_DETAIL adressDetail
-        from CH_DISABLE_APPLY a,CH_SRV_ORGAN o
+        from CH_DISABLE_APPLY a,CH_FND_ORGAN o
         where a.organ_id = o.ORGAN_ID
         <if test="organId != null and organId != ''">
+            <if test="isIncludeSubsidiaries == '0'">
+                and a.organ_id in (select organ_id form CH_FND_ORGAN where PARENT_ID = #{organId})
+            </if>
+            <if test="isIncludeSubsidiaries != '0'">
                 and a.organ_id = #{organId}
             </if>
+        </if>
+
         <if test="provincial != null and provincial != ''">
             and a.DISTRICT_PROVINCIAL = #{provincial}
         </if>