Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java
===================================================================
diff -u -r34687 -r34696
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34687)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/device/consumptivematerial/controller/SteriConsumeMaterialUseRecordController.java	(.../SteriConsumeMaterialUseRecordController.java)	(revision 34696)
@@ -78,6 +78,7 @@
 			String sterilizationRecordSql = "";
 			if(DatabaseUtil.isPoIdValid(sterilizerId)){
 				sterilizationRecordSql += " and sr.sterilizer_id = " + sterilizerId;
+				fromSql += " and po.sterilizerName in (select name from " + Sterilizer.class.getSimpleName() + " where id = " + sterilizerId + ") ";
 			}
 			if(StringUtils.isNotBlank(beginDateTime) && StringUtils.isNotBlank(endDateTime)){
 				sterilizationRecordSql += " and " + dateQueryAdapter.dateAreaSql("sr.startDate", beginDateTime, endDateTime, true);
@@ -109,9 +110,6 @@
 						disposableGoodsId);
 			}
 			
-			if(StringUtils.isNotBlank(sterilizationRecordSql)){
-				fromSql += String.format(" and po.sterilizationRecordId in (%s)", sterilizationRecordSql);
-			}
 			if(StringUtils.isNotBlank(disposableGoodsSql)){
 				fromSql += String.format(" and po.id in (%s)", disposableGoodsSql);
 			}
@@ -133,7 +131,6 @@
 				}else if(dbConnection.isOracle()){
 					querySql += orderSql;
 					querySql = getOracleIDQuerySqlByPage(querySql, start, limit);
-					
 				}
 				
 				String sql = String.format("select urd.isDisable,ur.id useRecordId, ur.sterilizationRecordId "
@@ -171,8 +168,10 @@
 						if(vo == null){
 							vo = new SteriConsumeMaterialUseRecordVo();
 							vo.setId(useRecordId);
-							vo.setSterilizationStartDate(rs.getTimestamp("sterilizationStartDate"));
 							vo.setSterilizationStartDate(rs.getTimestamp("startDate"));
+							if(vo.getSterilizationStartDate() == null){
+								vo.setSterilizationStartDate(rs.getTimestamp("sterilizationStartDate"));
+							}
 							vo.setSterilizationUser(rs.getString("sterilizationUserSr"));
 							if(StringUtils.isBlank(vo.getSterilizationUser())){
 								vo.setSterilizationUser(rs.getString("sterilizationUserUr"));