诊疗、随访患者添加手机号、姓名查询方式

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);
 
     /**
      * 查询随访任务

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) {

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) {

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>