服务计划列表

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

@@ -12,51 +12,68 @@ import java.util.Date;
  */
 @Data
 public class SrvTaskVO extends PageInfo implements Serializable {
-    //id
-    private Integer sendId;
-    //失能人员ID
-    private Integer disableInfoId;
-    //适用机构
-    private String organName;
-    //机构idsrv
-    private Integer srvOrganId;
-    //机构代码
-    private String organId;
-    //所在省市
-    private String provincial;
-    private String city;
-    private String area;
-    //失能人员姓名
-    private String name;
-    //失能人员身份证号码
-    private String certiCode;
-    //待遇类型
-    private String treatmentTyte;
-    //联系人姓名
-    private String opername;
-    //年龄
+    /**
+     * 所在省市
+     */
+    private String districtProvincial;
+    private String districtCity;
+    private String districtArea;
+    /**
+     * 失能人员姓名
+     */
+    private String realName;
+    /**
+     * 手机号码
+     */
+    private String tel;
+    /**
+     * 年龄
+     */
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date birthday;
-    //性别
+    /**
+     * 性别
+     */
     private String gender;
-    //失能人员身份证号码
-    private String opercertiCode;
-    //失能人员手机号
-    private String tel;
-    //失能人员固话
-    private String fixedtel;
-    //申请服务方式
-    private String srvModeName;
-    //诊断疾病
+    /**
+     * 诊断疾病
+     */
     private String disease;
-    private String diseTypeS;
-    //申请时间
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    /**
+     * 接受服务地址
+     */
+    private String acptSrvProvincial;
+    private String acptSrvCity;
+    private String acptSrvArea;
+    private String acptSrvRoadType;
+    /**
+     * 评定等级
+     */
+    private String evaluateRatingType;
+    /**
+     * 评定完成日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date evaluateRafinishTimetingType;
+    /**
+     * 服务方式
+     */
+    private String srvModeName;
+    /**
+     * 护理机构名称
+     */
+    private String srvOrganName;
+    /**
+     * 护理服务人员
+     */
+    private String empName;
+    /**
+     * 任务时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date effTime;
-    //申请来源 网厅：0，核心：1，手机端:2,待遇申请:3
-    private String datafrom;
-    //审核状态
-    private String applyStatus;
-    //分配状态
+    /**
+     * 任务状态
+     */
     private String status;
 }

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

 package com.hungraim.ltc.governance.controller;
 
 import com.hungraim.ltc.governance.service.SrvTaskService;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
 import com.hungraim.ltc.util.Result;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,10 +23,23 @@ public class SrvTaskController {
 
     /**
      * 服务计划列表
+     *
+     * @param organId     护理机构id
+     * @param disableName 失能人员姓名
+     * @param disableTel  失能人员手机号码
+     * @param empName     护理人员姓名
+     * @param certifNum   护理人员证件号码
+     * @param startTime   服务计划开始时间
+     * @param endTime     服务计划结束时间
+     * @param endTime     服务计划结束时间
+     * @param status      任务状态
+     * @param modeId      服务方式
      */
     @RequestMapping("/getSrvTaskList")
-    public Result<List<ChSrvTask>> getSrvTaskList() {
-        List<ChSrvTask> tasks = srvTaskService.getSrvTaskList();
+    public Result<List<SrvTaskVO>> getSrvTaskList(Integer organId, String disableName, String disableTel,
+                                                  String empName, String certifNum, String startTime, String endTime,
+                                                  String status, String modeId) {
+        List<SrvTaskVO> tasks = srvTaskService.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
         return Result.success(tasks);
     }
 }

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

@@ -2,6 +2,7 @@ package com.hungraim.ltc.governance.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
@@ -10,5 +11,9 @@ import java.util.List;
 @Mapper
 @Repository
 public interface SrvTaskMapper extends BaseMapper<ChSrvTask> {
-    List<ChSrvTask> getSrvTaskList();
+
+    List<SrvTaskVO> getSrvTaskList(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

 package com.hungraim.ltc.governance.service;
 
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -12,5 +12,7 @@ import java.util.List;
  */
 @Service
 public interface SrvTaskService {
-    List<ChSrvTask> getSrvTaskList();
+    List<SrvTaskVO> getSrvTaskList(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/impl/SrvTaskServiceImpl.java

@@ -2,7 +2,7 @@ package com.hungraim.ltc.governance.service.impl;
 
 import com.hungraim.ltc.governance.dao.SrvTaskMapper;
 import com.hungraim.ltc.governance.service.SrvTaskService;
-import com.hungraim.ltc.pojo.entity.serviceManage.ChSrvTask;
+import com.hungraim.ltc.pojo.vo.governance.SrvTaskVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -16,8 +16,24 @@ public class SrvTaskServiceImpl implements SrvTaskService {
     @Autowired
     private SrvTaskMapper srvTaskMapper;
 
+    /**
+     * 服务计划列表
+     *
+     * @param organId     护理机构id
+     * @param disableName 失能人员姓名
+     * @param disableTel  失能人员手机号码
+     * @param empName     护理人员姓名
+     * @param certifNum   护理人员证件号码
+     * @param startTime   服务计划开始时间
+     * @param endTime     服务计划结束时间
+     * @param endTime     服务计划结束时间
+     * @param status      任务状态
+     * @param modeId      服务方式
+     */
     @Override
-    public List<ChSrvTask> getSrvTaskList() {
-        return srvTaskMapper.getSrvTaskList();
+    public List<SrvTaskVO> getSrvTaskList(Integer organId, String disableName, String disableTel,
+                                          String empName, String certifNum, String startTime, String endTime,
+                                          String status, String modeId) {
+        return srvTaskMapper.getSrvTaskList(organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
     }
 }

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.hungraim.ltc.governance.dao.SrvTaskMapper">
+
     <!--查询服务分配信息列表-->
     <select id="getSrvTaskList" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskVO">
         select
         --所在省市
-            disable.DISTRICT_PROVINCIAL,
-            disable.DISTRICT_CITY,
-            disable.DISTRICT_AREA,
+        disable.district_provincial districtProvincial,
+        disable.district_city districtCity,
+        disable.district_area districtArea,
         --失能人员姓名
-            disable.REAL_NAME,
+        disable.real_name realName,
         --手机号码
-            disable.TEL,
+        disable.tel tel,
         --年龄
-            disable.BIRTHDAY,
+        disable.birthday birthday,
         --性别
-            disable.GENDER,
+        disable.gender gender,
         --诊断疾病
-            disable.DISEASE,
+        disable.disease disease,
         --接受服务地址
-            disable.acpt_srv_PROVINCIAL,
-            disable.acpt_srv_CITY,
-            disable.acpt_srv_AREA,
-            disable.acpt_srv_road_type,
+        disable.acpt_srv_provincial acptSrvProvincial,
+        disable.acpt_srv_city acptSrvCity,
+        disable.acpt_srv_area acptSrvArea,
+        disable.acpt_srv_road_type acptSrvRoadType,
         --评定等级
+        report.evaluate_rating_type evaluateRatingType,
         --评定完成日期
+        aprtask.finish_time finishTime,
         --服务方式
+        mode1.srv_mode_name srvModeName,
         --护理机构名称
+        organ.srv_organ_name srvOrganName,
         --护理服务人员
+        emp.emp_name empName,
         --任务时间
+        task.eff_time effTime,
         --任务状态
-            task.STATUS
-        from CH_SRV_TASK task
-                 left join CH_DISABLE_INFO disable on task.DISAB_INFO_ID = disable.DISAB_INFO_ID
+        task.status status
+        from ch_srv_task task--服务计划
+        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_program program on task.program_id = program.program_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--护理人员
+        <where>
+            <if test="organId != null">
+                and organ.SRV_ORGAN_ID = #{organId}
+            </if>
+            <if test="disableName != null and disableName != ''">
+                and disable.real_name = #{disableName}
+            </if>
+            <if test="disableTel != null and disableTel != ''">
+                and disable.tel = #{disableTel}
+            </if>
+            <if test="empName != null and empName != ''">
+                and emp.emp_name = #{empName}
+            </if>
+            <if test="certifNum != null and certifNum != ''">
+                and emp.certif_num = #{certifNum}
+            </if>
+            <if test="startTime != null and startTime != ''">
+                and task.eff_time &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and task.eff_time &lt;= #{endTime}
+            </if>
+            <if test="status != null and status != ''">
+                and task.status = #{status}
+            </if>
+            <if test="modeId != null and modeId != ''">
+                and mode1.srv_mode_name = #{modeId}
+            </if>
+        </where>
     </select>
+
 </mapper>
\ No newline at end of file