|
|
@@ -309,7 +309,7 @@
|
|
|
<where>
|
|
|
c.finished = 1
|
|
|
<if test="query.undoTime != null and query.undoTime.size ==1">
|
|
|
- and undo_time > #{query.timeRange[0]}
|
|
|
+ and undo_time > #{query.undoTime[0]}
|
|
|
</if>
|
|
|
<if test="query.undoTime != null and query.undoTime.size > 1">
|
|
|
and undo_time > #{query.undoTime[0]} and c.undo_time < #{query.undoTime[1]}
|
|
|
@@ -320,9 +320,9 @@
|
|
|
<if test="query.bedNo!=null and query.bedNo!=''">
|
|
|
and bed_no like concat('%',#{query.bedNo},'%')
|
|
|
</if>
|
|
|
- <if test="query.ward != null and query.ward.size > 0">
|
|
|
+ <if test="query.wards != null and query.wards.size > 0">
|
|
|
and c.ward in
|
|
|
- <foreach item="w" index="index" collection="query.ward" open="(" separator="," close=")">
|
|
|
+ <foreach item="w" index="index" collection="query.wards" open="(" separator="," close=")">
|
|
|
#{w, jdbcType=VARCHAR}
|
|
|
</foreach>
|
|
|
</if>
|