From b93b519a4918d258244165ed2424c274b6bfd281 Mon Sep 17 00:00:00 2001 From: zhuangyuanke Date: Sun, 8 Dec 2024 22:41:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=B1=BB=E5=9E=8B=20=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=AD=97=E6=AE=B5=20=E5=85=A5=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../signpatientmanageroute/SignPatientManageRoute.java | 4 ++++ .../SignPatientManageRouteNode.java | 6 +++--- .../impl/SignPatientManageRouteServiceImpl.java | 8 ++++++++ .../signpatientmanageroute/SignPatientManageRouteVO.java | 6 ++++++ .../SignPatientManageRouteMapper.xml | 8 ++++++++ 5 files changed, 29 insertions(+), 3 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java index 119247dd..92e58cf4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroute/SignPatientManageRoute.java @@ -135,5 +135,9 @@ public class SignPatientManageRoute extends BaseEntity { @Excel(name = "任务计划执行时间，格式：YYYY-MM-dd HH:mm:ss", width = 30, dateFormat = "YYYY-MM-dd HH:mm:ss") private LocalDateTime routePlanTime; + /** 导入患者主表ID */ + @ApiModelProperty(value = "导入患者主表ID") + @Excel(name = "导入患者主表ID") + private String importMainId; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java index f45be82e..4e118d82 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/signpatientmanageroutenode/SignPatientManageRouteNode.java @@ -56,9 +56,9 @@ public class SignPatientManageRouteNode extends BaseEntity { private String taskExcuteType; /** 任务计划执行时间，格式：YYYY-MM-dd HH:mm */ - @ApiModelProperty(value = "任务计划执行时间，格式：YYYY-MM-dd HH:mm") - @JsonFormat(pattern = "YYYY-MM-dd HH:mm") - @Excel(name = "任务计划执行时间，格式：YYYY-MM-dd HH:mm:ss", width = 30, dateFormat = "YYYY-MM-dd HH:mm:ss") + @ApiModelProperty(value = "任务计划执行时间，格式：yyyy-MM-dd HH:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + @Excel(name = "任务计划执行时间，格式：yyyy-MM-dd HH:mm", width = 30, dateFormat = "yyyy-MM-dd HH:mm") private LocalDateTime nodePlanTime; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 8b867fab..73fb4432 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -186,6 +186,8 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout signPatientManageRoute.setTaskCreateType(TaskCreateTypeEnum.MANUAL_CREATE.getInfo()); signPatientManageRoute.setCreateBy(SecurityUtils.getUsername()); signPatientManageRoute.setCreateTime(LocalDateTime.now()); + if(StringUtils.isNotBlank(signPatientManageRoute.getImportMainId())) + { signPatientManageRoute.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo());} int insertRoute = signPatientManageRouteMapper.insertSignPatientManageRoute(signPatientManageRoute); if (insertRoute < 0) { return AjaxResult.error("新增签约患者管理任务路径失败！请联系管理员！"); @@ -208,6 +210,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout //更新 签约记录的 审核状态为 未审核 zyk 20241204 SignPatientRecord signPatientRecord = new SignPatientRecord(); signPatientRecord.setRouteCheckStatus(RouteCheckStatusEnum.UNAUDITED.getInfo()); + signPatientRecord.setId(signPatientManageRoute.getSignPatientRecordId()); int updateRecord = signPatientRecordMapper.updateByPrimaryKeySelective(signPatientRecord); if (updateRecord < 0) { @@ -995,6 +998,11 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout */ private void extracted(SignPatientManageRouteVO signPatientManageRoute, List signPatientManageRouteNodes, SignPatientManageRouteNode routeNode) { SignPatientManageRouteNode signPatientManageRouteNode = new SignPatientManageRouteNode(); + //如果 导入患者主表id不为空，则认为此任务是批量执行类型 + if(StringUtils.isNotBlank(signPatientManageRoute.getImportMainId())) + signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.BATCH_TASK.getInfo()); + else + signPatientManageRouteNode.setTaskExcuteType(TaskExcuteTypeEnum.ACTUAL_TIME_TASK.getInfo()); //电话外呼 if (Objects.nonNull(routeNode) && TaskNodeTypeEnum.PHONE_OUTBOUND.getInfo().equals(routeNode.getTaskNodeType())) { signPatientManageRouteNode.setPhonePushSign(Objects.isNull(routeNode.getPhonePushSign()) ? null : routeNode.getPhonePushSign()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/SignPatientManageRouteVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/SignPatientManageRouteVO.java index 77189e63..d34463c7 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/SignPatientManageRouteVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/SignPatientManageRouteVO.java @@ -1,8 +1,10 @@ package com.xinelu.manage.vo.signpatientmanageroute; +import com.xinelu.common.annotation.Excel; import com.xinelu.manage.domain.signpatientmanageroute.SignPatientManageRoute; import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode; import com.xinelu.manage.vo.signroutetriggercondition.SignRouteTriggerConditionVO; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +20,10 @@ import java.util.List; @EqualsAndHashCode(callSuper = true) public class SignPatientManageRouteVO extends SignPatientManageRoute { + /** 批量导入表(patient_info_import_main表)ID */ + @ApiModelProperty(value = "批量导入表ID") + private String importMainId; + /** * 患者管理任务路径id */ diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml index d87df42e..0d5f570b 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml @@ -494,6 +494,10 @@ route_remark, + task_excute_type, + + import_main_id, + route_plan_time, create_by, @@ -542,6 +546,10 @@ #{routeRemark}, + #{taskExcuteType}, + + #{importMainId}, + #{route_plan_time}, #{createBy},