Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r40463 -r40465
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40463)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 40465)
@@ -1221,12 +1221,13 @@
 					useRecordSql = " and (po.useRecord.operationRoom='' or po.useRecord.operationRoom is null)";
 				}else{
 					//当手术间为空时，不允许合并申请单
-					useRecordSql = " and 1 = 0 ";
+					return null;
 				}
 			}else if(StringUtils.equals(useRecordConvertRecyclingApplicationMergeRegular, "depart")){
 				useRecordSql = " and po.useRecord.departCoding = '" + recyclingApplication.getUseRecord().getDepartCoding() + "'";
 			}else{
-				useRecordSql = " and po.useRecord.id = " + recyclingApplication.getUseRecord().getId();
+				//不合并申请单
+				return null;
 			}
 			// 使用记录转换申请单时，不进行申请单合并的科室编码
 			String useRecordConvertRecyclingApplicationNotMergeDeptCodes =