Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r27430 -r27431
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27430)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27431)
@@ -3000,9 +3000,9 @@
 								)){
 					String operationRoomSql = null;
 					if(StringUtils.isNotBlank(operationRoom)){
-						operationRoomSql = "and operationRoom='"+ operationRoom +"' ";
+						operationRoomSql = " and operationRoom='"+ operationRoom +"' ";
 					}else{
-						operationRoomSql = "";
+						operationRoomSql = " and (operationRoom='' or operationRoom is null)";
 					}
 					//如果条件1为不需要发货或条件2中没有要发货的物品,则只查询发货状态为null的物品;否则查询待发货的单
 					String deliverStatusCondition = needInvoiceForUseRecordOfDepart && includeNeedInvoiceItemsForUseRecord 
@@ -3337,7 +3337,7 @@
 					if(StringUtils.isNotBlank(operationRoom)){
 						operationRoomSql = "and operationRoom='"+ operationRoom +"' ";
 					}else{
-						operationRoomSql = "";
+						operationRoomSql = "and (operationRoom='' or operationRoom is null)";
 					}
 					//查询该科室的手术间与当前使用记录的手术单相同的申请单
 					//如果条件1为不需要发货或条件2中没有要发货的物品,则只查询发货状态为null的物品;否则查询待发货的单
@@ -3669,7 +3669,7 @@
 				if(StringUtils.isNotBlank(operationRoom)){
 					operationRoomSql = "and operationRoom='"+ operationRoom +"' ";
 				}else{
-					operationRoomSql = "";
+					operationRoomSql = "and (operationRoom='' or operationRoom is null)";
 				}
 				//查询该科室的手术间与当前使用记录的手术单相同的申请单(且还未回收)
 				//如果条件1为不需要发货或条件2中没有要发货的物品,则只查询发货状态为null的物品;否则查询待发货的单