Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r12774 -r12814
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 12774)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 12814)
@@ -1379,16 +1379,19 @@
 	@Override
 	public void setToDefaultWareHouse(TousseInstance tousseInstance,
 			String orgUnitCoding) {
-		boolean statusValid = false;
-		if(TousseInstance.STATUS_STERILED.equals(tousseInstance.getStatus())){
-			statusValid = true;
-		}else if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseInstance.getTousseDefinition().getTousseType())
-				&& TousseInstance.STATUS_DISINFECTED.equals(tousseInstance.getStatus())){
-			statusValid = true;
+		WareHouse wareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCoding);
+		if(wareHouse == null){
+			wareHouse = new WareHouse();
+			wareHouse.setId(null);
+			wareHouse.setName("");
 		}
-		if(statusValid){
-			WareHouse wareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCoding);
-			setToWareHouse(tousseInstance, wareHouse);
+		setToWareHouse(tousseInstance, wareHouse);
+	}
+	@Override
+	public void setToDefaultWareHouse(Collection<TousseInstance> tousseInstances,
+			String orgUnitCoding) {
+		for(TousseInstance ti : tousseInstances){
+			setToDefaultWareHouse(ti,orgUnitCoding);
 		}
 	}
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r12659 -r12814
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 12659)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 12814)
@@ -158,9 +158,15 @@
 	 */
 	public void setToWareHouse(TousseInstance tousseInstance,WareHouse wareHouse);
 	/**
-	 * 添加器械包到科室默认仓库,只有已灭菌的器械包实例或已消毒的消毒物品才能添加到默认仓库(完成灭菌时调用),其他状态只能是移仓
+	 * 添加器械包到科室默认仓库,如果科室没有仓库,则将仓库id和名称置空
 	 * @param tousseInstance 器械包实例
 	 * @param orgUnitCoding 科室编码
 	 */
 	public void setToDefaultWareHouse(TousseInstance tousseInstance,String orgUnitCoding);
+	/**
+	 * 添加多个器械包到科室默认仓库,如果科室没有仓库,则将仓库id和名称置空
+	 * @param tousseInstance 器械包实例
+	 * @param orgUnitCoding 科室编码
+	 */
+	public void setToDefaultWareHouse(Collection<TousseInstance> tousseInstances,String orgUnitCoding);
 }