From e03ba731f3b0b69d4b080c410327664fc05ed26b Mon Sep 17 00:00:00 2001
From: zzc <Zhengzhic18@163.com>
Date: Mon, 14 Apr 2025 18:29:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E7=96=97=E3=80=81=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?=E6=82=A3=E8=80=85=E6=B7=BB=E5=8A=A0=E6=89=8B=E6=9C=BA=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E5=A7=93=E5=90=8D=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/acupuncture/system/persist/dao/FmsFollowupDao.java  | 6 ++++--
 .../service/impl/AdminFmsFollowupQueueServiceImpl.java      | 2 +-
 .../system/service/impl/FmsFollowupServiceImpl.java         | 2 +-
 .../src/main/resources/mapper/dao/FmsFollowupDao.xml        | 6 ++++++
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java
index 231fecb2..ab58515e 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/persist/dao/FmsFollowupDao.java
@@ -41,13 +41,15 @@ public interface FmsFollowupDao {
                                                      @Param("taskFlag")  Byte taskFlag,
                                                      @Param("haveQueue")Integer haveQueue,
                                                      @Param("tenantId") Long tenantId,
-                                                     @Param("phone") String phone);
+                                                     @Param("phone") String phone,
+                                                     @Param("name") String name);
 
     List<FmsFollowupVo.FollowupPatient> adminQueryPatient(@Param("id") Long id,
                                                      @Param("taskFlag")  Byte taskFlag,
                                                      @Param("haveQueue")Integer haveQueue,
                                                           @Param("tenantId") Long tenantId,
-                                                          @Param("phone") String phone);
+                                                          @Param("phone") String phone,
+                                                          @Param("name") String name);
 
     /**
      * 查询随访任务
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminFmsFollowupQueueServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminFmsFollowupQueueServiceImpl.java
index 488e4e34..e1b0d85d 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminFmsFollowupQueueServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/AdminFmsFollowupQueueServiceImpl.java
@@ -73,7 +73,7 @@ public class AdminFmsFollowupQueueServiceImpl implements AdminFmsFollowupQueueSe
 
     @Override
     public List<FmsFollowupVo.FollowupPatient> adminQueryPatient(FmsFollowupDto.FollowupPatientQueryDTO dto) {
-        List<FmsFollowupVo.FollowupPatient> followupPatients = fmsFollowupDao.adminQueryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone());
+        List<FmsFollowupVo.FollowupPatient> followupPatients = fmsFollowupDao.adminQueryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone(), dto.getName());
         if (CollectionUtil.isNotEmpty(followupPatients)) {
             List<Object> commonFollowupQueue = redisCache.getCacheList("common_followup_queue");
             for (FmsFollowupVo.FollowupPatient followupPatient : followupPatients) {
diff --git a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupServiceImpl.java b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupServiceImpl.java
index 3f8e6312..08c4ca69 100644
--- a/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupServiceImpl.java
+++ b/acupuncture-system/src/main/java/com/acupuncture/system/service/impl/FmsFollowupServiceImpl.java
@@ -87,7 +87,7 @@ public class FmsFollowupServiceImpl implements FmsFollowupService {
 
     @Override
     public List<FmsFollowupVo.FollowupPatient> queryPatient(FmsFollowupDto.FollowupPatientQueryDTO dto) {
-        List<FmsFollowupVo.FollowupPatient> followupPatients = fmsFollowupDao.queryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone());
+        List<FmsFollowupVo.FollowupPatient> followupPatients = fmsFollowupDao.queryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone(), dto.getName());
         if (CollectionUtil.isNotEmpty(followupPatients)) {
             List<Object> commonFollowupQueue = redisCache.getCacheList("common_followup_queue");
             for (FmsFollowupVo.FollowupPatient followupPatient : followupPatients) {
diff --git a/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml b/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml
index fbca4db6..ff5a90fe 100644
--- a/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml
+++ b/acupuncture-system/src/main/resources/mapper/dao/FmsFollowupDao.xml
@@ -154,6 +154,9 @@
         <if test="phone != null and phone != ''">
             AND r.phone =#{phone}
         </if>
+        <if test="name != null and name != ''">
+            AND r.name =#{name}
+        </if>
         group by r.patient_id, r.tenant_id
         order by r.create_time desc
     </select>
@@ -244,6 +247,9 @@
         <if test="phone != null and phone != ''">
             AND r.phone =#{phone}
         </if>
+        <if test="name != null and name != ''">
+            AND r.name =#{name}
+        </if>
         group by r.patient_id, r.tenant_id
         order by r.create_time desc
     </select>