Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r27429 -r27430
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27429)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 27430)
@@ -2995,7 +2995,7 @@
 				//只有当使用记录的数量为1且使用记录的手术间不为空时才按手术间进行合并
 				if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM.equals(useRecordConvertRecyclingApplicationMergeRegular) 
 						&& useRecordList.size() == 1
-						&& ((StringUtils.isNotBlank(operationRoom) && !allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
+						&& (StringUtils.isNotBlank(operationRoom)
 								|| (StringUtils.isBlank(operationRoom) && allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
 								)){
 					String operationRoomSql = null;
@@ -3330,7 +3330,7 @@
 				//只有当使用记录的数量为1且使用记录的手术间不为空时才按手术间进行合并
 				if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM.equals(useRecordConvertRecyclingApplicationMergeRegular)
 						&& useRecordList.size() == 1
-						&& ((StringUtils.isNotBlank(operationRoom) && !allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
+						&& (StringUtils.isNotBlank(operationRoom)
 								|| (StringUtils.isBlank(operationRoom) && allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
 								)){
 					String operationRoomSql = null;
@@ -3662,7 +3662,7 @@
 			//只有当使用记录的数量为1且使用记录的手术间不为空时才按手术间进行合并
 			if(UseRecord.CONVERT_RECYCLINGMANAGER_MERGE_REGULAR_OPERATIONROOM.equals(useRecordConvertRecyclingApplicationMergeRegular)
 					&& useRecordList.size() == 1
-					&& ((StringUtils.isNotBlank(operationRoom) && !allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
+					&& (StringUtils.isNotBlank(operationRoom)
 							|| (StringUtils.isBlank(operationRoom) && allowUseReordToApplicationMergeWhenOperationRoomIsBlank)
 							)){
 				String operationRoomSql = null;