diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/homepage/SystemHomePageController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/homepage/SystemHomePageController.java
index 4c02d8f7..034c3efe 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/homepage/SystemHomePageController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/homepage/SystemHomePageController.java
@@ -37,4 +37,9 @@ public class SystemHomePageController extends BaseController {
     public AjaxResult serviceModeStatistics() {
         return AjaxResult.success(systemHomePageService.serviceModeStatistics());
     }
+
+    @GetMapping("taskSituation")
+    public AjaxResult taskSituation(){
+        return AjaxResult.success(systemHomePageService.taskSituation());
+    }
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java
index 18add448..b57980ac 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java
@@ -3,6 +3,7 @@ package com.xinelu.manage.mapper.signpatientmanageroutenode;
 import com.xinelu.manage.domain.signpatientmanageroutenode.SignPatientManageRouteNode;
 import com.xinelu.manage.dto.signpatientmanageroutenode.PatientTaskDto;
 import com.xinelu.manage.dto.signpatientmanageroutenode.SignPatientManageRouteNodeDto;
+import com.xinelu.manage.vo.homepage.PatientAndNode;
 import com.xinelu.manage.vo.signpatientmanageroutenode.*;
 import com.xinelu.manage.vo.specialdiseasenode.SpecialDiseaseNodeAuditVo;
 import org.apache.ibatis.annotations.Param;
@@ -155,4 +156,6 @@ public interface SignPatientManageRouteNodeMapper {
     int selectNodeCountByCreateTime(@Param("firstDay") LocalDate firstDay, @Param("now") LocalDate now);
 
     BigDecimal selectNodeCount(@Param("phoneDialMethod") String phoneDialMethod, @Param("messagePushSign") Long messagePushSign, @Param("appletPushSign") Long appletPushSign);
+
+    List<PatientAndNode> selectNodeExecuteStatus();
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java
index 8bd2b94c..214093ac 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientrecord/SignPatientRecordMapper.java
@@ -4,8 +4,10 @@ import com.xinelu.manage.domain.signpatientrecord.SignPatientRecord;
 import com.xinelu.manage.dto.signpatientrecord.SignPatientListDto;
 import com.xinelu.manage.vo.signpatientrecord.IntentionalSignVo;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientInfoVo;
-import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
 import com.xinelu.manage.vo.signpatientrecord.SignPatientListVo;
+import com.xinelu.manage.vo.signpatientrecord.SignPatientRecordVo;
+import org.apache.ibatis.annotations.Param;
+
 import java.util.List;
 
 /**
@@ -42,4 +44,6 @@ public interface SignPatientRecordMapper {
 	 * @Date 2024-08-08 11:00
 	 */
 	IntentionalSignVo getIntentionalSign(Long id);
+
+    int selectCheckStatus(@Param("routeCheckStatus") String routeCheckStatus, @Param("serviceStatus") String serviceStatus);
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/SystemHomePageService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/SystemHomePageService.java
index 94b70587..7771f0e1 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/SystemHomePageService.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/SystemHomePageService.java
@@ -3,6 +3,7 @@ package com.xinelu.manage.service.homepage;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.manage.vo.homepage.ServiceModeStatistics;
 import com.xinelu.manage.vo.homepage.SignPatientCount;
+import com.xinelu.manage.vo.homepage.TaskSituation;
 import com.xinelu.manage.vo.homepage.TopStatisticsVO;
 
 import java.util.List;
@@ -19,5 +20,7 @@ public interface SystemHomePageService {
 
     List<SignPatientCount> signPatientCount();
 
-    ServiceModeStatistics serviceModeStatistics();
+    List<ServiceModeStatistics> serviceModeStatistics();
+
+    List<TaskSituation> taskSituation();
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java
index 514180a8..d14309fd 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/homepage/impl/SystemHomePageServiceImpl.java
@@ -1,13 +1,14 @@
 package com.xinelu.manage.service.homepage.impl;
 
+import com.xinelu.common.enums.NodeExecuteStatusEnum;
 import com.xinelu.common.enums.PhoneDialMethodEnum;
 import com.xinelu.manage.mapper.patientinfo.PatientInfoMapper;
 import com.xinelu.manage.mapper.patientprehospitalization.PatientPreHospitalizationMapper;
 import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
+import com.xinelu.manage.mapper.signpatientrecord.SignPatientRecordMapper;
 import com.xinelu.manage.service.homepage.SystemHomePageService;
-import com.xinelu.manage.vo.homepage.ServiceModeStatistics;
-import com.xinelu.manage.vo.homepage.SignPatientCount;
-import com.xinelu.manage.vo.homepage.TopStatisticsVO;
+import com.xinelu.manage.vo.homepage.*;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -17,6 +18,7 @@ import java.time.LocalDate;
 import java.time.temporal.TemporalAdjusters;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 首页信息Service业务层处理
@@ -32,6 +34,8 @@ public class SystemHomePageServiceImpl implements SystemHomePageService {
     private PatientPreHospitalizationMapper patientPreHospitalizationMapper;
     @Resource
     private SignPatientManageRouteNodeMapper signPatientManageRouteNodeMapper;
+    @Resource
+    private SignPatientRecordMapper signPatientRecordMapper;
 
     @Override
     public TopStatisticsVO topStatistics() {
@@ -72,17 +76,55 @@ public class SystemHomePageServiceImpl implements SystemHomePageService {
     }
 
     @Override
-    public ServiceModeStatistics serviceModeStatistics() {
-        ServiceModeStatistics serviceModeStatistics = new ServiceModeStatistics();
-        BigDecimal all = signPatientManageRouteNodeMapper.selectNodeCount(null, null, null);
+    public List<ServiceModeStatistics> serviceModeStatistics() {
+        ArrayList<ServiceModeStatistics> serviceModeStatisticsList = new ArrayList<>();
         BigDecimal common = signPatientManageRouteNodeMapper.selectNodeCount(PhoneDialMethodEnum.COMMON.getInfo(), null, null);
         BigDecimal AI = signPatientManageRouteNodeMapper.selectNodeCount(PhoneDialMethodEnum.AI.getInfo(), null, null);
         BigDecimal messagePushSign = signPatientManageRouteNodeMapper.selectNodeCount(null, 0L, null);
         BigDecimal appletPushSign = signPatientManageRouteNodeMapper.selectNodeCount(null, null, 0L);
-        serviceModeStatistics.setAI(AI.divide(all, 2, RoundingMode.HALF_UP));
-        serviceModeStatistics.setMessage(messagePushSign.divide(all, 2, RoundingMode.HALF_UP));
-        serviceModeStatistics.setCommon(common.divide(all, 2, RoundingMode.HALF_UP));
-        serviceModeStatistics.setWeChat(appletPushSign.divide(all, 2, RoundingMode.HALF_UP));
-        return serviceModeStatistics;
+        BigDecimal all = common.add(AI).add(messagePushSign).add(appletPushSign);
+        serviceModeStatisticsList.add(new ServiceModeStatistics("AI", AI.divide(all, 2, RoundingMode.HALF_UP), AI));
+        serviceModeStatisticsList.add(new ServiceModeStatistics("短信", messagePushSign.divide(all, 2, RoundingMode.HALF_UP), messagePushSign));
+        serviceModeStatisticsList.add(new ServiceModeStatistics("微信", appletPushSign.divide(all, 2, RoundingMode.HALF_UP), appletPushSign));
+        serviceModeStatisticsList.add(new ServiceModeStatistics("人工随访", common.divide(all, 2, RoundingMode.HALF_UP), common));
+        return serviceModeStatisticsList;
+    }
+
+    @Override
+    public List<TaskSituation> taskSituation() {
+        LocalDate now = LocalDate.now();
+        List<TaskSituation> taskSituations = new ArrayList<>();
+        //未审核
+        int checkStatusCount = signPatientRecordMapper.selectCheckStatus("UNAUDITED", "SERVICE_CENTER");
+        //全部
+        int signTimeCount = signPatientRecordMapper.selectCheckStatus(null, "SERVICE_CENTER");
+        //任务
+        List<PatientAndNode> patientAndNodes = signPatientManageRouteNodeMapper.selectNodeExecuteStatus();
+        int unExecutedCount = 0;
+        int allCount = 0;
+        if (CollectionUtils.isNotEmpty(patientAndNodes)) {
+             allCount = patientAndNodes.size();
+            for (PatientAndNode patientAndNode : patientAndNodes) {
+                LocalDate localDate = null;
+                if (Objects.nonNull(patientAndNode.getDischargeTime())) {
+                    localDate = patientAndNode.getDischargeTime().plusDays(patientAndNode.getRouteNodeDay());
+                }
+                if (Objects.isNull(patientAndNode.getDischargeTime()) && Objects.nonNull(patientAndNode.getVisitDate())) {
+                    localDate = patientAndNode.getVisitDate().plusDays(patientAndNode.getRouteNodeDay());
+                }
+                if (Objects.isNull(localDate)) {
+                    continue;
+                }
+                boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
+                if (before) {
+                    if (!NodeExecuteStatusEnum.EXECUTED.getInfo().equals(patientAndNode.getNodeExecuteStatus())) {
+                        unExecutedCount++;
+                    }
+                }
+            }
+        }
+        taskSituations.add(new TaskSituation("人工审核", checkStatusCount, signTimeCount));
+        taskSituations.add(new TaskSituation("人工随访", unExecutedCount, allCount));
+        return taskSituations;
     }
 }
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/PatientAndNode.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/PatientAndNode.java
new file mode 100644
index 00000000..47bb8997
--- /dev/null
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/PatientAndNode.java
@@ -0,0 +1,26 @@
+package com.xinelu.manage.vo.homepage;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+
+@Data
+public class PatientAndNode {
+
+    private Long signPatientManageRouteNodeIds;
+
+    @ApiModelProperty(value = "出院时间（出院患者）")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate dischargeTime;
+
+    @ApiModelProperty(value = "就诊时间，格式：yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private LocalDate visitDate;
+
+    @ApiModelProperty(value = "管理路径节点时间，时间单位为：天")
+    private Integer routeNodeDay;
+
+    private String nodeExecuteStatus;
+}
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/ServiceModeStatistics.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/ServiceModeStatistics.java
index ff52ce24..6fb68cdc 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/ServiceModeStatistics.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/ServiceModeStatistics.java
@@ -8,22 +8,24 @@ import java.math.BigDecimal;
 public class ServiceModeStatistics {
 
     /**
-     * 短信
+     * 名称
      */
-    private BigDecimal message;
+    private String name;
 
     /**
-     * ai
+     * 比例
      */
-    private BigDecimal AI;
+    private BigDecimal proportion;
 
     /**
-     * 人工随访
+     * 数量
      */
-    private BigDecimal common;
+    private BigDecimal count;
 
-    /**
-     * 微信
-     */
-    private BigDecimal weChat;
+    public ServiceModeStatistics(String name, BigDecimal proportion, BigDecimal count) {
+        super();
+        this.name = name;
+        this.proportion = proportion;
+        this.count = count;
+    }
 }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/TaskSituation.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/TaskSituation.java
new file mode 100644
index 00000000..51ba1249
--- /dev/null
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/homepage/TaskSituation.java
@@ -0,0 +1,29 @@
+package com.xinelu.manage.vo.homepage;
+
+import lombok.Data;
+
+@Data
+public class TaskSituation {
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 分子
+     */
+    private Integer count;
+
+    /**
+     * 分母
+     */
+    private Integer allCount;
+
+    public TaskSituation(String name, Integer count, Integer allCount) {
+        super();
+        this.name = name;
+        this.count = count;
+        this.allCount = allCount;
+    }
+}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
index 9d921042..81197792 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?><!DOCTYPE mapper
-	PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="com.xinelu.manage.mapper.patientinfo.PatientInfoMapper">
     <resultMap type="com.xinelu.manage.domain.patientinfo.PatientInfo" id="PatientInfoResult">
@@ -35,7 +35,7 @@
         <result property="visitSerialNumber" column="visit_serial_number"/>
         <result property="admissionTime" column="admission_time"/>
         <result property="dischargeTime" column="discharge_time"/>
-	    <result property="patientPreHospitalizationId" column="patient_pre_hospitalization_id"/>
+        <result property="patientPreHospitalizationId" column="patient_pre_hospitalization_id"/>
         <result property="appointmentTreatmentGroup" column="appointment_treatment_group"/>
         <result property="registrationNo" column="registration_no"/>
         <result property="registrationDate" column="registration_date"/>
@@ -44,7 +44,7 @@
         <result property="visitDate" column="visit_date"/>
         <result property="dischargeMethod" column="discharge_method"/>
         <result property="patientSource" column="patient_source"/>
-	    <result property="surgicalName" column="surgical_name" />
+        <result property="surgicalName" column="surgical_name"/>
         <result property="delFlag" column="del_flag"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -52,35 +52,65 @@
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-	<sql id="selectPatientInfoVo">
-		select p.id,p.resident_id,
-		       p.patient_name,
-		       p.patient_phone,
-		       p.family_member_phone,
-		       p.birth_date,
-		       p.card_no,
-		       p.sex,
-		       p.address,
-		       p.patient_type,
-		       p.sign_status,p.sign_patient_record_id,p.service_status,
-		       p.sign_time,
-		       p.visit_method, p.attending_physician_id, p.attending_physician_name, p.main_diagnosis,
-		       p.hospital_agency_id, p.hospital_agency_name, p.campus_agency_id, p.campus_agency_name, p.department_id, p.department_name, p.ward_id, p.ward_name,
-		       p.responsible_nurse, p.patient_visit_record_id, p.visit_serial_number,
-		       p.admission_time, p.patient_pre_hospitalization_id, p.discharge_time, p.patient_pre_hospitalization_id, p.appointment_treatment_group,
-		       p.registration_no, p.registration_date, p.appointment_date, p.in_hospital_number, p.visit_date, p.discharge_method,
-		       p.patient_source, p.surgical_name, p.del_flag, p.create_by, p.create_time, p.update_by, p.update_time
-		from patient_info p
-	</sql>
+    <sql id="selectPatientInfoVo">
+        select p.id,
+               p.resident_id,
+               p.patient_name,
+               p.patient_phone,
+               p.family_member_phone,
+               p.birth_date,
+               p.card_no,
+               p.sex,
+               p.address,
+               p.patient_type,
+               p.sign_status,
+               p.sign_patient_record_id,
+               p.service_status,
+               p.sign_time,
+               p.visit_method,
+               p.attending_physician_id,
+               p.attending_physician_name,
+               p.main_diagnosis,
+               p.hospital_agency_id,
+               p.hospital_agency_name,
+               p.campus_agency_id,
+               p.campus_agency_name,
+               p.department_id,
+               p.department_name,
+               p.ward_id,
+               p.ward_name,
+               p.responsible_nurse,
+               p.patient_visit_record_id,
+               p.visit_serial_number,
+               p.admission_time,
+               p.patient_pre_hospitalization_id,
+               p.discharge_time,
+               p.patient_pre_hospitalization_id,
+               p.appointment_treatment_group,
+               p.registration_no,
+               p.registration_date,
+               p.appointment_date,
+               p.in_hospital_number,
+               p.visit_date,
+               p.discharge_method,
+               p.patient_source,
+               p.surgical_name,
+               p.del_flag,
+               p.create_by,
+               p.create_time,
+               p.update_by,
+               p.update_time
+        from patient_info p
+    </sql>
 
     <select id="selectPatientInfoList" parameterType="com.xinelu.manage.dto.patientinfo.PatientInfoDto"
             resultMap="PatientInfoResult">
         <include refid="selectPatientInfoVo"/>
         <where>
-	        p.del_flag = 0
-	        <if test="residentId != null">
-		        and p.resident_id = #{residentId}
-	        </if>
+            p.del_flag = 0
+            <if test="residentId != null">
+                and p.resident_id = #{residentId}
+            </if>
             <if test="patientName != null  and patientName != ''">
                 and p.patient_name = #{patientName}
             </if>
@@ -133,12 +163,12 @@
             <if test="admissionTimeEnd != null ">
                 and date_format(p.admission_time,'%y%m%d') &lt;= date_format(#{admissionTimeEnd}, '%y%m%d')
             </if>
-	        <if test="dischargeTimeStart != null ">
-		        and date_format(p.discharge_time,'%y%m%d') >= date_format(#{dischargeTimeStart}, '%y%m%d')
-	        </if>
-	        <if test="dischargeTimeEnd != null ">
-		        and date_format(p.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd}, '%y%m%d')
-	        </if>
+            <if test="dischargeTimeStart != null ">
+                and date_format(p.discharge_time,'%y%m%d') >= date_format(#{dischargeTimeStart}, '%y%m%d')
+            </if>
+            <if test="dischargeTimeEnd != null ">
+                and date_format(p.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd}, '%y%m%d')
+            </if>
             <if test="appointmentDateStart != null ">
                 and date_format(p.appointment_date, '%y%m%d') >= date_format(#{appointmentDateStart}, '%y%m%d')
             </if>
@@ -160,529 +190,542 @@
             <if test="patientSource != null  and patientSource != ''">
                 and p.patient_source = #{patientSource}
             </if>
-	        <if test="surgicalName != null  and surgicalName != ''">
-		        and p.surgical_name = #{surgicalName}
-	        </if>
-	        <!-- 数据范围过滤 -->
-	        ${params.dataScope}
+            <if test="surgicalName != null  and surgicalName != ''">
+                and p.surgical_name = #{surgicalName}
+            </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by p.id desc
     </select>
 
-	<select id="getPatientList" parameterType="com.xinelu.manage.dto.patientinfo.PatientInfoDto"
-		resultType="com.xinelu.manage.vo.patientinfo.PatientInfoVo">
-		select p.*, count(p.manage_route_node_id) as taskNum, SUM(p.task_finish_status) as taskFinishNum, SUM(p.task_execute_status) as taskExecuteNum,
-		case
-		when count(p.manage_route_node_id) = 0 then 0
-		else
-		ROUND(SUM(p.task_finish_status) / count(p.manage_route_node_id) * 100, 2) end as taskFinishRate,
-		case
-		when count(p.manage_route_node_id) = 0 then 0
-		else
-		ROUND(SUM(p.task_execute_status) / count(p.manage_route_node_id) * 100, 2) end as taskExecuteRate
-		from
-		patient_task_view p
-		<where>
-			<if test="residentId != null">
-				and p.resident_id = #{residentId}
-			</if>
-			<if test="patientName != null and patientName != ''">
-				and p.patient_name = #{patientName}
-			</if>
-			<if test="patientPhone != null and patientPhone != ''">
-				and p.patient_phone like concat('%', #{patientPhone}, '%')
-			</if>
-			<if test="cardNo != null and cardNo != ''">
-				and p.card_no = #{cardNo}
-			</if>
-			<if test="patientType != null  and patientType != ''">
-				<choose>
-					<when test="patientType == 'OUTPATIENT_DISCHARGE'.toString()">
-						and (p.patient_type = 'OUTPATIENT' or p.patient_type = 'DISCHARGED_PATIENT')
-					</when>
-					<otherwise>
-						and p.patient_type = #{patientType}
-					</otherwise>
-				</choose>
-			</if>
-			<if test="attendingPhysicianId != null">
-				and p.attending_physician_id = #{attendingPhysicianId}
-			</if>
-			<if test="mainDiagnosis != null  and mainDiagnosis != ''">
-				and p.main_diagnosis like concat('%', #{mainDiagnosis}, '%')
-			</if>
-			<if test="hospitalAgencyId != null ">
-				and p.hospital_agency_id = #{hospitalAgencyId}
-			</if>
-			<if test="campusAgencyId != null ">
-				and p.campus_agency_id = #{campusAgencyId}
-			</if>
-			<if test="departmentId != null ">
-				and p.department_id = #{departmentId}
-			</if>
-			<if test="wardId != null ">
-				and p.ward_id = #{wardId}
-			</if>
-			<if test="visitMethod != null  and visitMethod != ''">
-				and p.visit_method = #{visitMethod}
-			</if>
-			<if test="visitDateStart != null ">
-				and date_format(p.visit_date, '%y%m%d') >= date_format(#{visitDateStart}, '%y%m%d')
-			</if>
-			<if test="visitDateEnd != null ">
-				and date_format(p.visit_date, '%y%m%d') &lt;= date_format(#{visitDateEnd}, '%y%m%d')
-			</if>
-			<if test="admissionTimeStart != null ">
-				and date_format(p.admission_time,'%y%m%d') >= date_format(#{admissionTimeStart}, '%y%m%d')
-			</if>
-			<if test="admissionTimeEnd != null ">
-				and date_format(p.admission_time,'%y%m%d') &lt;= date_format(#{admissionTimeEnd}, '%y%m%d')
-			</if>
-			<if test="dischargeTimeStart != null ">
-				and date_format(p.discharge_time,'%y%m%d') >= date_format(#{dischargeTimeStart}, '%y%m%d')
-			</if>
-			<if test="dischargeTimeEnd != null ">
-				and date_format(p.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd}, '%y%m%d')
-			</if>
-			<if test="appointmentDateStart != null ">
-				and date_format(p.appointment_date, '%y%m%d') >= date_format(#{appointmentDateStart}, '%y%m%d')
-			</if>
-			<if test="appointmentDateEnd != null ">
-				and date_format(p.appointment_date, '%y%m%d') &lt;= date_format(#{appointmentDateEnd}, '%y%m%d')
-			</if>
-			<if test="appointmentTreatmentGroup != null  and appointmentTreatmentGroup != ''">
-				and p.appointment_treatment_group = #{appointmentTreatmentGroup}
-			</if>
-			<if test="registrationNo != null  and registrationNo != ''">
-				and p.registration_no = #{registrationNo}
-			</if>
-			<if test="visitSerialNumber != null  and visitSerialNumber != ''">
-				and p.visit_serial_number = #{visitSerialNumber}
-			</if>
-			<if test="responsibleNurse != null  and responsibleNurse != ''">
-				and p.responsible_nurse = #{responsibleNurse}
-			</if>
-			<if test="patientSource != null  and patientSource != ''">
-				and p.patient_source = #{patientSource}
-			</if>
-			<if test="surgicalName != null  and surgicalName != ''">
-				and p.surgical_name = #{surgicalName}
-			</if>
-			<!-- 数据范围过滤 -->
-			${params.dataScope}
-		</where>
-		GROUP BY p.id order by p.id desc
-	</select>
+    <select id="getPatientList" parameterType="com.xinelu.manage.dto.patientinfo.PatientInfoDto"
+            resultType="com.xinelu.manage.vo.patientinfo.PatientInfoVo">
+        select p.*, count(p.manage_route_node_id) as taskNum, SUM(p.task_finish_status) as taskFinishNum,
+        SUM(p.task_execute_status) as taskExecuteNum,
+        case
+        when count(p.manage_route_node_id) = 0 then 0
+        else
+        ROUND(SUM(p.task_finish_status) / count(p.manage_route_node_id) * 100, 2) end as taskFinishRate,
+        case
+        when count(p.manage_route_node_id) = 0 then 0
+        else
+        ROUND(SUM(p.task_execute_status) / count(p.manage_route_node_id) * 100, 2) end as taskExecuteRate
+        from
+        patient_task_view p
+        <where>
+            <if test="residentId != null">
+                and p.resident_id = #{residentId}
+            </if>
+            <if test="patientName != null and patientName != ''">
+                and p.patient_name = #{patientName}
+            </if>
+            <if test="patientPhone != null and patientPhone != ''">
+                and p.patient_phone like concat('%', #{patientPhone}, '%')
+            </if>
+            <if test="cardNo != null and cardNo != ''">
+                and p.card_no = #{cardNo}
+            </if>
+            <if test="patientType != null  and patientType != ''">
+                <choose>
+                    <when test="patientType == 'OUTPATIENT_DISCHARGE'.toString()">
+                        and (p.patient_type = 'OUTPATIENT' or p.patient_type = 'DISCHARGED_PATIENT')
+                    </when>
+                    <otherwise>
+                        and p.patient_type = #{patientType}
+                    </otherwise>
+                </choose>
+            </if>
+            <if test="attendingPhysicianId != null">
+                and p.attending_physician_id = #{attendingPhysicianId}
+            </if>
+            <if test="mainDiagnosis != null  and mainDiagnosis != ''">
+                and p.main_diagnosis like concat('%', #{mainDiagnosis}, '%')
+            </if>
+            <if test="hospitalAgencyId != null ">
+                and p.hospital_agency_id = #{hospitalAgencyId}
+            </if>
+            <if test="campusAgencyId != null ">
+                and p.campus_agency_id = #{campusAgencyId}
+            </if>
+            <if test="departmentId != null ">
+                and p.department_id = #{departmentId}
+            </if>
+            <if test="wardId != null ">
+                and p.ward_id = #{wardId}
+            </if>
+            <if test="visitMethod != null  and visitMethod != ''">
+                and p.visit_method = #{visitMethod}
+            </if>
+            <if test="visitDateStart != null ">
+                and date_format(p.visit_date, '%y%m%d') >= date_format(#{visitDateStart}, '%y%m%d')
+            </if>
+            <if test="visitDateEnd != null ">
+                and date_format(p.visit_date, '%y%m%d') &lt;= date_format(#{visitDateEnd}, '%y%m%d')
+            </if>
+            <if test="admissionTimeStart != null ">
+                and date_format(p.admission_time,'%y%m%d') >= date_format(#{admissionTimeStart}, '%y%m%d')
+            </if>
+            <if test="admissionTimeEnd != null ">
+                and date_format(p.admission_time,'%y%m%d') &lt;= date_format(#{admissionTimeEnd}, '%y%m%d')
+            </if>
+            <if test="dischargeTimeStart != null ">
+                and date_format(p.discharge_time,'%y%m%d') >= date_format(#{dischargeTimeStart}, '%y%m%d')
+            </if>
+            <if test="dischargeTimeEnd != null ">
+                and date_format(p.discharge_time,'%y%m%d') &lt;= date_format(#{dischargeTimeEnd}, '%y%m%d')
+            </if>
+            <if test="appointmentDateStart != null ">
+                and date_format(p.appointment_date, '%y%m%d') >= date_format(#{appointmentDateStart}, '%y%m%d')
+            </if>
+            <if test="appointmentDateEnd != null ">
+                and date_format(p.appointment_date, '%y%m%d') &lt;= date_format(#{appointmentDateEnd}, '%y%m%d')
+            </if>
+            <if test="appointmentTreatmentGroup != null  and appointmentTreatmentGroup != ''">
+                and p.appointment_treatment_group = #{appointmentTreatmentGroup}
+            </if>
+            <if test="registrationNo != null  and registrationNo != ''">
+                and p.registration_no = #{registrationNo}
+            </if>
+            <if test="visitSerialNumber != null  and visitSerialNumber != ''">
+                and p.visit_serial_number = #{visitSerialNumber}
+            </if>
+            <if test="responsibleNurse != null  and responsibleNurse != ''">
+                and p.responsible_nurse = #{responsibleNurse}
+            </if>
+            <if test="patientSource != null  and patientSource != ''">
+                and p.patient_source = #{patientSource}
+            </if>
+            <if test="surgicalName != null  and surgicalName != ''">
+                and p.surgical_name = #{surgicalName}
+            </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+        GROUP BY p.id order by p.id desc
+    </select>
 
-	<select id="getPatientNextTask" parameterType="Long" resultType="com.xinelu.manage.vo.patientinfo.PatientNextTaskVo">
-		select p.task_name, p.execute_date_time from patient_task_view p
-		where
-		p.id = #{patientId} and p.node_execute_status = 'UNEXECUTED'
-		order by p.execute_date_time limit 1
-	</select>
+    <select id="getPatientNextTask" parameterType="Long"
+            resultType="com.xinelu.manage.vo.patientinfo.PatientNextTaskVo">
+        select p.task_name, p.execute_date_time
+        from patient_task_view p
+        where p.id = #{patientId}
+          and p.node_execute_status = 'UNEXECUTED'
+        order by p.execute_date_time limit 1
+    </select>
 
-	<select id="selectPatientInfoById" parameterType="Long" resultMap="PatientInfoResult">
-		<include refid="selectPatientInfoVo" />
-		where id = #{id}
-	</select>
+    <select id="selectPatientInfoById" parameterType="Long" resultMap="PatientInfoResult">
+        <include refid="selectPatientInfoVo"/>
+        where id = #{id}
+    </select>
 
-	<select id="getPatientBaseInfo" parameterType="Long" resultType="com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo">
-		select id, resident_id, patient_name, patient_phone, family_member_phone,
-		       birth_date, card_no, sex, address
-		from patient_info
-		where id = #{id}
-	</select>
+    <select id="getPatientBaseInfo" parameterType="Long"
+            resultType="com.xinelu.manage.vo.patientinfo.PatientBaseInfoVo">
+        select id,
+               resident_id,
+               patient_name,
+               patient_phone,
+               family_member_phone,
+               birth_date,
+               card_no,
+               sex,
+               address
+        from patient_info
+        where id = #{id}
+    </select>
 
-	<insert id="insertPatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo" useGeneratedKeys="true" keyProperty="id">
-		insert into patient_info
-		<trim prefix="(" suffix=")" suffixOverrides=",">
-			<if test="residentId != null">
-				resident_id,
-			</if>
-			<if test="patientName != null">
-		    patient_name,
-			</if>
-			<if test="patientPhone != null">patient_phone,
-			</if>
-			<if test="familyMemberPhone != null">family_member_phone,
-			</if>
-			<if test="birthDate != null">birth_date,
-			</if>
-			<if test="cardNo != null">card_no,
-			</if>
-			<if test="sex != null">sex,
-			</if>
-			<if test="address != null">address,
-			</if>
-			<if test="patientType != null">patient_type,
-			</if>
-			<if test="signStatus != null">sign_status,
-			</if>
-			<if test="signPatientRecordId != null">sign_patient_record_id,
-			</if>
-			<if test="serviceStatus != null">service_status,
-			</if>
-			<if test="signTime != null">sign_time,
-			</if>
-			<if test="visitMethod != null">visit_method,
-			</if>
-			<if test="attendingPhysicianId != null">attending_physician_id,
-			</if>
-			<if test="attendingPhysicianName != null">attending_physician_name,
-			</if>
-			<if test="mainDiagnosis != null">main_diagnosis,
-			</if>
-			<if test="hospitalAgencyId != null">hospital_agency_id,
-			</if>
-			<if test="hospitalAgencyName != null">hospital_agency_name,
-			</if>
-			<if test="campusAgencyId != null">campus_agency_id,
-			</if>
-			<if test="campusAgencyName != null">campus_agency_name,
-			</if>
-			<if test="departmentId != null">department_id,
-			</if>
-			<if test="departmentName != null">department_name,
-			</if>
-			<if test="wardId != null">ward_id,
-			</if>
-			<if test="wardName != null">ward_name,
-			</if>
-			<if test="responsibleNurse != null">
-		    responsible_nurse,
-			</if>
-			<if test="patientVisitRecordId != null">
-				patient_visit_record_id,
-			</if>
-			<if test="visitSerialNumber != null">
-		    visit_serial_number,
-			</if>
-			<if test="admissionTime != null">
-				admission_time,
-			</if>
-			<if test="dischargeTime != null">
-				discharge_time,
-			</if>
-			<if test="patientPreHospitalizationId != null">
-				patient_pre_hospitalization_id,
-			</if>
-			<if test="appointmentTreatmentGroup != null">appointment_treatment_group,
-			</if>
-			<if test="registrationNo != null">registration_no,
-			</if>
-			<if test="registrationDate != null">registration_date,
-			</if>
-			<if test="appointmentDate != null">appointment_date,
-			</if>
-			<if test="inHospitalNumber != null">in_hospital_number,
-			</if>
-			<if test="visitDate != null">visit_date,
-			</if>
-			<if test="dischargeMethod != null">discharge_method,
-			</if>
-			<if test="patientSource != null">patient_source,
-			</if>
-			<if test="surgicalName != null">surgical_name,
-			</if>
-			<if test="delFlag != null">del_flag,
-			</if>
-			<if test="createBy != null">create_by,
-			</if>
-			<if test="createTime != null">create_time,
-			</if>
-			<if test="updateBy != null">update_by,
-			</if>
-			<if test="updateTime != null">update_time,
-			</if>
-		</trim>
-		<trim prefix="values (" suffix=")" suffixOverrides=",">
-			<if test="residentId != null">#{residentId},
-			</if>
-			<if test="patientName != null">#{patientName},
-			</if>
-			<if test="patientPhone != null">#{patientPhone},
-			</if>
-			<if test="familyMemberPhone != null">#{familyMemberPhone},
-			</if>
-			<if test="birthDate != null">#{birthDate},
-			</if>
-			<if test="cardNo != null">#{cardNo},
-			</if>
-			<if test="sex != null">#{sex},
-			</if>
-			<if test="address != null">#{address},
-			</if>
-			<if test="patientType != null">#{patientType},
-			</if>
-			<if test="signStatus != null">#{signStatus},
-			</if>
-			<if test="signPatientRecordId != null">#{signPatientRecordId},
-			</if>
-			<if test="serviceStatus != null">#{serviceStatus},
-			</if>
-			<if test="signTime != null">#{signTime},
-			</if>
-			<if test="visitMethod != null">#{visitMethod},
-			</if>
-			<if test="attendingPhysicianId != null">#{attendingPhysicianId},
-			</if>
-			<if test="attendingPhysicianName != null">#{attendingPhysicianName},
-			</if>
-			<if test="mainDiagnosis != null">#{mainDiagnosis},
-			</if>
-			<if test="hospitalAgencyId != null">#{hospitalAgencyId},
-			</if>
-			<if test="hospitalAgencyName != null">#{hospitalAgencyName},
-			</if>
-			<if test="campusAgencyId != null">#{campusAgencyId},
-			</if>
-			<if test="campusAgencyName != null">#{campusAgencyName},
-			</if>
-			<if test="departmentId != null">#{departmentId},
-			</if>
-			<if test="departmentName != null">#{departmentName},
-			</if>
-			<if test="wardId != null">#{wardId},
-			</if>
-			<if test="wardName != null">#{wardName},
-			</if>
-			<if test="responsibleNurse != null">#{responsibleNurse},
-			</if>
-			<if test="patientVisitRecordId != null">#{patientVisitRecordId},
-			</if>
-			<if test="visitSerialNumber != null">#{visitSerialNumber},
-			</if>
-			<if test="admissionTime != null">#{admissionTime},
-			</if>
-			<if test="dischargeTime != null">#{dischargeTime},
-			</if>
-			<if test="patientPreHospitalizationId != null">
-				#{patientPreHospitalizationId},
-			</if>
-			<if test="appointmentTreatmentGroup != null">#{appointmentTreatmentGroup},
-			</if>
-			<if test="registrationNo != null">#{registrationNo},
-			</if>
-			<if test="registrationDate != null">#{registrationDate},
-			</if>
-			<if test="appointmentDate != null">#{appointmentDate},
-			</if>
-			<if test="inHospitalNumber != null">#{inHospitalNumber},
-			</if>
-			<if test="visitDate != null">#{visitDate},
-			</if>
-			<if test="dischargeMethod != null">#{dischargeMethod},
-			</if>
-			<if test="patientSource != null">#{patientSource},
-			</if>
-			<if test="surgicalName != null">#{surgicalName},
-			</if>
-			<if test="delFlag != null">#{delFlag},
-			</if>
-			<if test="createBy != null">#{createBy},
-			</if>
-			<if test="createTime != null">#{createTime},
-			</if>
-			<if test="updateBy != null">#{updateBy},
-			</if>
-			<if test="updateTime != null">#{updateTime},
-			</if>
-		</trim>
-	</insert>
+    <insert id="insertPatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo"
+            useGeneratedKeys="true" keyProperty="id">
+        insert into patient_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="residentId != null">
+                resident_id,
+            </if>
+            <if test="patientName != null">
+                patient_name,
+            </if>
+            <if test="patientPhone != null">patient_phone,
+            </if>
+            <if test="familyMemberPhone != null">family_member_phone,
+            </if>
+            <if test="birthDate != null">birth_date,
+            </if>
+            <if test="cardNo != null">card_no,
+            </if>
+            <if test="sex != null">sex,
+            </if>
+            <if test="address != null">address,
+            </if>
+            <if test="patientType != null">patient_type,
+            </if>
+            <if test="signStatus != null">sign_status,
+            </if>
+            <if test="signPatientRecordId != null">sign_patient_record_id,
+            </if>
+            <if test="serviceStatus != null">service_status,
+            </if>
+            <if test="signTime != null">sign_time,
+            </if>
+            <if test="visitMethod != null">visit_method,
+            </if>
+            <if test="attendingPhysicianId != null">attending_physician_id,
+            </if>
+            <if test="attendingPhysicianName != null">attending_physician_name,
+            </if>
+            <if test="mainDiagnosis != null">main_diagnosis,
+            </if>
+            <if test="hospitalAgencyId != null">hospital_agency_id,
+            </if>
+            <if test="hospitalAgencyName != null">hospital_agency_name,
+            </if>
+            <if test="campusAgencyId != null">campus_agency_id,
+            </if>
+            <if test="campusAgencyName != null">campus_agency_name,
+            </if>
+            <if test="departmentId != null">department_id,
+            </if>
+            <if test="departmentName != null">department_name,
+            </if>
+            <if test="wardId != null">ward_id,
+            </if>
+            <if test="wardName != null">ward_name,
+            </if>
+            <if test="responsibleNurse != null">
+                responsible_nurse,
+            </if>
+            <if test="patientVisitRecordId != null">
+                patient_visit_record_id,
+            </if>
+            <if test="visitSerialNumber != null">
+                visit_serial_number,
+            </if>
+            <if test="admissionTime != null">
+                admission_time,
+            </if>
+            <if test="dischargeTime != null">
+                discharge_time,
+            </if>
+            <if test="patientPreHospitalizationId != null">
+                patient_pre_hospitalization_id,
+            </if>
+            <if test="appointmentTreatmentGroup != null">appointment_treatment_group,
+            </if>
+            <if test="registrationNo != null">registration_no,
+            </if>
+            <if test="registrationDate != null">registration_date,
+            </if>
+            <if test="appointmentDate != null">appointment_date,
+            </if>
+            <if test="inHospitalNumber != null">in_hospital_number,
+            </if>
+            <if test="visitDate != null">visit_date,
+            </if>
+            <if test="dischargeMethod != null">discharge_method,
+            </if>
+            <if test="patientSource != null">patient_source,
+            </if>
+            <if test="surgicalName != null">surgical_name,
+            </if>
+            <if test="delFlag != null">del_flag,
+            </if>
+            <if test="createBy != null">create_by,
+            </if>
+            <if test="createTime != null">create_time,
+            </if>
+            <if test="updateBy != null">update_by,
+            </if>
+            <if test="updateTime != null">update_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="residentId != null">#{residentId},
+            </if>
+            <if test="patientName != null">#{patientName},
+            </if>
+            <if test="patientPhone != null">#{patientPhone},
+            </if>
+            <if test="familyMemberPhone != null">#{familyMemberPhone},
+            </if>
+            <if test="birthDate != null">#{birthDate},
+            </if>
+            <if test="cardNo != null">#{cardNo},
+            </if>
+            <if test="sex != null">#{sex},
+            </if>
+            <if test="address != null">#{address},
+            </if>
+            <if test="patientType != null">#{patientType},
+            </if>
+            <if test="signStatus != null">#{signStatus},
+            </if>
+            <if test="signPatientRecordId != null">#{signPatientRecordId},
+            </if>
+            <if test="serviceStatus != null">#{serviceStatus},
+            </if>
+            <if test="signTime != null">#{signTime},
+            </if>
+            <if test="visitMethod != null">#{visitMethod},
+            </if>
+            <if test="attendingPhysicianId != null">#{attendingPhysicianId},
+            </if>
+            <if test="attendingPhysicianName != null">#{attendingPhysicianName},
+            </if>
+            <if test="mainDiagnosis != null">#{mainDiagnosis},
+            </if>
+            <if test="hospitalAgencyId != null">#{hospitalAgencyId},
+            </if>
+            <if test="hospitalAgencyName != null">#{hospitalAgencyName},
+            </if>
+            <if test="campusAgencyId != null">#{campusAgencyId},
+            </if>
+            <if test="campusAgencyName != null">#{campusAgencyName},
+            </if>
+            <if test="departmentId != null">#{departmentId},
+            </if>
+            <if test="departmentName != null">#{departmentName},
+            </if>
+            <if test="wardId != null">#{wardId},
+            </if>
+            <if test="wardName != null">#{wardName},
+            </if>
+            <if test="responsibleNurse != null">#{responsibleNurse},
+            </if>
+            <if test="patientVisitRecordId != null">#{patientVisitRecordId},
+            </if>
+            <if test="visitSerialNumber != null">#{visitSerialNumber},
+            </if>
+            <if test="admissionTime != null">#{admissionTime},
+            </if>
+            <if test="dischargeTime != null">#{dischargeTime},
+            </if>
+            <if test="patientPreHospitalizationId != null">
+                #{patientPreHospitalizationId},
+            </if>
+            <if test="appointmentTreatmentGroup != null">#{appointmentTreatmentGroup},
+            </if>
+            <if test="registrationNo != null">#{registrationNo},
+            </if>
+            <if test="registrationDate != null">#{registrationDate},
+            </if>
+            <if test="appointmentDate != null">#{appointmentDate},
+            </if>
+            <if test="inHospitalNumber != null">#{inHospitalNumber},
+            </if>
+            <if test="visitDate != null">#{visitDate},
+            </if>
+            <if test="dischargeMethod != null">#{dischargeMethod},
+            </if>
+            <if test="patientSource != null">#{patientSource},
+            </if>
+            <if test="surgicalName != null">#{surgicalName},
+            </if>
+            <if test="delFlag != null">#{delFlag},
+            </if>
+            <if test="createBy != null">#{createBy},
+            </if>
+            <if test="createTime != null">#{createTime},
+            </if>
+            <if test="updateBy != null">#{updateBy},
+            </if>
+            <if test="updateTime != null">#{updateTime},
+            </if>
+        </trim>
+    </insert>
 
-	<update id="updatePatientInfoSelective" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo">
-		update patient_info
-		<trim prefix="SET" suffixOverrides=",">
-			<if test="residentId != null">
-				resident_id = #{residentId},
-			</if>
-			<if test="patientName != null">
-		    patient_name = #{patientName},
-			</if>
-			<if test="patientPhone != null">
-		    patient_phone = #{patientPhone},
-			</if>
-			<if test="familyMemberPhone != null">
-		    family_member_phone = #{familyMemberPhone},
-			</if>
-			<if test="birthDate != null">
-		    birth_date = #{birthDate},
-			</if>
-			<if test="cardNo != null">
-		    card_no = #{cardNo},
-			</if>
-			<if test="sex != null">
-		    sex = #{sex},
-			</if>
-			<if test="address != null">
-		    address = #{address},
-			</if>
-			<if test="patientType != null">
-		    patient_type = #{patientType},
-			</if>
-			<if test="signStatus != null">sign_status =
-				#{signStatus},
-			</if>
-			<if test="signPatientRecordId != null">sign_patient_record_id = #{signPatientRecordId},
-			</if>
-			<if test="serviceStatus != null">service_status = #{serviceStatus},
-			</if>
-			<if test="signTime != null">sign_time =
-				#{signTime},
-			</if>
-			<if test="visitMethod != null">visit_method =
-				#{visitMethod},
-			</if>
-			<if test="attendingPhysicianId != null">attending_physician_id =
-				#{attendingPhysicianId},
-			</if>
-			<if test="attendingPhysicianName != null">attending_physician_name =
-				#{attendingPhysicianName},
-			</if>
-			<if test="mainDiagnosis != null">main_diagnosis =
-				#{mainDiagnosis},
-			</if>
-			<if test="hospitalAgencyId != null">hospital_agency_id =
-				#{hospitalAgencyId},
-			</if>
-			<if test="hospitalAgencyName != null">hospital_agency_name =
-				#{hospitalAgencyName},
-			</if>
-			<if test="campusAgencyId != null">campus_agency_id =
-				#{campusAgencyId},
-			</if>
-			<if test="campusAgencyName != null">campus_agency_name =
-				#{campusAgencyName},
-			</if>
-			<if test="departmentId != null">department_id =
-				#{departmentId},
-			</if>
-			<if test="departmentName != null">department_name =
-				#{departmentName},
-			</if>
-			<if test="wardId != null">ward_id =
-				#{wardId},
-			</if>
-			<if test="wardName != null">ward_name =
-				#{wardName},
-			</if>
-			<if test="responsibleNurse != null">responsible_nurse =
-				#{responsibleNurse},
-			</if>
-			<if test="patientVisitRecordId != null">patient_visit_record_id =
-				#{patientVisitRecordId},
-			</if>
-			<if test="visitSerialNumber != null">visit_serial_number =
-				#{visitSerialNumber},
-			</if>
-			<if test="admissionTime != null">
-				admission_time = #{admissionTime},
-			</if>
-			<if test="dischargeTime != null">
-				discharge_time = #{dischargeTime},
-			</if>
-			<if test="patientPreHospitalizationId != null">
-				patient_pre_hospitalization_id = #{patientPreHospitalizationId},
-			</if>
-			<if test="appointmentTreatmentGroup != null">appointment_treatment_group =
-				#{appointmentTreatmentGroup},
-			</if>
-			<if test="registrationNo != null">registration_no =
-				#{registrationNo},
-			</if>
-			<if test="registrationDate != null">registration_date =
-				#{registrationDate},
-			</if>
-			<if test="appointmentDate != null">appointment_date =
-				#{appointmentDate},
-			</if>
-			<if test="inHospitalNumber != null">in_hospital_number =
-				#{inHospitalNumber},
-			</if>
-			<if test="visitDate != null">visit_date =
-				#{visitDate},
-			</if>
-			<if test="dischargeMethod != null">discharge_method =
-				#{dischargeMethod},
-			</if>
-			<if test="patientSource != null">patient_source =
-				#{patientSource},
-			</if>
-			<if test="surgicalName != null">surgical_name =
-		    	#{surgicalName},
-			</if>
-			<if test="delFlag != null">del_flag =
-				#{delFlag},
-			</if>
-			<if test="createBy != null">create_by =
-				#{createBy},
-			</if>
-			<if test="createTime != null">create_time =
-				#{createTime},
-			</if>
-			<if test="updateBy != null">update_by =
-				#{updateBy},
-			</if>
-			<if test="updateTime != null">update_time =
-				#{updateTime},
-			</if>
-		</trim>
-		where id = #{id}
-	</update>
+    <update id="updatePatientInfoSelective" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo">
+        update patient_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="residentId != null">
+                resident_id = #{residentId},
+            </if>
+            <if test="patientName != null">
+                patient_name = #{patientName},
+            </if>
+            <if test="patientPhone != null">
+                patient_phone = #{patientPhone},
+            </if>
+            <if test="familyMemberPhone != null">
+                family_member_phone = #{familyMemberPhone},
+            </if>
+            <if test="birthDate != null">
+                birth_date = #{birthDate},
+            </if>
+            <if test="cardNo != null">
+                card_no = #{cardNo},
+            </if>
+            <if test="sex != null">
+                sex = #{sex},
+            </if>
+            <if test="address != null">
+                address = #{address},
+            </if>
+            <if test="patientType != null">
+                patient_type = #{patientType},
+            </if>
+            <if test="signStatus != null">sign_status =
+                #{signStatus},
+            </if>
+            <if test="signPatientRecordId != null">sign_patient_record_id = #{signPatientRecordId},
+            </if>
+            <if test="serviceStatus != null">service_status = #{serviceStatus},
+            </if>
+            <if test="signTime != null">sign_time =
+                #{signTime},
+            </if>
+            <if test="visitMethod != null">visit_method =
+                #{visitMethod},
+            </if>
+            <if test="attendingPhysicianId != null">attending_physician_id =
+                #{attendingPhysicianId},
+            </if>
+            <if test="attendingPhysicianName != null">attending_physician_name =
+                #{attendingPhysicianName},
+            </if>
+            <if test="mainDiagnosis != null">main_diagnosis =
+                #{mainDiagnosis},
+            </if>
+            <if test="hospitalAgencyId != null">hospital_agency_id =
+                #{hospitalAgencyId},
+            </if>
+            <if test="hospitalAgencyName != null">hospital_agency_name =
+                #{hospitalAgencyName},
+            </if>
+            <if test="campusAgencyId != null">campus_agency_id =
+                #{campusAgencyId},
+            </if>
+            <if test="campusAgencyName != null">campus_agency_name =
+                #{campusAgencyName},
+            </if>
+            <if test="departmentId != null">department_id =
+                #{departmentId},
+            </if>
+            <if test="departmentName != null">department_name =
+                #{departmentName},
+            </if>
+            <if test="wardId != null">ward_id =
+                #{wardId},
+            </if>
+            <if test="wardName != null">ward_name =
+                #{wardName},
+            </if>
+            <if test="responsibleNurse != null">responsible_nurse =
+                #{responsibleNurse},
+            </if>
+            <if test="patientVisitRecordId != null">patient_visit_record_id =
+                #{patientVisitRecordId},
+            </if>
+            <if test="visitSerialNumber != null">visit_serial_number =
+                #{visitSerialNumber},
+            </if>
+            <if test="admissionTime != null">
+                admission_time = #{admissionTime},
+            </if>
+            <if test="dischargeTime != null">
+                discharge_time = #{dischargeTime},
+            </if>
+            <if test="patientPreHospitalizationId != null">
+                patient_pre_hospitalization_id = #{patientPreHospitalizationId},
+            </if>
+            <if test="appointmentTreatmentGroup != null">appointment_treatment_group =
+                #{appointmentTreatmentGroup},
+            </if>
+            <if test="registrationNo != null">registration_no =
+                #{registrationNo},
+            </if>
+            <if test="registrationDate != null">registration_date =
+                #{registrationDate},
+            </if>
+            <if test="appointmentDate != null">appointment_date =
+                #{appointmentDate},
+            </if>
+            <if test="inHospitalNumber != null">in_hospital_number =
+                #{inHospitalNumber},
+            </if>
+            <if test="visitDate != null">visit_date =
+                #{visitDate},
+            </if>
+            <if test="dischargeMethod != null">discharge_method =
+                #{dischargeMethod},
+            </if>
+            <if test="patientSource != null">patient_source =
+                #{patientSource},
+            </if>
+            <if test="surgicalName != null">surgical_name =
+                #{surgicalName},
+            </if>
+            <if test="delFlag != null">del_flag =
+                #{delFlag},
+            </if>
+            <if test="createBy != null">create_by =
+                #{createBy},
+            </if>
+            <if test="createTime != null">create_time =
+                #{createTime},
+            </if>
+            <if test="updateBy != null">update_by =
+                #{updateBy},
+            </if>
+            <if test="updateTime != null">update_time =
+                #{updateTime},
+            </if>
+        </trim>
+        where id = #{id}
+    </update>
 
-	<update id="updatePatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo">
-		update patient_info
-		set resident_id                    = #{residentId},
-		    patient_name                   = #{patientName},
-		    patient_phone                  = #{patientPhone},
-		    family_member_phone            = #{familyMemberPhone},
-		    birth_date                     = #{birthDate},
-		    card_no                        = #{cardNo},
-		    sex                            = #{sex},
-		    address                        = #{address},
-		    patient_type                   = #{patientType},
-		    sign_status                    = #{signStatus},
-		    sign_patient_record_id         = #{signPatientRecordId},
-		    service_status                 = #{serviceStatus},
-		    sign_time                      = #{signTime},
-		    visit_method                   = #{visitMethod},
-		    attending_physician_id         = #{attendingPhysicianId},
-		    attending_physician_name       = #{attendingPhysicianName},
-		    main_diagnosis                 = #{mainDiagnosis},
-		    hospital_agency_id             = #{hospitalAgencyId},
-		    hospital_agency_name           = #{hospitalAgencyName},
-		    campus_agency_id               = #{campusAgencyId},
-		    campus_agency_name             = #{campusAgencyName},
-		    department_id                  = #{departmentId},
-		    department_name                = #{departmentName},
-		    ward_id                        = #{wardId},
-		    ward_name                      = #{wardName},
-		    responsible_nurse              = #{responsibleNurse},
-		    patient_visit_record_id        = #{patientVisitRecordId},
-		    visit_serial_number            = #{visitSerialNumber},
-		    admission_time                 = #{admissionTime},
-		    discharge_time                 = #{dischargeTime},
-		    patient_pre_hospitalization_id = #{patientPreHospitalizationId},
-		    appointment_treatment_group    = #{appointmentTreatmentGroup},
-		    registration_no                = #{registrationNo},
-		    registration_date              = #{registrationDate},
-		    appointment_date               = #{appointmentDate},
-		    in_hospital_number             = #{inHospitalNumber},
-		    visit_date                     = #{visitDate},
-		    discharge_method               = #{dischargeMethod},
-		    patient_source                 = #{patientSource},
-		    surgical_name                  = #{surgicalName},
-		    del_flag                       = #{delFlag},
-		    create_by                      = #{createBy},
-		    create_time                    = #{createTime},
-		    update_by                      = #{updateBy},
-		    update_time                    = #{updateTime}
-		where id = #{id}
-	</update>
+    <update id="updatePatientInfo" parameterType="com.xinelu.manage.domain.patientinfo.PatientInfo">
+        update patient_info
+        set resident_id                    = #{residentId},
+            patient_name                   = #{patientName},
+            patient_phone                  = #{patientPhone},
+            family_member_phone            = #{familyMemberPhone},
+            birth_date                     = #{birthDate},
+            card_no                        = #{cardNo},
+            sex                            = #{sex},
+            address                        = #{address},
+            patient_type                   = #{patientType},
+            sign_status                    = #{signStatus},
+            sign_patient_record_id         = #{signPatientRecordId},
+            service_status                 = #{serviceStatus},
+            sign_time                      = #{signTime},
+            visit_method                   = #{visitMethod},
+            attending_physician_id         = #{attendingPhysicianId},
+            attending_physician_name       = #{attendingPhysicianName},
+            main_diagnosis                 = #{mainDiagnosis},
+            hospital_agency_id             = #{hospitalAgencyId},
+            hospital_agency_name           = #{hospitalAgencyName},
+            campus_agency_id               = #{campusAgencyId},
+            campus_agency_name             = #{campusAgencyName},
+            department_id                  = #{departmentId},
+            department_name                = #{departmentName},
+            ward_id                        = #{wardId},
+            ward_name                      = #{wardName},
+            responsible_nurse              = #{responsibleNurse},
+            patient_visit_record_id        = #{patientVisitRecordId},
+            visit_serial_number            = #{visitSerialNumber},
+            admission_time                 = #{admissionTime},
+            discharge_time                 = #{dischargeTime},
+            patient_pre_hospitalization_id = #{patientPreHospitalizationId},
+            appointment_treatment_group    = #{appointmentTreatmentGroup},
+            registration_no                = #{registrationNo},
+            registration_date              = #{registrationDate},
+            appointment_date               = #{appointmentDate},
+            in_hospital_number             = #{inHospitalNumber},
+            visit_date                     = #{visitDate},
+            discharge_method               = #{dischargeMethod},
+            patient_source                 = #{patientSource},
+            surgical_name                  = #{surgicalName},
+            del_flag                       = #{delFlag},
+            create_by                      = #{createBy},
+            create_time                    = #{createTime},
+            update_by                      = #{updateBy},
+            update_time                    = #{updateTime}
+        where id = #{id}
+    </update>
     <update id="deletePatientInfoById" parameterType="Long">
-		update patient_info set del_flag = 1
-		where id = #{id}
-	</update>
+        update patient_info
+        set del_flag = 1
+        where id = #{id}
+    </update>
 
     <update id="deletePatientInfoByIds" parameterType="String">
         update patient_info set del_flag = 1 where id in
@@ -694,19 +737,19 @@
     <select id="getPatientInfoByOpenId" parameterType="string" resultType="ResidentInfo">
         SELECT
         id,
-		patient_name,
-		patient_phone,
-		family_member_phone,
-		birth_date,
+        patient_name,
+        patient_phone,
+        family_member_phone,
+        birth_date,
         card_no,
-		sex,
+        sex,
         address,
-		open_id,
-		union_id,
-		official_account_openid,
-		avatar_picture_url
+        open_id,
+        union_id,
+        official_account_openid,
+        avatar_picture_url
         FROM
-		resident_info
+        resident_info
         <where>
             del_flag = 0
             <if test="openId != null and openId != ''">
@@ -721,28 +764,36 @@
         from patient_info
         where
         del_flag = 0
-        and create_time >= #{firstDay}
-        and create_time &lt;= #{now}
+        <if test="firstDay != null">
+            and create_time >= #{firstDay}
+        </if>
+        <if test="firstDay != null">
+            and create_time &lt;= #{now}
+        </if>
     </select>
 
-	<select id="selectPatientInfoCountBySignTime" resultType="java.lang.Integer">
-		select
-			count(1)
-		from patient_info
-		where
-			del_flag = 0
-		  and sign_time >= #{firstDay}
-		  and sign_time &lt;= #{now}
-	</select>
+    <select id="selectPatientInfoCountBySignTime" resultType="java.lang.Integer">
+        select
+        count(1)
+        from patient_info
+        where
+        del_flag = 0
+        <if test="firstDay != null">
+            and sign_time >= #{firstDay}
+        </if>
+        <if test="firstDay != null">
+            and sign_time &lt;= #{now}
+        </if>
+    </select>
 
-	<select id="selectPatientSignTotalCount" resultType="java.lang.Integer">
+    <select id="selectPatientSignTotalCount" resultType="java.lang.Integer">
         select count(1)
         from patient_info
         where del_flag = 0
           and (service_status = 'SERVICE_CENTER' or service_status = 'SERVICE_END')
     </select>
 
-	<select id="selectPatientSignServiceCount" resultType="java.lang.Integer">
+    <select id="selectPatientSignServiceCount" resultType="java.lang.Integer">
         select count(1)
         from patient_info
         where del_flag = 0
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 fdb8cbec..3521e4ce 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroute/SignPatientManageRouteMapper.xml
@@ -345,9 +345,9 @@
         LEFT JOIN patient_visit_record pvr ON pi.patient_visit_record_id = pvr.id
         <where>
             pi.del_flag = 0
+            and spmrn.phone_push_sign = 1
             AND spmrn.route_check_status = 'AGREE'
             AND spmrn.task_node_type in ('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE')
-            AND spmrn.phone_dial_method = 'COMMON'
             <if test="patientName != null and patientName != ''">
                 AND pi.patient_name LIKE concat('%', #{patientName}, '%')
             </if>
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
index a1da8194..2c4362aa 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml
@@ -943,7 +943,7 @@
         select count(1)
         from sign_patient_manage_route_node
         where del_flag = 0
-          and phone_push_sign = 0
+          and phone_push_sign = 1
           and create_time >= #{firstDay}
           and create_time &lt;= #{now}
     </select>
@@ -963,4 +963,19 @@
             OR official_push_sign =#{appletPushSign})
         </if>
     </select>
+
+    <select id="selectNodeExecuteStatus" resultType="com.xinelu.manage.vo.homepage.PatientAndNode">
+        SELECT spmrn.id signPatientManageRouteNodeIds,
+               spmrn.node_execute_status,
+               pi.discharge_time,
+               pi.visit_date,
+               spmrn.route_node_day
+        from sign_patient_manage_route_node spmrn
+                 LEFT JOIN sign_patient_manage_route spmr on spmr.id = spmrn.manage_route_id
+                 LEFT JOIN patient_info pi ON pi.id = spmr.patient_id
+        where pi.del_flag = 0
+          and spmrn.phone_push_sign = 1
+          AND spmrn.route_check_status = 'AGREE'
+          AND spmrn.task_node_type in ('PHONE_OUTBOUND','QUESTIONNAIRE_SCALE')
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml
index 50147636..d3f55192 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientrecord/SignPatientRecordMapper.xml
@@ -523,4 +523,29 @@
 		select id, patient_id, intentional_source ,intentional_time, billing_doctor_id, billing_doctor_name
 		from sign_patient_record where id = #{id}
 	</select>
+
+    <select id="selectCheckStatus" resultType="java.lang.Integer">
+        SELECT COUNT(1)
+        from sign_patient_record spr
+        left join patient_info pi on pi.sign_patient_record_id = spr.id
+        <where>
+            spr.del_flag = 0 and pi.del_flag = 0
+            <if test="serviceStatus != null">
+                and pi.service_status = #{serviceStatus}
+            </if>
+            <choose>
+                <when test="routeCheckStatus != null and routeCheckStatus == 'UNAUDITED'.toString()">
+                    and (spr.route_check_status is null or spr.portait_check_status is null)
+                </when>
+                <when test="routeCheckStatus != null and routeCheckStatus == 'AGREE'.toString()">
+                    and spr.route_check_status = #{routeCheckStatus} and spr.portait_check_status =
+                    #{routeCheckStatus}
+                </when>
+                <when test="routeCheckStatus != null and routeCheckStatus == 'DISAGREE'.toString()">
+                    and (spr.route_check_status = #{routeCheckStatus} or spr.portait_check_status =
+                    #{routeCheckStatus})
+                </when>
+            </choose>
+        </where>
+    </select>
 </mapper>