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

Merge remote-tracking branch 'origin/0418_小程序开发' into dev

Browse Source
This commit is contained in:
haown 2024-04-19 09:47:15 +08:00
commit 05e09eff4e
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
postdischarge-manage/src/main/java/com/xinelu/manage/dto/signpatientmanageroutenode/PatientTaskDto.java
View File

@ -2,7 +2,7 @@ package com.xinelu.manage.dto.signpatientmanageroutenode;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import java.time.LocalDateTime; import java.time.LocalDate;
import lombok.Data; import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
@ -32,12 +32,12 @@ public class PatientTaskDto {
/** 出院时间开始，格式：yyyy-MM-dd HH:mm:ss */ /** 出院时间开始，格式：yyyy-MM-dd HH:mm:ss */
@ApiModelProperty(value = "出院时间开始，格式：yyyy-MM-dd") @ApiModelProperty(value = "出院时间开始，格式：yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dischargeTimeStart; private LocalDate dischargeTimeStart;
/** 出院时间结束，格式：yyyy-MM-dd HH:mm:ss */ /** 出院时间结束，格式：yyyy-MM-dd HH:mm:ss */
@ApiModelProperty(value = "出院时间结束，格式：yyyy-MM-dd") @ApiModelProperty(value = "出院时间结束，格式：yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDateTime dischargeTimeEnd; private LocalDate dischargeTimeEnd;
/** 所属医院id */ /** 所属医院id */
@ApiModelProperty(value = "所属医院id") @ApiModelProperty(value = "所属医院id")
@ -71,4 +71,7 @@ public class PatientTaskDto {
@ApiModelProperty(value = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP") @ApiModelProperty(value = "任务类型，电话外呼：PHONE_OUTBOUND，问卷量表：QUESTIONNAIRE_SCALE，宣教文章：PROPAGANDA_ARTICLE，文字提醒：TEXT_REMIND，人工随访：ARTIFICIAL_FOLLOW_UP")
private String taskType; private String taskType;
@ApiModelProperty(value = "患者来源，微信小程序：WE_CHAT_APPLET，微信公众号：WE_CHAT_OFFICIAL_ACCOUNT，管理端：MANAGE_END")
private String patientSource;
} }

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java
View File

@ -110,9 +110,10 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage
List<SignPatientManageRouteNode> allNodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto); List<SignPatientManageRouteNode> allNodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto);
// 根据任务id进行分组 // 根据任务id进行分组
Map<Long, List<SignPatientManageRouteNode>> groupByRoute = allNodeList.stream().collect(Collectors.groupingBy(SignPatientManageRouteNode::getManageRouteId)); Map<Long, List<SignPatientManageRouteNode>> groupByRoute = allNodeList.stream().collect(Collectors.groupingBy(SignPatientManageRouteNode::getManageRouteId));
List<SignPatientManageRouteNodeInfoVo> nodeInfoVoList = new ArrayList<>();
SpecialDiseaseRouteVO specialDiseaseRoute = null; SpecialDiseaseRouteVO specialDiseaseRoute = null;
for (Long manageRouteId : groupByRoute.keySet()) { for (Long manageRouteId : groupByRoute.keySet()) {
List<SignPatientManageRouteNodeInfoVo> nodeInfoVoList = new ArrayList<>();
List<SignPatientManageRouteNode> nodeList = groupByRoute.get(manageRouteId); List<SignPatientManageRouteNode> nodeList = groupByRoute.get(manageRouteId);
SignPatientManageRoute manageRoute = signRouteMapper.selectSignPatientManageRouteById(manageRouteId); SignPatientManageRoute manageRoute = signRouteMapper.selectSignPatientManageRouteById(manageRouteId);
// 判断手动创建或自动生成 // 判断手动创建或自动生成

6
postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
View File

@ -681,6 +681,12 @@
<if test="dischargeTimeEnd != null "> <if test="dischargeTimeEnd != null ">
and date_format(patient.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd},'%y%m%d') and date_format(patient.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd},'%y%m%d')
</if> </if>
<if test="taskCreateType != null ">
and route.task_create_type = #{taskCreateType}
</if>
<if test="patientSource != null ">
and patient.patient_source like concat('%', #{patientSource}, '%')
</if>
</where> </where>
group by patient.hospital_agency_id, patient.id group by patient.hospital_agency_id, patient.id
</select> </select>