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 - + - - ${sql} - - - - and deptCode in - - #{item} - - + + ${sql} + + + + and deptCode in + + #{item} + + - - and deptName in - - #{item} - - and deptName is not null - - + + and deptName in + + #{item} + + and deptName is not null + + - + order by deptCode