Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
===================================================================
diff -u -r28620 -r31175
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 28620)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 31175)
@@ -893,7 +893,8 @@
 	 * @param objectDao
 	 * @return
 	 */
-	public static String getRemarkByUseRecordAndProjectConfig(Map applyTousseMap ,List<UseRecord> useRecordList , List<String> includeTousseTypeList , 
+	@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;
@@ -902,6 +903,11 @@
 		String originalUseRecordRemark = null;
 		
 		int tousseAmount = 0;
+		if(MapUtils.isNotEmpty(applyTousseMap)){
+			tousseAmount += (int)applyTousseMap.values().stream().reduce((x,y) -> {
+				return MathTools.add((Integer)x, (Integer)y).intValue();
+			}).orElse(0);
+		}
 		if(StringUtils.isNotBlank(useRecordConvertRecyclingApplicationRemark)){
 			//目前的变量有以下:@circuitNurseLabelName @circuitNurse @patientName @useRecordRemark @hospitalNumber @operationAmount @tousseAmount
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurseLabelName", getCircuitNurseLabelName());
@@ -934,11 +940,7 @@
 						hospitalNumber += " " + useRecord.getHospitalNum();
 					}
 				}
-				if(MapUtils.isNotEmpty(applyTousseMap)){
-					tousseAmount += (int)applyTousseMap.values().stream().reduce((x,y) -> {
-						return MathTools.add((Integer)x, (Integer)y).intValue();
-					}).orElse(0);
-				}else{
+				if(MapUtils.isEmpty(applyTousseMap)){
 					tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
 				}
 			}