Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r14804 -r14817
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14804)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14817)
@@ -63,12 +63,21 @@
 	 		 + InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM+"','"
 	 		 + InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM+"','"
 	 		 + InvoicePlan.TYPE_COMBO_FORM + "','"
+	 		 + InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM + "','"
+	 		 + InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION + "','"
+	 		 + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION + "','"
+	 		 + InvoicePlan.TYPE_PROXYDISINFECTION + "','"
+	 		 + InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION + "','"
 	 		 + InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION+"'";
 	
 	//器械包类型
 	private static final String TOUSSE_TYPE = "'"
 			 + TousseDefinition.PACKAGE_TYPE_INSIDE+"','"
 			 + TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"
+			 + TousseDefinition.PACKAGE_TYPE_CUSTOM+"','"
+			 + TousseDefinition.PACKAGE_TYPE_FOREIGN+"','"
+			 + TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY+"','"
+			 + TousseDefinition.PACKAGE_TYPE_SPLIT+"','"
 			 + TousseDefinition.PACKAGE_TYPE_DRESSING+"'";
 	
 	private SupplyRoomConfigManager supplyRoomConfigManager;
@@ -199,7 +208,7 @@
 					 +" left join ClassifyBasket cb on cb.id = cw.ClassifyBasket_ID"
 					 +" left join ClassifiedItem ci on cb.id = ci.classifybasket_id "
 					 +" where wr.orgUnitCoding = '"+orgUnitCoding+"'"
-					 +" and (ci.itemType = '器械包' or ci.itemType = '材料' or ci.itemType = '"+TousseDefinition.PACKAGE_TYPE_DISINFECTION+"')"
+					 +" and (ci.itemType = '材料' or ci.itemType in ("+TOUSSE_TYPE+"))"
 					 +" and wr.recordCreateDate between "
 					 + dateQueryAdapter.dateAdapter(statDate)
 					 +" and "