Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
===================================================================
diff -u -r31179 -r37657
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 31179)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 37657)
@@ -893,14 +893,14 @@
 	 * @param objectDao
 	 * @return
 	 */
-	@SuppressWarnings("unchecked")
 	public static String getRemarkByUseRecordAndProjectConfig(@SuppressWarnings("rawtypes") Map applyTousseMap ,List<UseRecord> useRecordList , List<String> includeTousseTypeList , 
 			boolean onlyCountNeedConvertGoods , boolean onlyCountNeedRecyclingGoods,ObjectDao objectDao){
 		String useRecordConvertRecyclingApplicationRemark = CssdUtils.getSystemSetConfigByName("useRecordConvertRecyclingApplicationRemark");
 		String circuitNurseRemark = null;
 		String patientNameRemark = null;
 		String hospitalNumber = null;
 		String originalUseRecordRemark = null;
+		String operationRoom = null;
 		
 		int tousseAmount = 0;
 		//applyTousseMap是多条使用记录所录入的包的map的汇总,因此不取这种方式的器械包数量
@@ -910,7 +910,7 @@
 			}).orElse(0);
 		}*/
 		if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){
-			//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
+			//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount @operationRoom
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
 			for (UseRecord useRecord : useRecordList) {
 				if(StringUtils.isNotBlank(useRecord.getCircuitNurse())){
@@ -941,12 +941,20 @@
 						hospitalNumber += " " + useRecord.getHospitalNum();
 					}
 				}
+				if(StringUtils.isNotBlank(useRecord.getOperationRoom())){
+					if(operationRoom == null){
+						operationRoom = useRecord.getOperationRoom();
+					}else{
+						operationRoom += " " + useRecord.getOperationRoom();
+					}
+				}
 				tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
 			}
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", circuitNurseRemark == null ? "" : circuitNurseRemark);
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", patientNameRemark == null ? "" : patientNameRemark);
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@useRecordRemark", originalUseRecordRemark == null ? "" : originalUseRecordRemark);
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@hospitalNumber", hospitalNumber == null ? "" : hospitalNumber);
+			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationRoom", operationRoom == null ? "" : operationRoom);
 			
 			//手术台数(一条使用记录默认就是一台手术)
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@operationAmount", String.valueOf(useRecordList.size()));