Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r37651 -r37662
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 37651)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 37662)
@@ -7336,9 +7336,10 @@
 						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@circuitNurse") != -1
 						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@patientName") != -1
 						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@useRecordRemark") != -1
-						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@hospitalNumber") != -1){
+						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@hospitalNumber") != -1
+						|| useRecordMergeConvertRecyclingApplicationRemark.indexOf("@operationRoom") != -1){
 					for (UseRecord useRecord : useRecordList) {
-						//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
+						//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount @operationRoom
 						if(StringUtils.isNotBlank(RecyclingApplicationUtils.getCircuitNurseLabelName())){
 							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", RecyclingApplicationUtils.getCircuitNurseLabelName());
 						}else{
@@ -7364,6 +7365,11 @@
 						}else{
 							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@hospitalNumber", "");
 						}
+						if(StringUtils.isNotBlank(useRecord.getOperationRoom())){
+							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", useRecord.getOperationRoom());
+						}else{
+							useRecordMergeConvertRecyclingApplicationRemark = useRecordMergeConvertRecyclingApplicationRemark.replace("@operationRoom", "");
+						}
 						remarks.add(useRecordMergeConvertRecyclingApplicationRemark);
 					}
 				}