From 0438ebe861c81968f7111a85a1861d612b2c5d92 Mon Sep 17 00:00:00 2001
From: haown <454902499@qq.com>
Date: Tue, 6 Aug 2024 17:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=82=A3=E8=80=85=E6=A1=A3?=
 =?UTF-8?q?=E6=A1=88=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/manage/patientinfo/PatientInfoMapper.xml  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 1ba7d131..1e514639 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/patientinfo/PatientInfoMapper.xml
@@ -171,22 +171,22 @@
 
 	<select id="getPatientList" parameterType="com.xinelu.manage.dto.patientinfo.PatientInfoDto"
 		resultType="com.xinelu.manage.vo.patientinfo.PatientInfoVo">
-		select p.*, count(p.manage_route_id) as taskNum, SUM(p.task_finish_status) as taskFinishNum, SUM(p.task_execute_status) as taskExecuteNum,
-		ROUND(SUM(p.task_finish_status) / count(p.id) * 100, 2) as taskFinishRate,
-		ROUND(SUM(p.task_execute_status) / count(p.id) * 100, 2) as taskExecuteRate
+		select p.*, count(p.manage_route_node_id) as taskNum, SUM(p.task_finish_status) as taskFinishNum, SUM(p.task_execute_status) as taskExecuteNum,
+		ROUND(SUM(p.task_finish_status) / count(p.manage_route_node_id) * 100, 2) as taskFinishRate,
+		ROUND(SUM(p.task_execute_status) / count(p.manage_route_node_id) * 100, 2) as taskExecuteRate
 		from
 		patient_task_view p
 		<where>
 			<if test="residentId != null">
 				and p.resident_id = #{residentId}
 			</if>
-			<if test="patientName != null  and patientName != ''">
+			<if test="patientName != null and patientName != ''">
 				and p.patient_name = #{patientName}
 			</if>
-			<if test="patientPhone != null  and patientPhone != ''">
+			<if test="patientPhone != null and patientPhone != ''">
 				and p.patient_phone like concat('%', #{patientPhone}, '%')
 			</if>
-			<if test="cardNo != null  and cardNo != ''">
+			<if test="cardNo != null and cardNo != ''">
 				and p.card_no = #{cardNo}
 			</if>
 			<if test="patientType != null  and patientType != ''">