From 15ae71e23044c362bc299a731d4028dd0ec2740e Mon Sep 17 00:00:00 2001
From: youxilong <yxllx@163.com>
Date: Fri, 5 Jul 2024 15:26:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/manualfollowup/ManualFollowUpDTO.java       | 13 ++++++++++++-
 .../impl/SignPatientManageRouteServiceImpl.java     |  2 ++
 .../SignPatientManageRouteMapper.xml                |  5 +++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java
index 899eb293..47ceb64a 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/dto/manualfollowup/ManualFollowUpDTO.java
@@ -1,8 +1,12 @@
 package com.xinelu.manage.dto.manualfollowup;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.xinelu.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.time.LocalDate;
@@ -14,7 +18,11 @@ import java.time.LocalDate;
  * @date : 2024/4/2 10:36
  */
 @Data
-public class ManualFollowUpDTO {
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ManualFollowUpDTO extends BaseEntity {
+    private static final long serialVersionUID = 1L;
 
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "随访开始时间")
@@ -62,5 +70,8 @@ public class ManualFollowUpDTO {
     @ApiModelProperty(value = "节点任务执行状态，已执行：EXECUTED，未执行：UNEXECUTED")
     private String nodeExecuteStatus;
 
+    @ApiModelProperty(value = "任务名称")
+    private String manageRouteName;
+
 
 }
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 345d6450..86ec4c32 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
@@ -1,6 +1,7 @@
 package com.xinelu.manage.service.signpatientmanageroute.impl;
 
 import com.alibaba.fastjson2.JSONObject;
+import com.xinelu.common.annotation.DataScope;
 import com.xinelu.common.constant.TaskContentConstants;
 import com.xinelu.common.constant.TaskCreateTypeConstant;
 import com.xinelu.common.constant.TemplateTypeConstants;
@@ -278,6 +279,7 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout
      * @return ManualFollowUpVO 人工随访代办VO
      */
     @Override
+    @DataScope(agencyAlias = "pi", deptAlias = "pi")
     public List<ManualFollowUpVO> selectManualFollowUpList(ManualFollowUpDTO manualFollowUpDTO) {
         return signPatientManageRouteMapper.selectManualFollowUpList(manualFollowUpDTO);
     }
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 e4ae2db3..06f81705 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
@@ -390,6 +390,11 @@
             <if test="followEndTime != null ">
                 AND pter.execute_time &lt;= #{followEndTime}
             </if>
+            <if test="manageRouteName != null  and manageRouteName != ''">
+                AND spmrn.manage_route_name like concat('%', #{manageRouteName}, '%')
+            </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
     order by spmr.create_time DESC
     </select>