From 6d6ef3b94d01f354e70d9de5ee70a2ebd31ed2b3 Mon Sep 17 00:00:00 2001
From: youxilong <yxllx@163.com>
Date: Tue, 2 Apr 2024 21:32:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=B7=A5=E9=9A=8F?=
 =?UTF-8?q?=E8=AE=BF=E4=BB=A3=E5=8A=9E=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/manualfollowup/ManualFollowUpDTO.java | 12 ------------
 .../SignPatientManageRouteMapper.xml          | 19 +++++++++++++------
 2 files changed, 13 insertions(+), 18 deletions(-)

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 ab6bf5f6..0825e086 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
@@ -33,27 +33,15 @@ public class ManualFollowUpDTO {
     @ApiModelProperty(value = "所属医院id")
     private Long hospitalAgencyId;
 
-    @ApiModelProperty(value = "所属医院名称")
-    private String hospitalAgencyName;
-
     @ApiModelProperty(value = "所属院区id")
     private Long campusAgencyId;
 
-    @ApiModelProperty(value = "所属院区名称")
-    private String campusAgencyName;
-
     @ApiModelProperty(value = "所属科室id")
     private Long departmentId;
 
-    @ApiModelProperty(value = "所属科室名称")
-    private String departmentName;
-
     @ApiModelProperty(value = "所属病区id")
     private Long wardId;
 
-    @ApiModelProperty(value = "所属病区名称")
-    private String wardName;
-
     @ApiModelProperty(value = "就诊方式，门诊：OUTPATIENT_SERVICE，住院：BE_IN_HOSPITAL")
     private String visitMethod;
 
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 064372a2..d2ae084d 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
@@ -136,23 +136,30 @@
         LEFT JOIN patient_visit_record pvr ON pi.patient_visit_record_id = pvr.id
         <where>
             pi.del_flag = '0' AND spmrn.node_execute_status = 'UNEXECUTED'
+            AND spmrn.task_type in ('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE','ARTIFICIAL_FOLLOW_UP')
             <if test="patientName != null and patientName != ''">
-                AND pi.patient_name = #{patientName}
+                AND pi.patient_name LIKE concat('%', #{patientName}, '%')
             </if>
             <if test="patientPhone != null and patientPhone != ''">
-                AND pi.patient_phone = #{patientPhone}
+                AND pi.patient_phone LIKE concat('%', #{patientPhone}, '%')
             </if>
             <if test="hospitalAgencyId != null">
                 AND pi.hospital_agency_id = #{hospitalAgencyId}
             </if>
-            <if test="hospitalAgencyName != null and hospitalAgencyName != ''">
-                AND pi.hospital_agency_name LIKE concat('%', #{hospitalAgencyName}, '%')
+            <if test="campusAgencyId != null">
+                AND pi.campus_agency_id = #{campusAgencyId}
+            </if>
+            <if test="departmentId != null">
+                AND pi.department_id = #{departmentId}
+            </if>
+            <if test="wardId != null">
+                AND pi.ward_id = #{wardId}
             </if>
             <if test="visitMethod != null and visitMethod != ''">
                 AND pi.visit_method = #{visitMethod}
             </if>
             <if test="visitSerialNumber != null and visitSerialNumber != ''">
-                AND pi.visit_serial_number = #{visitSerialNumber}
+                AND pi.visit_serial_number LIKE concat('%', #{visitSerialNumber}, '%')
             </if>
             <if test="clinicalStartTime != null">
                 AND pi.visit_date >= #{clinicalStartTime}
@@ -179,7 +186,7 @@
                 AND pi.attending_physician_id = #{attendingPhysicianId}
             </if>
             <if test="attendingPhysicianName != null and attendingPhysicianName != ''">
-                AND pi.attending_physician_name = #{attendingPhysicianName}
+                AND pi.attending_physician_name LIKE concat('%',#{attendingPhysicianName}, '%')
             </if>
         </where>
     </select>