Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java
===================================================================
diff -u -r31175 -r31179
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 31175)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationUtils.java	(.../RecyclingApplicationUtils.java)	(revision 31179)
@@ -903,11 +903,12 @@
 		String originalUseRecordRemark = null;
 		
 		int tousseAmount = 0;
-		if(MapUtils.isNotEmpty(applyTousseMap)){
+		//applyTousseMap是多条使用记录所录入的包的map的汇总,因此不取这种方式的器械包数量
+		/*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());
@@ -940,9 +941,7 @@
 						hospitalNumber += " " + useRecord.getHospitalNum();
 					}
 				}
-				if(MapUtils.isEmpty(applyTousseMap)){
-					tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
-				}
+				tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
 			}
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@circuitNurse", circuitNurseRemark == null ? "" : circuitNurseRemark);
 			useRecordConvertRecyclingApplicationRemark = useRecordConvertRecyclingApplicationRemark.replace("@patientName", patientNameRemark == null ? "" : patientNameRemark);
@@ -976,13 +975,7 @@
 					}
 					patientNameRemark += useRecord.getPatientName() + " ";
 				}
-				if(MapUtils.isNotEmpty(applyTousseMap)){
-					tousseAmount += (int)applyTousseMap.values().stream().reduce((x,y) -> {
-						return MathTools.add((Integer)x, (Integer)y).intValue();
-					}).orElse(0);
-				}else{
-					tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
-				}
+				tousseAmount += useRecord.countTousseAmount(objectDao, includeTousseTypeList, onlyCountNeedConvertGoods, onlyCountNeedRecyclingGoods);
 			}
 			if(washHandNurseRemark != null){
 				washHandNurseRemark = washHandNurseRemark + ";";