From c183879f41ce6679018ba2bb5f463b8bee09e0d7 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 7 Apr 2021 18:11:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=BD=92=E6=A1=A3=E7=8E=87?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/V_CountMapper.xml | 44 ++++++++++-----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/main/resources/mapper/V_CountMapper.xml b/src/main/resources/mapper/V_CountMapper.xml
index 2609284..e7240a6 100644
--- a/src/main/resources/mapper/V_CountMapper.xml
+++ b/src/main/resources/mapper/V_CountMapper.xml
@@ -34,7 +34,7 @@
 			)
 		END fileRate,
 		CASE
-	WHEN t2.fileNum - ISNULL(t4.deathNum, 0) = 0 THEN
+	WHEN (t5.Num - ISNULL(t4.deathNum, 0)) <= 0 THEN
 		0
 	ELSE
 		ROUND(
@@ -49,7 +49,7 @@
 		)
 	END day2Rate,
         CASE
-    WHEN t2.fileNum - ISNULL(t4.deathNum, 0) = 0 THEN
+    WHEN (t6.Num - ISNULL(t4.deathNum, 0)) <= 0 THEN
         0
     ELSE
         ROUND(
@@ -175,31 +175,31 @@
     left join (SELECT code,Name FROM emr_dictionary where parent_id = 'dept_code') as t8 on c.dept_name=t8.code
     ) v_count where 1=1
     <!--<if test="deptCode != null and deptCode!=''">-->
-      <!--and deptCode = #{deptCode,jdbcType=NVARCHAR}-->
+    <!--and deptCode = #{deptCode,jdbcType=NVARCHAR}-->
     <!--</if>-->
     <choose>
-        <when test="sql != null and sql != ''">
-            ${sql}
-        </when>
-        <otherwise>
-            <if test="deptCode != null and deptCode!=''">
-              and deptCode in
-              <foreach item="item" collection="deptCode.split(',')" open="(" separator="," close=")">
-                #{item}
-              </foreach>
-            </if>
+      <when test="sql != null and sql != ''">
+        ${sql}
+      </when>
+      <otherwise>
+        <if test="deptCode != null and deptCode!=''">
+          and deptCode in
+          <foreach item="item" collection="deptCode.split(',')" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+        </if>
 
-            <if test="deptName != null and deptName!=''">
-              and deptName in
-              <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
-                #{item}
-              </foreach>
-              and deptName is not null
-            </if>
-        </otherwise>
+        <if test="deptName != null and deptName!=''">
+          and deptName in
+          <foreach item="item" collection="deptName.split(',')" open="(" separator="," close=")">
+            #{item}
+          </foreach>
+          and deptName is not null
+        </if>
+      </otherwise>
     </choose>
     <!--<if test="deptName != null and deptName!=''">-->
-      <!--and deptName = #{deptName,jdbcType=NVARCHAR}-->
+    <!--and deptName = #{deptName,jdbcType=NVARCHAR}-->
     <!--</if>-->
     order by deptCode
   </select>