服务计划制定列表接口调试修改

common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskVO.java

@@ -29,6 +29,11 @@ public class SrvTaskVO {
      */
     private String disabInfoId;
     /**
+     * 失能人员生日
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date birthday;
+    /**
      * 失能人员姓名
      */
     private String realName;
@@ -44,6 +49,8 @@ public class SrvTaskVO {
      * 诊断疾病
      */
     private String disease;
+    private Long diseTypeF;
+    private Long diseTypeS;
     /**
      * 失能等级
      */
@@ -52,16 +59,12 @@ public class SrvTaskVO {
      * 评定完成日期
      */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date evaluateRafinishTimetingType;
-    /**
-     * 任务时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
-    private Date effTime;
+    private Date finishTime;
+
     /**
      * 服务方案状态
      */
-    private String progStatus;
+    private Integer progStatus;
     /**
      * 服务方案起始日
      */

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

@@ -34,35 +34,35 @@ public class SrvTaskController {
      *
      * @param pageNum   页码
      * @param pageSize  每页大小
-     * @param organId   护理服务机构id
+     * @param srvOrganId   护理服务机构id
      * @param name      护理人员姓名
      * @param certiType 护理人员证件类型
      * @param certifNum 护理人员证件号码
      */
     @RequestMapping("/getSrvOrganEmpList")
     public Result<Page<OrganEmpVO>> getSrvOrganEmpList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
-                                                       String organId, String name, String certiType, String certifNum) {
-        if (StringUtils.isBlank(organId)) {
+                                                       String srvOrganId, String name, String certiType, String certifNum) {
+        if (StringUtils.isBlank(srvOrganId)) {
             return Result.failed("参数异常!");
         }
         Page<OrganEmpVO> page = new Page<>(pageNum, pageSize);
-        page = srvTaskService.getSrvOrganEmpList(page, organId, name, certiType, certifNum);
+        page = srvTaskService.getSrvOrganEmpList(page, srvOrganId, name, certiType, certifNum);
         return Result.success(page);
     }
 
     /**
      * 服务计划制定列表
      *
-     * @param organId     护理服务机构id
+     * @param srvOrganId  护理服务机构id
      * @param disableName 失能人员姓名
      * @param disableTel  失能人员手机号码
-     * @param status      服务计划状态
+     * @param taskStatus  服务计划状态
      */
     @RequestMapping("/getSrvTaskList")
     public Result<Page<SrvTaskVO>> getSrvTaskList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
-                                                  Integer organId, String disableName, String disableTel, String status) {
+                                                  Long srvOrganId, String disableName, String disableTel, String taskStatus) {
         Page<SrvTaskVO> page = new Page<>(pageNum, pageSize);
-        page = srvTaskService.getSrvTaskList(page, organId, disableName, disableTel, status);
+        page = srvTaskService.getSrvTaskList(page, srvOrganId, disableName, disableTel, taskStatus);
         return Result.success(page);
     }
 

governance/src/main/java/com/hungraim/ltc/governance/dao/SrvTaskMapper.java

@@ -8,6 +8,7 @@ import com.hungraim.ltc.pojo.vo.governance.SrvTaskDetailVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvTaskInfoVO;
 import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
@@ -16,7 +17,7 @@ import java.util.List;
 @Repository
 public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
 
-    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel, String status);
+    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, @Param("srvOrganId") Long srvOrganId,@Param("disableName") String disableName,@Param("disableTel") String disableTel,@Param("taskStatus") String taskStatus);
 
     Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, String startTime, String endTime, String status, String modeId);
 

governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java

@@ -17,7 +17,7 @@ import java.util.List;
  */
 @Service
 public interface SrvTaskService {
-    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel, String status);
+    Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Long srvOrganId, String disableName, String disableTel, String taskStatus);
 
     List<SrvTaskInfoVO> getSrvTaskInfoList(String programId);
 

governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java

@@ -33,14 +33,14 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     /**
      * 服务计划制定列表
      *
-     * @param organId     护理服务机构id
+     * @param srvOrganId     护理服务机构id
      * @param disableName 失能人员姓名
      * @param disableTel  失能人员手机号码
-     * @param status      服务计划状态
+     * @param taskStatus      服务计划状态
      */
     @Override
