方案

governance/src/main/java/com/hungraim/ltc/governance/controller/SrvProgramController.java

@@ -75,7 +75,7 @@ public class SrvProgramController {
      * @return 返回个人照护方案列表
      */
     @RequestMapping("/programSetList")
-    public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId) {
+    public Result getProgramSetList(Integer pageNum, Integer pageSize, Long disabInfoId, Long srvOrganId,String status) {
         if (pageNum == null || pageNum < 1 || disabInfoId == null || disabInfoId == 0 || srvOrganId == null || srvOrganId == 0) {
             return Result.failed(ResultCode.REQUEST_PARAM_ERROR);
         }
@@ -83,7 +83,7 @@ public class SrvProgramController {
             pageSize = 10;
         }
         Page<ProgramListVo> page = new Page<>(pageNum, pageSize);
-        page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId, null);
+        page = srvProgramService.getProgramSetList(page, disabInfoId, srvOrganId, status);
         List<ProgramListVo> records = page.getRecords();
         records =records.stream().collect(
                 Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparingLong(ProgramListVo::getProgramId))), ArrayList::new));

governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvProgramMapper.xml

@@ -128,7 +128,9 @@
                T4.FINISH_TIME         assessDate,
                T7.MODE_NAME           svrModelName,
                T5.SRV_ORGAN_NAME      svrOrganName,
-               T1.PROG_STATUS         progStatus,
+        <if test="programStatus != null and programStatus != ''">
+            #{programStatus}        progStatus,
+        </if>
                T1.EFF_TIME            effTime
         FROM CH_SRV_PROGRAM T1
                  INNER JOIN CH_DISABLE_INFO T2 ON T1.DISAB_INFO_ID = T2.DISAB_INFO_ID
@@ -139,10 +141,10 @@
                  LEFT JOIN CH_SRV_ORGAN T5 ON T1.SRV_ORGAN_ID = T5.SRV_ORGAN_ID
         WHERE T1.DISAB_INFO_ID = #{disabInfoId}
           AND T1.SRV_ORGAN_ID = #{srvOrganId}
-
+<!--
         <if test="programStatus != null and programStatus != ''">
             AND T1.PROG_STATUS = #{programStatus}
-        </if>
+        </if>-->
     </select>
 
     <select id="getProgramEndProgram" resultType="com.hungraim.ltc.pojo.entity.serviceManage.ChSrvProgram">