Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r24827 -r25036
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 24827)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 25036)
@@ -884,7 +884,8 @@
 	 */
 	public void getComboTousseStore(){
 		String spell = StrutsParamUtils.getPraramValue("spell", "");
-		JSONArray comboTousses = tousseDefinitionManager.loadAllComboTousseDefinition(spell);
+		String comboTousseOrgUnitCoding = StrutsParamUtils.getPraramValue("comboTousseOrgUnitCoding", "");
+		JSONArray comboTousses = tousseDefinitionManager.loadAllComboTousseDefinition(spell,comboTousseOrgUnitCoding);
 		JSONObject result = new JSONObject();
 		result.put("totalCount", comboTousses.size());
 		result.put("data", comboTousses);
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java
===================================================================
diff -u -r23631 -r25036
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 23631)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManager.java	(.../TousseDefinitionManager.java)	(revision 25036)
@@ -630,7 +630,9 @@
 	/**
 	 *  加载所有的聚合包定义,聚合包量比较小，暂时不考虑拼音五笔码检索.
 	 */
-	public JSONArray loadAllComboTousseDefinition(String spell);
+	public JSONArray loadAllComboTousseDefinition(String spell,String comboTousseOrgUnitCoding);
+	
+	public JSONArray getAllComboTousseDefinitionDepart();
 
 	/**
 	 * 判断该器械包是否能被删除.
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r24442 -r25036
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 24442)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 25036)
@@ -1117,6 +1117,15 @@
 		StrutsResponseUtils.output(jsonObject);
 	}
 	
+	public void getAllComboTousseDefinitionDepart(){
+		JSONArray array = tousseDefinitionManager.getAllComboTousseDefinitionDepart();
+		JSONObject jsonObject = new JSONObject();
+		jsonObject.put("success", true);
+		jsonObject.put("data", array);
+		StrutsResponseUtils.output(jsonObject);
+	}
+	
+	
 	/**
 	 * 读取聚合包的处理科室与任务组信息
 	 */
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r24955 -r25036
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 24955)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25036)
@@ -1054,6 +1054,7 @@
 //		}
 		if(StringUtils.isNotBlank(department)){
 			obj.put("department", department);
+			obj.put("depart", department);
 		}
 		obj.put("includedTousseAmount", tousseInstance.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 		if(tousseInstance.safelyGetHaveUnSupplementMaterials()){
@@ -6193,7 +6194,7 @@
 				validUntilDateToPrint, sterileDateToPrint, markTousse,
 				ti.getOperationTime(), false, false, true, isReview,
 				isTraceable, td.getIsBigPackage(), "", null, 0l, "", 0,
-				0, "", TousseDefinition.PRINGORGSOURCE_NONE, 0l, objectDao, td.getBarcodePaperType(), "", "",
+				0, ti.getDepart(), TousseDefinition.PRINGORGSOURCE_NONE, 0l, objectDao, td.getBarcodePaperType(), "", "",
 				"",remark,printAmount ,BooleanUtils.toBooleanDefaultIfNull(ti.getHaveUnSupplementMaterials(), false),ti.getIsUrgentTousse(),ti.getTousseInstancesAmountBelongToThisComboTousse(objectDao));
 	}
 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r24946 -r25036
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 24946)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 25036)
@@ -48,6 +48,7 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ComboTousseComposite;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.ComboTousseOrgUint;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem;
@@ -2743,15 +2744,19 @@
 	}
 
 	@Override
-	public JSONArray loadAllComboTousseDefinition(String spell) {
+	public JSONArray loadAllComboTousseDefinition(String spell,String comboTousseOrgUnitCoding) {
 		String spellSql = "";
+		String comboTousseOrgUnitCodingSql = "";
 		if(StringUtils.isNotBlank(spell)){
 			spellSql = " and (po.name like '%"+spell+"%' or po.spelling like '%"+spell+"%' or po.wbCode like '%"+spell+"%' ) ";
 		}
+		if(StringUtils.isNotBlank(comboTousseOrgUnitCoding)){
+			comboTousseOrgUnitCodingSql = String.format(" and po.id in(select comboTousseDefinitionId from %s where unitCode='%s')", ComboTousseOrgUint.class.getSimpleName(),comboTousseOrgUnitCoding);
+		}
 		String sql = String.format("select po.id,po.name,po.packageType,po.sterilingMethod,io.id,io.name,io.packageType from %s po, %s bo, %s io where po.id = bo.comboTousseDefinitionId "
-				+ "and bo.tousseDefinitionId = io.id and po.tousseType = '%s' %s and (po.isDisable = '%s' or po.isDisable is null) order by po.name ", 
+				+ "and bo.tousseDefinitionId = io.id and po.tousseType = '%s' %s %s and (po.isDisable = '%s' or po.isDisable is null) order by po.name ", 
 				TousseDefinition.class.getSimpleName(),ComboTousseComposite.class.getSimpleName(),
-				TousseDefinition.class.getSimpleName(),TousseDefinition.PACKAGE_TYPE_COMBO,spellSql, Constants.STR_NO);
+				TousseDefinition.class.getSimpleName(),TousseDefinition.PACKAGE_TYPE_COMBO,spellSql,comboTousseOrgUnitCodingSql, Constants.STR_NO);
 		ResultSet rs = objectDao.executeSql(sql);
 		Map<Long, JSONObject> resultMap = new HashMap<Long, JSONObject>();
 		List<Long> idList = new ArrayList<Long>();
@@ -2798,6 +2803,31 @@
 		}
 		return array;
 	}
+	
+	@Override
+	public JSONArray getAllComboTousseDefinitionDepart(){
+		JSONArray array = new JSONArray();
+		String sql = String.format("select distinct(cto.unitCode),cto.unitName from %s po, %s cto where po.id = cto.comboTousseDefinitionId "
+				+ " and po.tousseType = '%s' and (po.isDisable = '%s' or po.isDisable is null) order by cto.unitName ", 
+				TousseDefinition.class.getSimpleName(),ComboTousseOrgUint.class.getSimpleName(),
+				TousseDefinition.PACKAGE_TYPE_COMBO, Constants.STR_NO);
+		ResultSet rs = objectDao.executeSql(sql);
+		try {
+			while(rs.next()){
+				String unitCode = rs.getString("unitCode");
+				String unitName = rs.getString("unitName");
+				JSONObject obj = new JSONObject();
+				obj.put("id", unitCode);
+				obj.put("name", unitName);
+				array.add(obj);
+			}
+		} catch (SQLException e) {
+			e.printStackTrace();
+		} finally{
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return array;
+	}
 
 	public void judgeCanUpdate(TousseDefinition tousseDefinition) {
 		String tousseType = tousseDefinition.getTousseType();