Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r14698 -r15232
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 14698)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 15232)
@@ -142,9 +142,11 @@
 	private Date wasteDate; //废弃时间
 	
 	private String wasteReason; //废弃原因
+	/**
+	 * 废弃操作人
+	 */
+	private String operateUser; 
 	
-	private String operateUser; //操作人
-	
 	private String signedUser; //签收人
 	
 	private Date signedDate; //签收日期
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r15078 -r15232
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 15078)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 15232)
@@ -30,15 +30,22 @@
 	 */
 	public void autoWasteOutdateTousseInstances();
 
-	public void discardTousseInstance(TousseInstance tousseInstance,String operateUser,String wasteReason,Date wasteDate);
 	public void discardTousseInstance(TousseInstance tousseInstance,String wasteReason);
+	public void discardTousseInstance(TousseInstance tousseInstance,String operateUser,String wasteReason);
+	public void discardTousseInstance(TousseInstance tousseInstance,String operateUser,String wasteReason,Date wasteDate);
 	/**
 	 * 废弃多个器械包
 	 * @param tousseInstances
 	 * @param wasteReason
 	 */
 	public void discardTousseInstance(Collection<TousseInstance> tousseInstances,String wasteReason);
-	public void discardTousseInstance(TousseInstance tousseInstance,String operateUser,String wasteReason);
+	/**
+	 * 废弃多个器械包
+	 * @param tousseInstances 器械包实例集合
+	 * @param operateUser 废弃操作人
+	 * @param wasteReason 废弃原因
+	 */
+	public void discardTousseInstance(Collection<TousseInstance> tousseInstances,String operateUser,String wasteReason);
 	public void delete(TousseInstance tousseInstance);
 
 	public TousseInstance getTousseInstanceById(String id);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r15228 -r15232
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15228)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 15232)
@@ -182,10 +182,10 @@
 	public void autoWasteOutdateTousseInstances(){
 		List<TousseInstance> outdateTousseInstanceList = 
 			(List<TousseInstance>)objectDao.getHibernateSession().createQuery("from TousseInstance where status not in ('"+TousseInstance.STATUS_USED+"','"+TousseInstance.STATUS_RECYCLED+"','"+TousseInstance.STATUS_DISCARD+"') and validUntil < :validUntil").setDate("validUntil", new java.sql.Timestamp(new Date().getTime())).list();
-		discardTousseInstance(outdateTousseInstanceList,"失效期过期定时废弃处理");
+		discardTousseInstance(outdateTousseInstanceList,"系统定时器","失效期过期定时废弃处理");
 	}
 	
-	public void discardTousseInstance(Collection<TousseInstance> tousseInstances,String wasteReason) {
+	public void discardTousseInstance(Collection<TousseInstance> tousseInstances,String operateUser,String wasteReason) {
 		if(CollectionUtils.isNotEmpty(tousseInstances)){
 			//更新器械包库存
 			List<GoodsStock> goodsStockList = new ArrayList<GoodsStock>();
@@ -194,6 +194,7 @@
 				if(tousseInstance == null){
 					continue;
 				}
+				tousseInstance.setOperateUser(operateUser);
 				tousseInstance.setWasteReason(wasteReason);
 				tousseInstance.setWasteDate(wasteDate);
 				
@@ -219,6 +220,9 @@
 			}
 		}
 	}
+	public void discardTousseInstance(Collection<TousseInstance> tousseInstances,String wasteReason){
+		discardTousseInstance(tousseInstances,AcegiHelper.getLoginUserFullName(),wasteReason);
+	}
 	public void discardTousseInstance(TousseInstance tousseInstance,String operateUser,String wasteReason,Date wasteDate){
 		if(tousseInstance == null){
 			return;