Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31896 -r31973
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31896)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31973)
@@ -6073,7 +6073,7 @@
 		while(itr.hasNext()){
 			String departKey = itr.next();
 			List<DepartmentMonthDetailItem> list = detailMap.get(departKey);
-			//消毒物品相同名称的合并
+			//消毒物品,自定义器械包,外来器械包,外来器械拆分小包相同名称的合并
 			Map<String, DepartmentMonthDetailItem> tmpMap = new HashMap<String, DepartmentMonthDetailItem>();
 			List<DepartmentMonthDetailItem> removeItems = new ArrayList<DepartmentMonthDetailItem>();
 			double totalPrice = 0.0d;
@@ -6083,7 +6083,7 @@
 				String tousseName = dmi.getGoodsName();
 				String type = dmi.getType();
 				if (TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(type)
-						|| TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(type)) {
+						|| TousseDefinition.PACKAGE_TYPE_CUSTOM.equals(type) || TousseDefinition.PACKAGE_TYPE_FOREIGN.equals(type) || TousseDefinition.PACKAGE_TYPE_SPLIT.equals(type)) {
 					DepartmentMonthDetailItem item = tmpMap.get(tousseName);
 					if(item == null){
 						item = new DepartmentMonthDetailItem();