Skip to content

L
long-tern-care-service
Commit 0d578960 authored by 蔡镇泽's avatar 蔡镇泽
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 2796198c cea1fd63
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 82 deletions
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskDetailVO.java
View file @ 0d578960
......@@ -11,6 +11,10 @@ import java.util.Date;
@Data
public class SrvTaskDetailVO {
/**
* 服务计划详情id
*/
private String taskDetailId;
/**
* 服务计划id
*/
private String srvTaskId;
......@@ -48,7 +52,7 @@ public class SrvTaskDetailVO {
/**
* 诊断疾病
*/
private String disease;
private String diseTypeS;
/**
* 接受服务地址
*/
......@@ -56,6 +60,7 @@ public class SrvTaskDetailVO {
private String acptSrvCity;
private String acptSrvArea;
private String acptSrvStreet;
private String acptSrvAddress;
/**
* 评定等级
*/
......@@ -64,7 +69,7 @@ public class SrvTaskDetailVO {
* 评定完成日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date evaluateRafinishTimetingType;
private Date finishTime;
/**
* 服务方式
*/
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SrvTaskVO.java
View file @ 0d578960
......@@ -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;
/**
* 服务方案起始日
*/
......
common/common-core/src/main/java/com/hungraim/ltc/pojo/vo/governance/SvrSendListVo.java
View file @ 0d578960
......@@ -60,11 +60,11 @@ public class SvrSendListVo {
/**
* 接收服务省市区
*/
private String acptProvincial;
private String acptCity;
private String acptArea;
private String acptStreet;
private String acptAddress;
private String acptSrvProvincial;
private String acptSrvCity;
private String acptSrvArea;
private String acptSrvStreet;
private String acptSrvAddress;
/**
* 服务方案数量
......
governance/src/main/java/com/hungraim/ltc/governance/controller/SrvTaskController.java
View file @ 0d578960
......@@ -8,6 +8,7 @@ import com.hungraim.ltc.util.Result;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
......@@ -34,42 +35,42 @@ 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);
}
/**
* 服务计划查询列表
*
* @param organId 护理机构id
* @param srvOrganId 护理机构id
* @param disableName 失能人员姓名
* @param disableTel 失能人员手机号码
* @param empName 护理人员姓名
......@@ -81,11 +82,11 @@ public class SrvTaskController {
*/
@RequestMapping("/getSrvTaskDetailList")
public Result<Page<SrvTaskDetailVO>> getSrvTaskDetailList(@RequestParam(defaultValue = "1") Integer pageNum, @RequestParam(defaultValue = "10") Integer pageSize,
Integer organId, String disableName, String disableTel,
String empName, String certifNum, String startTime, String endTime,
Integer srvOrganId, String disableName, String disableTel,
String empName, String certifNum, @DateTimeFormat(pattern = "yyyy-MM-dd") Date startTime,@DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime,
String status, String modeId) {
Page<SrvTaskDetailVO> page = new Page<>(pageNum, pageSize);
page = srvTaskService.getSrvTaskDetailList(page, organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
page = srvTaskService.getSrvTaskDetailList(page, srvOrganId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
return Result.success(page);
}
......
governance/src/main/java/com/hungraim/ltc/governance/dao/SrvTaskMapper.java
View file @ 0d578960
......@@ -8,17 +8,19 @@ 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.Date;
import java.util.List;
@Mapper
@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);
Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId);
List<SrvTaskInfoVO> getSrvTaskInfoList(String programId);
......
governance/src/main/java/com/hungraim/ltc/governance/service/SrvTaskService.java
View file @ 0d578960
......@@ -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);
......@@ -27,6 +27,6 @@ public interface SrvTaskService {
Page<OrganEmpVO> getSrvOrganEmpList(Page<OrganEmpVO> page, String organId, String name, String certiType, String certifNum);
Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, String startTime, String endTime, String status, String modeId);
Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId);
}
governance/src/main/java/com/hungraim/ltc/governance/service/impl/SrvTaskServiceImpl.java
View file @ 0d578960
......@@ -33,19 +33,18 @@ 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);
}
/**
* 服务计划查询列表
*
* @param organId 护理机构id
* @param disableName 失能人员姓名
* @param disableTel 失能人员手机号码
......@@ -57,7 +56,7 @@ public class SrvTaskServiceImpl implements SrvTaskService {
* @param modeId 服务方式
*/
@Override
public Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, String startTime, String endTime, String status, String modeId) {
public Page<SrvTaskDetailVO> getSrvTaskDetailList(Page<SrvTaskDetailVO> page, Integer organId, String disableName, String disableTel, String empName, String certifNum, Date startTime, Date endTime, String status, String modeId) {
return srvTaskMapper.getSrvTaskDetailList(page, organId, disableName, disableTel, empName, certifNum, startTime, endTime, status, modeId);
}
......
governance/src/main/resources/com/hungraim/ltc/governance/mapper/ChSrvSendMapper.xml
View file @ 0d578960
......@@ -41,11 +41,11 @@
T3.TEL realTel,
T3.BIRTHDAY birthday,
T3.GENDER gender,
T3.ACPT_PROVINCIAL acptProvincial,
T3.ACPT_CITY acptCity,
T3.ACPT_AREA acptArea,
T3.ACPT_STREET acptStreet,
T3.ACPT_ADDRESS acptAddress,
T3.ACPT_SRV_PROVINCIAL acptSrvProvincial,
T3.ACPT_SRV_CITY acptSrvCity,
T3.ACPT_SRV_AREA acptSrvArea,
T3.ACPT_SRV_STREET acptSrvStreet,
T3.ACPT_SRV_ADDRESS acptSrvAddress,
T1.STATUS sendStatus,
T1.EFF_TIME effTime,
(SELECT COUNT(0) FROM CH_SRV_PROGRAM T4 WHERE T1.SRV_ORGAN_ID = T4.SRV_ORGAN_ID AND T1.DISAB_INFO_ID = T4.DISAB_INFO_ID) programNum
......
governance/src/main/resources/com/hungraim/ltc/governance/mapper/SrvTaskMapper.xml
View file @ 0d578960
......@@ -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>
......@@ -67,6 +63,7 @@
<!--服务计划查询列表-->
<select id="getSrvTaskDetailList" resultType="com.hungraim.ltc.pojo.vo.governance.SrvTaskDetailVO">
select
detail.TASK_DETAIL_ID taskDetailId,
--服务计划id
task.srv_task_id srvTaskId,
--服务方案id
......@@ -74,9 +71,9 @@
--失能人员id
disable.disab_info_id disabInfoId,
--所在省市
(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,
--失能人员姓名
disable.real_name realName,
--手机号码
......@@ -86,12 +83,13 @@
--性别
disable.gender gender,
--诊断疾病
disable.disease disease,
disable.DISE_TYPE_S diseTypeS,
--接受服务地址
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_provincial = dis.DISTRICT_CODE) acptSrvProvincial,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_city = dis.DISTRICT_CODE) acptSrvCity,
(select DISTRICT_NAME from CH_FND_DISTRICT dis where disable.acpt_srv_area = dis.DISTRICT_CODE) acptSrvArea,
(select STREET_NAME from CH_FND_STREET street where disable.acpt_srv_street = street.STREET_CODE) acptSrvStreet,
disable.acpt_srv_provincial acptSrvProvincial,
disable.acpt_srv_city acptSrvCity,
disable.acpt_srv_area acptSrvArea,
disable.acpt_srv_street acptSrvStreet,
disable.ACPT_SRV_ADDRESS acptSrvAddress,
--评定等级
report.evaluate_rating_type evaluateRatingType,
--评定完成日期
......@@ -106,8 +104,8 @@
detail.SRV_DATE srvDate,
--任务状态
detail.status status
from ch_srv_task task--服务计划
left join ch_srv_task_detail detail on task.srv_task_id = detail.srv_task_id--服务计划详情
from ch_srv_task_detail detail--服务计划
left join ch_srv_task task on task.srv_task_id = detail.srv_task_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--评定报告
......@@ -133,11 +131,11 @@
<if test="certifNum != null and certifNum != ''">
and emp.certif_num = #{certifNum}
</if>
<if test="startTime != null and startTime != ''">
<if test="startTime != null">
and detail.SRV_DATE &gt;= #{startTime}
</if>
<if test="endTime != null and endTime != ''">
and detail.SRV_DATE &lt;;= #{endTime}
<if test="endTime != null">
and detail.SRV_DATE &lt;= #{endTime}
</if>
<if test="status != null and status != ''">
and task.status = #{status}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment