Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java
===================================================================
diff -u -r12579 -r12638
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 12579)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManagerImpl.java	(.../OrgUnitManagerImpl.java)	(revision 12638)
@@ -596,4 +596,25 @@
 			thTreeNodeManager.updateTHTreeNode(orgUnit);
 		}
 	}
+
+	@Override
+	public List<OrgUnit> getCssdServiceOrgUnitList(OrgUnit cssd,
+			String tousseType) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<OrgUnit> saveOrUpdateCssdServiceOrgUnits(OrgUnit cssd,
+			List<OrgUnit> orgUnitList, String tousseType) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public int removeCssdServiceOrgUnits(OrgUnit cssd,
+			List<OrgUnit> orgUnitList, String tousseType) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
===================================================================
diff -u -r12636 -r12638
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12636)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(.../WareHouseManager.java)	(revision 12638)
@@ -19,8 +19,8 @@
 	public List<WareHouse> getAll();
 	
 	/**
-	 * 根据科室查询仓库信息
-	 * @param orgUnit
+	 * 查询科室下的仓库,按sequence排序,返回集合的第1条就是默认仓库
+	 * @param orgUnit 默认按科室id,如果id为空,则按code查询
 	 * @return
 	 */
 	public List<WareHouse> getWareHouseListByOrgUnit(OrgUnit orgUnit);
Index: forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java
===================================================================
diff -u -r12628 -r12638
--- forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java	(.../CssdServiceDepts.java)	(revision 12628)
+++ forgon-core/src/main/java/com/forgon/directory/model/CssdServiceDepts.java	(.../CssdServiceDepts.java)	(revision 12638)
@@ -61,6 +61,16 @@
 	 * 器械类型(器械包或一次性物品)
 	 */
 	private String tousseType;
+	
+	/**
+	 * 器械包
+	 */
+	public static String TOUSSETYPE_TOUSSE = "器械包";
+	
+	/**
+	 * 一次性物品
+	 */
+	public static String TOUSSETYPE_DIPOSABLEGOODS = "一次性物品";
 
 	@Id
 	@GeneratedValue(strategy = GenerationType.AUTO)
Index: forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java
===================================================================
diff -u -r12579 -r12638
--- forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 12579)
+++ forgon-core/src/main/java/com/forgon/directory/service/OrgUnitManager.java	(.../OrgUnitManager.java)	(revision 12638)
@@ -52,4 +52,30 @@
 	public void save(OrgUnit orgUnit);
 
 	public void update(OrgUnit orgUnit);
+	
+	/**
+	 * 查询供应室服务的临床科室
+	 * @param cssd
+	 * @param tousseType 类型:器械包或一次性物品
+	 * @return
+	 */
+	public List<OrgUnit> getCssdServiceOrgUnitList(OrgUnit cssd , String tousseType);
+	
+	/**
+	 * 新增或修改供应室服务临床科室配置信息
+	 * @param cssd
+	 * @param orgUnitList
+	 * @param tousseType 类型:器械包或一次性物品
+	 * @return
+	 */
+	public List<OrgUnit> saveOrUpdateCssdServiceOrgUnits(OrgUnit cssd , List<OrgUnit> orgUnitList , String tousseType);
+	
+	/**
+	 * 删除供应室服务临床科室配置信息
+	 * @param cssd
+	 * @param orgUnitList
+	 * @param tousseType 类型:器械包或一次性物品
+	 * @return
+	 */
+	public int removeCssdServiceOrgUnits(OrgUnit cssd , List<OrgUnit> orgUnitList , String tousseType);
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r12636 -r12638
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12636)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12638)
@@ -1878,9 +1878,16 @@
 	}
 
 	@Override
-	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinition(
-			List<TousseDefinition> tousseDefinitionList, OrgUnit orgUnit) {
+	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinitions(
+			OrgUnit orgUnit, List<TousseDefinition> tousseDefinitionList) {
 		// TODO Auto-generated method stub
 		return null;
 	}
+	
+	@Override
+	public int removeCssdHandleTousseDefinitions(
+			OrgUnit orgUnit, List<TousseDefinition> tousseDefinitionList) {
+		// TODO Auto-generated method stub
+		return 0;
+	}
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r12636 -r12638
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 12636)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 12638)
@@ -166,9 +166,18 @@
 	public List<TousseDefinition> getCssdHandleTousseDefinitionList(OrgUnit orgUnit);
 	
 	/**
-	 * 新建或删除科室处理器械包配置
+	 * 新建或修改科室处理器械包配置
 	 * @param orgUnit
+	 * @param tousseDefinitionList
 	 * @return
 	 */
-	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinition(List<TousseDefinition> tousseDefinitionList, OrgUnit orgUnit);
+	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinitions(OrgUnit orgUnit , List<TousseDefinition> tousseDefinitionList);
+	
+	/**
+	 * 删除科室处理器械包配置
+	 * @param orgUnit
+	 * @param tousseDefinitionList
+	 * @return
+	 */
+	public int removeCssdHandleTousseDefinitions(OrgUnit orgUnit , List<TousseDefinition> tousseDefinitionList);
 }