Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java =================================================================== diff -u -r31518 -r34227 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java (.../XinHua_ChangLongDataImpl.java) (revision 31518) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/service/XinHua_ChangLongDataImpl.java (.../XinHua_ChangLongDataImpl.java) (revision 34227) @@ -357,7 +357,7 @@ " from %s po "+ " inner join Rinser rs on po.rinserId = rs.id "+ " inner join DeviceInterface di on rs.deviceInterface_id = di.id "+ - " where rs.machineNumber = %s and di.deviceBrand = '%s' and di.deviceModel = '%s'" + " where rs.machineNumber = '%s' and di.deviceBrand = '%s' and di.deviceModel = '%s'" + " and (po.washStatus = '%s' or (po.washStatus = '%s' and po.WashDataAmount < 1 ))", startTimeStrSql,WashAndDisinfectRecord.class.getSimpleName(),machineNo,brand,deviceModel, WashAndDisinfectRecord.STATUS_WASHING,WashAndDisinfectRecord.STATUS_WASHED