Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r40444 -r40463
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40444)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40463)
@@ -1217,7 +1217,11 @@
 				if(StringUtils.isNotBlank(recyclingApplication.getUseRecord().getOperationRoom())){
 					useRecordSql = " and po.useRecord.operationRoom = '" + recyclingApplication.getUseRecord().getOperationRoom() + "' ";
 				}else if(allowUseReordToApplicationMergeWhenOperationRoomIsBlank){
+					//当手术间为空时，允许合并申请单，合并到手术间为空的申请单上
 					useRecordSql = " and (po.useRecord.operationRoom='' or po.useRecord.operationRoom is null)";
+				}else{
+					//当手术间为空时，不允许合并申请单
+					useRecordSql = " and 1 = 0 ";
 				}
 			}else if(StringUtils.equals(useRecordConvertRecyclingApplicationMergeRegular, "depart")){
 				useRecordSql = " and po.useRecord.departCoding = '" + recyclingApplication.getUseRecord().getDepartCoding() + "'";