From 9a1ead4f4867804af3bcd6fb92f3523e73c07f40 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 3 Jun 2024 09:17:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=85=A8=E5=A2=9E=E5=85=A8=E5=88=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialdiseasenode/SpecialDiseaseNodeMapper.java | 3 +++ .../impl/SpecialDiseaseNodeServiceImpl.java | 8 +++++++- .../specialdiseasenode/SpecialDiseaseNodeMapper.xml | 8 ++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java index ba8be244..94d29487 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseasenode/SpecialDiseaseNodeMapper.java @@ -95,4 +95,7 @@ public interface SpecialDiseaseNodeMapper { * @return 专病路径-管理节点信息 */ List selectRouteNodeByRouteId(Long specialDiseaseRouteId); + + + List selectSpecialDiseaseRouteIds(Long specialDiseaseRouteId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java index 025022ce..4ef867ac 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/impl/SpecialDiseaseNodeServiceImpl.java @@ -121,6 +121,7 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService return AjaxResult.error("已发布过的专病路径不能修改!"); } } + List longs = specialDiseaseNodeMapper.selectSpecialDiseaseRouteIds(specialDiseaseNode.getSpecialDiseaseRouteId()); SpecialDiseaseRoute specialDiseaseRoute = new SpecialDiseaseRoute(); BeanUtils.copyBeanProp(specialDiseaseRoute, specialDiseaseNode); specialDiseaseRoute.setUpdateTime(LocalDateTime.now()); @@ -139,7 +140,8 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService if (CollectionUtils.isEmpty(specialDiseaseNode.getSpecialDiseaseNodeList())) { return AjaxResult.success(); } - ArrayList specialDiseaseNodeVOS = new ArrayList<>(); + List specialDiseaseNodeVOS = new ArrayList<>(); + int i = 0; for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) { if (StringUtils.isNotBlank(diseaseNode.getRouteNodeName()) && Objects.nonNull(diseaseNode.getRouteNodeDay()) && StringUtils.isNotBlank(diseaseNode.getTaskType()) && StringUtils.isNotBlank(diseaseNode.getTaskSubdivision()) && StringUtils.isNotBlank(diseaseNode.getTaskStatus())) { diseaseNode.setRouteId(specialDiseaseRoute.getId()); @@ -151,6 +153,10 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService } diseaseNode.setUpdateTime(LocalDateTime.now()); diseaseNode.setUpdateBy(SecurityUtils.getUsername()); + if (CollectionUtils.isNotEmpty(longs) && (i < longs.size()) && Objects.nonNull(longs.get(i))) { + diseaseNode.setId(longs.get(i)); + i++; + } specialDiseaseNodeVOS.add(diseaseNode); } } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml index 0597e067..614dae12 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml @@ -652,6 +652,7 @@ insert into special_disease_node( + id, route_id, route_name, route_node_name, @@ -698,6 +699,7 @@ ) values ( + #{specialDiseaseNodeList.id}, #{specialDiseaseNodeList.routeId}, #{specialDiseaseNodeList.routeName}, #{specialDiseaseNodeList.routeNodeName}, @@ -849,4 +851,10 @@ where sdr.id = #{specialDiseaseRouteId} and sdn.node_content like '%data-w-e-type%' and sdn.route_check_status = 'AGREE' + + \ No newline at end of file