From 57a73624f24018b827207fc2d02fb9a8b4dc06fc Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Mon, 8 Apr 2024 15:15:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=93=E7=97=85=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/enums/RouteCheckStatusEnum.java | 25 ++++---
.../SpecialDiseaseNodeController.java | 11 +++
.../ISpecialDiseaseNodeService.java | 8 +++
.../impl/SpecialDiseaseNodeServiceImpl.java | 19 +++--
.../SpecialDiseaseNodeVO.java | 7 +-
.../SpecialDiseaseNodeMapper.xml | 71 +++++++++++++++++--
6 files changed, 121 insertions(+), 20 deletions(-)
diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/RouteCheckStatusEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/RouteCheckStatusEnum.java
index f706c9c1..a3151660 100644
--- a/postdischarge-common/src/main/java/com/xinelu/common/enums/RouteCheckStatusEnum.java
+++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/RouteCheckStatusEnum.java
@@ -1,19 +1,28 @@
package com.xinelu.common.enums;
+import lombok.Getter;
+
/**
* 节点审核状态枚举类
*
* @author haown
* @date 2024-04-01
*/
+@Getter
public enum RouteCheckStatusEnum {
- /**
- * 同意
- */
- AGREE,
+ /**
+ * 同意
+ */
+ AGREE("AGREE"),
- /**
- * 不同意
- */
- DISAGREE
+ /**
+ * 不同意
+ */
+ DISAGREE("DISAGREE"),
+ ;
+ final private String info;
+
+ RouteCheckStatusEnum(String info) {
+ this.info = info;
+ }
}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java
index 818a91bf..33ff1255 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseasenode/SpecialDiseaseNodeController.java
@@ -101,4 +101,15 @@ public class SpecialDiseaseNodeController extends BaseController {
}
return specialDiseaseNodeService.selectSpecialDisease(specialDiseaseRouteId);
}
+
+ /**
+ * 修改节点信息状态
+ */
+ @PostMapping("/updateRouteCheckStatus")
+ public AjaxResult updateRouteCheckStatus(@RequestBody SpecialDiseaseNode specialDiseaseNode) {
+ if (Objects.isNull(specialDiseaseNode)) {
+ return AjaxResult.error("请选择需要修改的节点信息！");
+ }
+ return specialDiseaseNodeService.updateRouteCheckStatus(specialDiseaseNode);
+ }
}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java
index da781192..b4f06545 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseasenode/ISpecialDiseaseNodeService.java
@@ -68,4 +68,12 @@ public interface ISpecialDiseaseNodeService {
* @return AjaxResult
*/
AjaxResult selectSpecialDisease(Long specialDiseaseRouteId);
+
+ /**
+ * 修改节点信息状态
+ *
+ * @param specialDiseaseNode 节点信息
+ * @return AjaxResult
+ */
+ AjaxResult updateRouteCheckStatus(SpecialDiseaseNode specialDiseaseNode);
}
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 832ca6df..73876c1e 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
@@ -1,6 +1,7 @@
package com.xinelu.manage.service.specialdiseasenode.impl;
import com.xinelu.common.core.domain.AjaxResult;
+import com.xinelu.common.enums.RouteCheckStatusEnum;
import com.xinelu.common.exception.ServiceException;
import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.bean.BeanUtils;
@@ -8,8 +9,8 @@ import com.xinelu.manage.domain.specialdiseasenode.SpecialDiseaseNode;
import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper;
import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper;
-import com.xinelu.manage.mapper.specialdiseasetriggercondition.SpecialDiseaseTriggerConditionMapper;
import com.xinelu.manage.service.specialdiseasenode.ISpecialDiseaseNodeService;
+import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeVO;
import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -32,8 +33,6 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
private SpecialDiseaseNodeMapper specialDiseaseNodeMapper;
@Resource
private SpecialDiseaseRouteMapper specialDiseaseRouteMapper;
- @Resource
- private SpecialDiseaseTriggerConditionMapper triggerConditionMapper;
/**
@@ -111,11 +110,12 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
log.info("删除管理节点信息失败");
throw new ServiceException("修改专病路径管理节点信息失败");
}
- for (SpecialDiseaseNode diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) {
+ for (SpecialDiseaseNodeVO diseaseNode : specialDiseaseNode.getSpecialDiseaseNodeList()) {
diseaseNode.setRouteId(specialDiseaseRoute.getId());
diseaseNode.setRouteName(specialDiseaseNode.getRouteName());
diseaseNode.setUpdateTime(LocalDateTime.now());
diseaseNode.setUpdateBy(SecurityUtils.getUsername());
+ diseaseNode.setRouteCheckStatus(RouteCheckStatusEnum.DISAGREE.getInfo());
}
int insertNodeCount = specialDiseaseNodeMapper.insertSpecialDiseaseNodeList(specialDiseaseNode.getSpecialDiseaseNodeList());
if (insertNodeCount < 0) {
@@ -157,4 +157,15 @@ public class SpecialDiseaseNodeServiceImpl implements ISpecialDiseaseNodeService
public AjaxResult selectSpecialDisease(Long specialDiseaseRouteId) {
return AjaxResult.success(specialDiseaseNodeMapper.selectSpecialDiseaseByRouteId(specialDiseaseRouteId));
}
+
+ /**
+ * 修改节点信息状态
+ *
+ * @param specialDiseaseNode 节点信息
+ * @return AjaxResult
+ */
+ @Override
+ public AjaxResult updateRouteCheckStatus(SpecialDiseaseNode specialDiseaseNode) {
+ return AjaxResult.success(specialDiseaseNodeMapper.updateSpecialDiseaseNode(specialDiseaseNode));
+ }
}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java
index 932c2956..65cc8bff 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java
@@ -15,6 +15,9 @@ import lombok.EqualsAndHashCode;
@Data
public class SpecialDiseaseNodeVO extends SpecialDiseaseNode {
- @ApiModelProperty(value = "专病路径表id")
- private Long SpecialDiseaseNodeId;
+ private Long specialDiseaseNodeId;
+
+ private String taskTypeName;
+
+ private String taskSubdivisionName;
}
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 372c8286..2516a64a 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseasenode/SpecialDiseaseNodeMapper.xml
@@ -18,8 +18,10 @@
+
+
+ resultMap="SpecialDiseaseNodeVOResult"/>
@@ -64,12 +66,60 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
select id,
route_id,
@@ -701,9 +751,9 @@
+
+
\ No newline at end of file