xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

Browse Source
This commit is contained in:
haown 2024-07-11 17:39:47 +08:00
commit ff51802fb5
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java
View File

@ -161,8 +161,8 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
if (diseaseNode.getRouteNodeDay() == null) {
throw new ServiceException("请输入节点时间");
}
if (StringUtils.isBlank(diseaseNode.getTaskType()) || StringUtils.isBlank(diseaseNode.getTaskSubdivision()) || StringUtils.isBlank(diseaseNode.getTaskStatus())) {
throw new ServiceException("任务类型、任务细分、任务状态不能为空");
if (StringUtils.isBlank(diseaseNode.getTaskType()) || StringUtils.isBlank(diseaseNode.getTaskSubdivision())) {
throw new ServiceException("任务类型、任务细分不能为空");
}
diseaseNode.setRouteId(specialDiseaseRoute.getId());
diseaseNode.setRouteName(specialDiseaseNode.getRouteName());

8
postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
View File

@ -450,7 +450,13 @@
select dt.id,
dt.department_name,
dt.department_code,
( SELECT COUNT(1) FROM special_disease_route a WHERE a.department_id = dt.id and (a.parent_route_id = 0 or a.parent_route_id is null)) AS countNum
( SELECT COUNT(1)
FROM special_disease_route a
WHERE a.department_id = dt.id and (a.parent_route_id = 0 or a.parent_route_id is null)
<if test="releaseStatus != null and releaseStatus != ''">
AND a.release_status= #{releaseStatus}
</if>
) AS countNum
from department dt left join special_disease_route sdr on dt.id = sdr.department_id
left join special_disease_route_package sdrp ON sdr.id = sdrp.route_id
<where>

2
postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java
View File

@ -47,4 +47,6 @@ public class MessageTabulationVO {
* 是否随访标记 0:否 1:是
*/
private Integer sign;
private String messageStatus;
}

9
postdischarge-mobile/src/main/resources/mapper/homepage/HomePageMapper.xml
View File

@ -12,22 +12,23 @@
spmr.route_name manageRouteName,
spmrn.id manageRouteNodeId,
spmrn.route_node_name manageRouteNodeName,
spmrn.task_type,
spmrn.task_node_type,
spmrn.route_node_name,
IFNULL( spmrn.route_node_day,0) routeNodeDay,
pi.discharge_time,
pter.id patientTaskExecuteRecordId,
IF(pter.id is NULL,0,1) sign,
CASE
WHEN spmrn.task_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
WHEN spmrn.task_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_id
WHEN spmrn.task_node_type = 'PHONE_OUTBOUND' THEN spmrn.phone_id
WHEN spmrn.task_node_type = 'ARTIFICIAL_FOLLOW_UP' THEN spmrn.follow_template_id
END AS templateId
FROM sign_patient_manage_route_node spmrn
LEFT JOIN sign_patient_manage_route spmr ON spmrn.manage_route_id = spmr.id
LEFT JOIN patient_info pi ON spmr.id = pi.id
LEFT JOIN patient_task_execute_record pter ON pter.manage_route_node_id = spmrn.id
<where>
spmrn.task_type in('PHONE_OUTBOUND','ARTIFICIAL_FOLLOW_UP')
spmrn.task_node_type in('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE')
and spmrn.phone_dial_method = 'COMMON'
<if test="residentId != null ">
and pi.resident_id = #{residentId}
</if>