-    public Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Integer organId, String disableName, String disableTel, String status) {
-        return srvTaskMapper.getSrvTaskList(page, organId, disableName, disableTel, status);
+    public Page<SrvTaskVO> getSrvTaskList(Page<SrvTaskVO> page, Long srvOrganId, String disableName, String disableTel, String taskStatus) {
+        return srvTaskMapper.getSrvTaskList(page, srvOrganId, disableName, disableTel, taskStatus);
     }
 
     /**

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

@@ -4,15 +4,12 @@
 
     <!--服务计划制定列表-->
     <select id="getSrvTaskList" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskVO">
-        select
-        --服务计划id
-        task.srv_task_id srvTaskId,
-        --服务方案id
-        task.program_id programId,
+        SELECT--服务方案id
+        program.program_id programId,
         --所在省市
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.district_provincial = dis.DISTRICT_CODE) districtProvincial,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.district_city = dis.DISTRICT_CODE) districtCity,
-        (select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.DISTRICT_AREA = dis.DISTRICT_CODE) districtArea,
+        disable.district_provincial districtProvincial,
+        disable.district_city districtCity,
+        disable.DISTRICT_AREA districtArea,
         --失能人员id
         disable.disab_info_id disabInfoId,
         --失能人员姓名
@@ -22,13 +19,13 @@
         --性别
         disable.gender gender,
         --诊断疾病
-        disable.disease disease,
+        disable.DISE_TYPE_F diseTypeF,
+        disable.DISE_TYPE_S diseTypeS,
+        disable.BIRTHDAY birthday,
         --失能等级
         level1.disable_level_name disableLevelName,
         --评定完成日期
         aprtask.finish_time finishTime,
-        --任务时间
-        task.eff_time effTime,
         --服务方案状态
         program.prog_status progStatus,
         --服务方案起始日
@@ -36,30 +33,29 @@
         --服务方案终止日
         program.PROGRAM_EDN_DATE programEdnDate,
         --计划状态
-        (select count(*) from ch_srv_task where program_id = program.PROGRAM_ID) taskCount
-        from ch_srv_program program--服务方案
-        left join ch_srv_task task on program.program_id = task.program_id--服务计划
-        left join ch_disable_info disable on task.disab_info_id = disable.disab_info_id--失能人员
-        left join ch_apr_task aprtask on disable.last_task_id = aprtask.task_id--评定任务
-        left join ch_apr_report report on aprtask.task_id = report.task_id--评定报告
-        left join ch_srv_organ organ on program.srv_organ_id = organ.srv_organ_id--服务机构
-        left join ch_fnd_srv_mode mode1 on program.srv_mode_id = mode1.srv_mode_id--服务方式
-        left join ch_srv_organ_emp emp on task.srv_emp_id = emp.emp_id--护理人员
-        left join ch_cfg_srv_disable_level level1 on report.disable_level_id = level1.disable_level_id--失能等级
-        --服务任务明细
-        left join ch_srv_task_detail detail on task.SRV_TASK_ID = detail.TASK_DETAIL_ID
+        ( SELECT count( * ) FROM ch_srv_task WHERE program_id = program.PROGRAM_ID ) taskCount
+        FROM
+        ch_srv_program program --服务方案
+        LEFT JOIN ch_disable_info disable ON program.disab_info_id = disable.disab_info_id --失能人员
+        LEFT JOIN ch_apr_task aprtask ON disable.last_task_id = aprtask.task_id --评定任务
+        LEFT JOIN ch_apr_report report ON aprtask.task_id = report.task_id --评定报告
+        LEFT JOIN ch_srv_organ organ ON program.srv_organ_id = organ.srv_organ_id --服务机构
+        LEFT JOIN ch_cfg_srv_disable_level level1 ON report.disable_level_id = level1.disable_level_id --失能等级
         <where>
-            <if test="organId != null">
-                and organ.SRV_ORGAN_ID = #{organId}
+            <if test="srvOrganId != null">
+                and organ.SRV_ORGAN_ID = #{srvOrganId}
             </if>
             <if test="disableName != null and disableName != ''">
-                and disable.real_name = #{disableName}
+                and disable.real_name LIKE CONCAT('%',CONCAT( #{disableName} ,'%'))
             </if>
             <if test="disableTel != null and disableTel != ''">
                 and disable.tel = #{disableTel}
             </if>
-            <if test="status != null and status != ''">
-                and task.status = #{status}
+            <if test="taskStatus != null and taskStatus == '1'">
+                and ( SELECT count( 0 ) FROM ch_srv_task WHERE program_id = program.PROGRAM_ID ) = 0
+            </if>
+            <if test="taskStatus != null and taskStatus == '2'">
+                and ( SELECT count( 0 ) FROM ch_srv_task WHERE program_id = program.PROGRAM_ID ) > 0
             </if>
         </where>
     </select>