Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r12596 -r12636
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 12596)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 12636)
@@ -7,6 +7,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
@@ -156,4 +157,18 @@
 	// 根据包定义查找普通包定义，因为可能会存在多个，这里取id最大的
 	public TousseDefinition getMostRecentCommonTousseDefinitionByTousseDefinition(
 			TousseDefinition tousseDefinition);
+	
+	/**
+	 * 查询科室处理器械包
+	 * @param orgUnit
+	 * @return
+	 */
+	public List<TousseDefinition> getCssdHandleTousseDefinitionList(OrgUnit orgUnit);
+	
+	/**
+	 * 新建或删除科室处理器械包配置
+	 * @param orgUnit
+	 * @return
+	 */
+	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinition(List<TousseDefinition> tousseDefinitionList, OrgUnit orgUnit);
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java
===================================================================
diff -u -r12634 -r12636
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java	(.../WareHouse.java)	(revision 12634)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/warehouse/WareHouse.java	(.../WareHouse.java)	(revision 12636)
@@ -36,6 +36,16 @@
 	private Long orgUnitId;
 	
 	/**
+	 * 所属科室编码
+	 */
+	private String orgUnitCode;
+	
+	/**
+	 * 所属科室名称
+	 */
+	private String orgUnitName;
+	
+	/**
 	 * 描述
 	 */
 	private String remark;
@@ -78,6 +88,18 @@
 	public void setSequence(Long sequence) {
 		this.sequence = sequence;
 	}
+	public String getOrgUnitCode() {
+		return orgUnitCode;
+	}
+	public void setOrgUnitCode(String orgUnitCode) {
+		this.orgUnitCode = orgUnitCode;
+	}
+	public String getOrgUnitName() {
+		return orgUnitName;
+	}
+	public void setOrgUnitName(String orgUnitName) {
+		this.orgUnitName = orgUnitName;
+	}
 	
 	
 }
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r12625 -r12636
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12625)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 12636)
@@ -26,6 +26,7 @@
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
 import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
@@ -1868,4 +1869,18 @@
 		}
 		return null;
 	}
+
+	@Override
+	public List<TousseDefinition> getCssdHandleTousseDefinitionList(
+			OrgUnit orgUnit) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public List<TousseDefinition> saveOrUpdateCssdHandleTousseDefinition(
+			List<TousseDefinition> tousseDefinitionList, OrgUnit orgUnit) {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java
===================================================================
diff -u
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(revision 0)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/warehouse/service/WareHouseManager.java	(revision 12636)
@@ -0,0 +1,41 @@
+package com.forgon.disinfectsystem.basedatamanager.warehouse.service;
+
+import java.util.List;
+
+import com.forgon.directory.model.OrgUnit;
+import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse;
+
+/**
+ * 仓库manager接口
+ * @author shuyongfu
+ * @since 2016-03-21
+ */
+public interface WareHouseManager {
+
+	/**
+	 * 查询所有的仓库
+	 * @return
+	 */
+	public List<WareHouse> getAll();
+	
+	/**
+	 * 根据科室查询仓库信息
+	 * @param orgUnit
+	 * @return
+	 */
+	public List<WareHouse> getWareHouseListByOrgUnit(OrgUnit orgUnit);
+	
+	/**
+	 * 新增或修改仓库
+	 * @param wareHouse
+	 * @return
+	 */
+	public WareHouse saveOrUpdateWareHouse(WareHouse wareHouse);
+	
+	/**
+	 * 删除科室(可多个删除)
+	 * @param idList
+	 * @return
+	 */
+	public int removeWareHouse(List<Long> idList);
+}