diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java index 7d01d3ef..a31e4de9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java @@ -2,7 +2,7 @@ package com.xinelu.manage.dto.signpatientmanageroutenode; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; -import java.time.LocalDateTime; +import java.time.LocalDate; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -32,12 +32,12 @@ public class PatientTaskDto { /** 出院时间开始,格式:yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "出院时间开始,格式:yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDateTime dischargeTimeStart; + private LocalDate dischargeTimeStart; /** 出院时间结束,格式:yyyy-MM-dd HH:mm:ss */ @ApiModelProperty(value = "出院时间结束,格式:yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDateTime dischargeTimeEnd; + private LocalDate dischargeTimeEnd; /** 所属医院id */ @ApiModelProperty(value = "所属医院id") @@ -71,4 +71,7 @@ public class PatientTaskDto { @ApiModelProperty(value = "任务类型,电话外呼:PHONE_OUTBOUND,问卷量表:QUESTIONNAIRE_SCALE,宣教文章:PROPAGANDA_ARTICLE,文字提醒:TEXT_REMIND,人工随访:ARTIFICIAL_FOLLOW_UP") private String taskType; + @ApiModelProperty(value = "患者来源,微信小程序:WE_CHAT_APPLET,微信公众号:WE_CHAT_OFFICIAL_ACCOUNT,管理端:MANAGE_END") + private String patientSource; + } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index 1700557d..8afe5a36 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -110,9 +110,10 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage List allNodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto); // 根据任务id进行分组 Map> groupByRoute = allNodeList.stream().collect(Collectors.groupingBy(SignPatientManageRouteNode::getManageRouteId)); - List nodeInfoVoList = new ArrayList<>(); + SpecialDiseaseRouteVO specialDiseaseRoute = null; for (Long manageRouteId : groupByRoute.keySet()) { + List nodeInfoVoList = new ArrayList<>(); List nodeList = groupByRoute.get(manageRouteId); SignPatientManageRoute manageRoute = signRouteMapper.selectSignPatientManageRouteById(manageRouteId); // 判断手动创建或自动生成 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 8c953ff1..e5040168 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -681,6 +681,12 @@ and date_format(patient.discharge_time,'%y%m%d') <= date_format(#{dischargeTimeEnd},'%y%m%d') + + and route.task_create_type = #{taskCreateType} + + + and patient.patient_source like concat('%', #{patientSource}, '%') + group by patient.hospital_agency_id, patient.id