From 25a9c3dd667953bc810cc614a8da0025c43cf7c5 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Sun, 7 Apr 2024 13:27:01 +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

---
 .../com/xinelu/common/constant/Constants.java |  5 ++
 .../SpecialDiseaseRouteController.java        | 17 +----
 .../SpecialDiseaseRouteMapper.java            |  8 +++
 .../ISpecialDiseaseRouteService.java          |  2 +-
 .../impl/SpecialDiseaseRouteServiceImpl.java  | 13 +++-
 .../SpecialDiseaseRouteMapper.xml             | 67 +++++++++++++++++++
 6 files changed, 94 insertions(+), 18 deletions(-)

diff --git a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
index 38f7bd83..34293690 100644
--- a/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
+++ b/postdischarge-common/src/main/java/com/xinelu/common/constant/Constants.java
@@ -223,4 +223,9 @@ public class Constants {
      * 字段内容编码前缀
      */
     public static final String CONTENT_ENCODING = "CE";
+
+    /**
+     * 路径编码
+     */
+    public static final String ROUTE_CODE = "RC";
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java
index 290c5f9d..364f5363 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/specialdiseaseroute/SpecialDiseaseRouteController.java
@@ -5,14 +5,13 @@ import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.enums.BusinessType;
-import com.xinelu.common.utils.poi.ExcelUtil;
 import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
 import com.xinelu.manage.service.specialdiseaseroute.ISpecialDiseaseRouteService;
+import com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -34,22 +33,10 @@ public class SpecialDiseaseRouteController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(SpecialDiseaseRoute specialDiseaseRoute) {
         startPage();
-        List<SpecialDiseaseRoute> list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute);
+        List<SpecialDiseaseRouteVO> list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute);
         return getDataTable(list);
     }
 
-    /**
-     * 导出专病路径信息列表
-     */
-    @PreAuthorize("@ss.hasPermi('system:specialDiseaseRoute:export')")
-    @Log(title = "专病路径信息", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, SpecialDiseaseRoute specialDiseaseRoute) {
-        List<SpecialDiseaseRoute> list = specialDiseaseRouteService.selectSpecialDiseaseRouteList(specialDiseaseRoute);
-        ExcelUtil<SpecialDiseaseRoute> util = new ExcelUtil<SpecialDiseaseRoute>(SpecialDiseaseRoute.class);
-        util.exportExcel(response, list, "专病路径信息数据");
-    }
-
     /**
      * 获取专病路径信息详细信息
      */
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java
index 4a822937..9d1d04ce 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/specialdiseaseroute/SpecialDiseaseRouteMapper.java
@@ -29,6 +29,14 @@ public interface SpecialDiseaseRouteMapper {
      */
     List<SpecialDiseaseRoute> selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute);
 
+    /**
+     * 查询专病路径信息列表
+     *
+     * @param specialDiseaseRoute 专病路径信息
+     * @return 专病路径信息集合
+     */
+    List<SpecialDiseaseRouteVO> selectDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute);
+
     /**
      * 新增专病路径信息
      *
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java
index c2697742..724c29e8 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/ISpecialDiseaseRouteService.java
@@ -27,7 +27,7 @@ public interface ISpecialDiseaseRouteService {
      * @param specialDiseaseRoute 专病路径信息
      * @return 专病路径信息集合
      */
-    List<SpecialDiseaseRoute> selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute);
+    List<SpecialDiseaseRouteVO> selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute);
 
     /**
      * 新增专病路径信息
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java
index dfa5d60c..6bd890d4 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/specialdiseaseroute/impl/SpecialDiseaseRouteServiceImpl.java
@@ -1,7 +1,10 @@
 package com.xinelu.manage.service.specialdiseaseroute.impl;
 
+import com.xinelu.common.constant.Constants;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.exception.ServiceException;
+import com.xinelu.common.utils.SecurityUtils;
+import com.xinelu.common.utils.codes.GenerateSystemCodeUtil;
 import com.xinelu.manage.domain.specialdiseaseroute.SpecialDiseaseRoute;
 import com.xinelu.manage.mapper.specialdiseasenode.SpecialDiseaseNodeMapper;
 import com.xinelu.manage.mapper.specialdiseaseroute.SpecialDiseaseRouteMapper;
@@ -32,6 +35,9 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
     private SpecialDiseaseNodeMapper specialDiseaseNodeMapper;
     @Resource
     private SpecialDiseaseTriggerConditionMapper triggerConditionMapper;
+    @Resource
+    private GenerateSystemCodeUtil generateSystemCodeUtil;
+
 
     /**
      * 查询专病路径信息
@@ -51,8 +57,8 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
      * @return 专病路径信息
      */
     @Override
