|
@@ -67,7 +67,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND v.physician like concat('%', #{physician}, '%')
|
|
|
</if>
|
|
|
<if test="deptId !=null and deptId != 0">
|
|
|
- AND (v.dept_id = #{deptId} AND v.dept_id IN (SELECT s.dept_id FROM sys_dept s WHERE find_in_set( #{deptId}, dept_id )))
|
|
|
+ AND (v.dept_id = #{deptId} OR v.dept_id IN (SELECT s.dept_id FROM sys_dept s WHERE s.parent_id in (SELECT s.dept_id FROM sys_dept s WHERE find_in_set( #{deptId}, parent_id ))))
|
|
|
</if>
|
|
|
<if test="startTime!=null and endTime!=null ">
|
|
|
AND v.discharge_time BETWEEN #{startTime} AND DATE_ADD(#{endTime},INTERVAL 1 day)
|