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 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 adminQueryPatient(FmsFollowupDto.FollowupPatientQueryDTO dto) { - List followupPatients = fmsFollowupDao.adminQueryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone()); + List followupPatients = fmsFollowupDao.adminQueryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone(), dto.getName()); if (CollectionUtil.isNotEmpty(followupPatients)) { List 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 queryPatient(FmsFollowupDto.FollowupPatientQueryDTO dto) { - List followupPatients = fmsFollowupDao.queryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone()); + List followupPatients = fmsFollowupDao.queryPatient(dto.getQueueId(), null, dto.getHaveQueue(), dto.getTenantId(), dto.getPhone(), dto.getName()); if (CollectionUtil.isNotEmpty(followupPatients)) { List 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 @@ AND r.phone =#{phone} + + AND r.name =#{name} + group by r.patient_id, r.tenant_id order by r.create_time desc @@ -244,6 +247,9 @@ AND r.phone =#{phone} + + AND r.name =#{name} + group by r.patient_id, r.tenant_id order by r.create_time desc