-    public List<SpecialDiseaseRoute> selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute) {
-        return specialDiseaseRouteMapper.selectSpecialDiseaseRouteList(specialDiseaseRoute);
+    public List<SpecialDiseaseRouteVO> selectSpecialDiseaseRouteList(SpecialDiseaseRoute specialDiseaseRoute) {
+        return specialDiseaseRouteMapper.selectDiseaseRouteList(specialDiseaseRoute);
     }
 
     /**
@@ -64,6 +70,8 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
     @Override
     public int insertSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) {
         specialDiseaseRoute.setCreateTime(LocalDateTime.now());
+        specialDiseaseRoute.setCreateBy(SecurityUtils.getUsername());
+        specialDiseaseRoute.setRouteCode(Constants.ROUTE_CODE + generateSystemCodeUtil.generateSystemCode(Constants.ROUTE_CODE));
         return specialDiseaseRouteMapper.insertSpecialDiseaseRoute(specialDiseaseRoute);
     }
 
@@ -76,6 +84,7 @@ public class SpecialDiseaseRouteServiceImpl implements ISpecialDiseaseRouteServi
     @Override
     public int updateSpecialDiseaseRoute(SpecialDiseaseRoute specialDiseaseRoute) {
         specialDiseaseRoute.setUpdateTime(LocalDateTime.now());
+        specialDiseaseRoute.setUpdateBy(SecurityUtils.getUsername());
         return specialDiseaseRouteMapper.updateSpecialDiseaseRoute(specialDiseaseRoute);
     }
 
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
index f78aedb9..0fa13398 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/specialdiseaseroute/SpecialDiseaseRouteMapper.xml
@@ -120,6 +120,73 @@
         </where>
     </select>
 
+    <select id="selectDiseaseRouteList"
+            resultType="com.xinelu.manage.vo.specialdiseaseroute.SpecialDiseaseRouteVO">
+        select a.id,
+        department_id,
+        department_name,
+        disease_type_id,
+        disease_type_name,
+        route_name,
+        route_code,
+        version,
+        route_classify,
+        release_status,
+        suit_range,
+        route_sort,
+        route_remark,
+        create_by,
+        create_time,
+        update_by,
+        update_time,
+        (select COUNT(1)
+        from special_disease_node
+        where route_id = a.id) totalNumber,
+        (select COUNT(1)
+        from special_disease_node
+        where route_id = a.id
+        and route_check_status = 'AGREE') agreeNumber
+        from special_disease_route a
+        <where>
+            <if test="departmentId != null ">
+                and department_id = #{departmentId}
+            </if>
+            <if test="departmentName != null  and departmentName != ''">
+                and department_name like concat('%', #{departmentName}, '%')
+            </if>
+            <if test="diseaseTypeId != null ">
+                and disease_type_id = #{diseaseTypeId}
+            </if>
+            <if test="diseaseTypeName != null  and diseaseTypeName != ''">
+                and disease_type_name like concat('%', #{diseaseTypeName}, '%')
+            </if>
+            <if test="routeName != null  and routeName != ''">
+                and route_name like concat('%', #{routeName}, '%')
+            </if>
+            <if test="routeCode != null  and routeCode != ''">
+                and route_code = #{routeCode}
+            </if>
+            <if test="version != null  and version != ''">
+                and version = #{version}
+            </if>
+            <if test="routeClassify != null  and routeClassify != ''">
+                and route_classify = #{routeClassify}
+            </if>
+            <if test="releaseStatus != null  and releaseStatus != ''">
+                and release_status = #{releaseStatus}
+            </if>
+            <if test="suitRange != null  and suitRange != ''">
+                and suit_range = #{suitRange}
+            </if>
+            <if test="routeSort != null ">
+                and route_sort = #{routeSort}
+            </if>
+            <if test="routeRemark != null  and routeRemark != ''">
+                and route_remark = #{routeRemark}
+            </if>
+        </where>
+    </select>
+
     <select id="selectSpecialDiseaseRouteById" parameterType="Long"
             resultMap="SpecialDiseaseRouteResult">
         <include refid="selectSpecialDiseaseRouteVo"/>

From 6ab52913548200aea743dd252ed0f90caa8bdaef Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Sun, 7 Apr 2024 14:00:14 +0800
Subject: [PATCH 2/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

---
 .../xinelu/common/enums/TaskContentEnum.java  | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/TaskContentEnum.java

diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/TaskContentEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/TaskContentEnum.java
new file mode 100644
index 00000000..c36751c0
--- /dev/null
+++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/TaskContentEnum.java
@@ -0,0 +1,44 @@
+package com.xinelu.common.enums;
+
+import lombok.Getter;
+
+/**
+ * @Description 任务内容
+ * @Author zh
+ * @Date 2024-04-07
+ */
+@Getter
+public enum TaskContentEnum {
+
+    /**
+     * 电话外呼
+     */
+    PHONE_OUTBOUND("PHONE_OUTBOUND"),
+
+    /**
+     * 问卷量表
+     */
+    QUESTIONNAIRE_SCALE("QUESTIONNAIRE_SCALE"),
+
+    /**
+     * 宣教文章
+     */
+    PROPAGANDA_ARTICLE("PROPAGANDA_ARTICLE"),
+
+    /**
+     * 文字提醒
+     */
+    TEXT_REMIND("TEXT_REMIND"),
+
+    /**
+     * 人工随访
+     */
+    ARTIFICIAL_FOLLOW_UP("ARTIFICIAL_FOLLOW_UP"),
+    ;
+
+    final private String info;
+
+    TaskContentEnum(String info) {
+        this.info = info;
+    }
+}