Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r12773 -r12774
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 12773)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 12774)
@@ -403,7 +403,7 @@
 						tousseInstance);
 				GoodsStock goodsStock = newGoodsStock(tousseInstance,defaultWareHouse);
 				goodsStockList.add(goodsStock);
-				tousseInstanceManager.setToDefaultWareHouse(tousseInstance, orgUnitCode);
+				tousseInstanceManager.setToWareHouse(tousseInstance, defaultWareHouse);
 				tousseInstanceManager.saveOrUpdate(tousseInstance);
 			}
 			//修改库存
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r12659 -r12774
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 12659)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 12774)
@@ -1375,22 +1375,7 @@
 		tousseInstance.setWareHouseId(wareHouse.getId());
 		tousseInstance.setWareHouseName(wareHouse.getName());
 	}
-
-	/**
-	 * 获取科室的默认仓库
-	 * @param orgUnitCoding 科室编码
-	 * @return 科室对应的默认仓库，如果没有，则返回null
-	 */
-	private WareHouse getDefaultWareHouse(String orgUnitCoding){
-		OrgUnit orgUnit = new OrgUnit();
-		orgUnit.setOrgUnitCoding(orgUnitCoding);
-		
-		List<WareHouse> wareHouses = wareHouseManager.getWareHouseListByOrgUnit(orgUnit);
-		if(wareHouses!= null && !wareHouses.isEmpty()){
-			return wareHouses.get(0);
-		}
-		return null;
-	}
+	
 	@Override
 	public void setToDefaultWareHouse(TousseInstance tousseInstance,
 			String orgUnitCoding) {
@@ -1402,7 +1387,7 @@
 			statusValid = true;
 		}
 		if(statusValid){
-			WareHouse wareHouse = getDefaultWareHouse(orgUnitCoding);
+			WareHouse wareHouse = wareHouseManager.getDefaultWareHouseByUnitCode(orgUnitCoding);
 			setToWareHouse(tousseInstance, wareHouse);
 		}
 	}