Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r33215 -r33228
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 33215)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 33228)
@@ -4,6 +4,7 @@
 import java.sql.SQLException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -24,6 +25,7 @@
 
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.sterilisation.service.SterilisationManager;
@@ -50,13 +52,15 @@
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.disinfectsystem.idcardinstance.service.IDCardInstanceManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
+import com.forgon.disinfectsystem.tousse.tousseDefinitionBelongOrgUnit.service.TousseDefinitionBelongDepartManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.traceablematerial.util.TraceableMaterialUtils;
 import com.forgon.serialnumber.model.SerialNum;
 import com.forgon.serialnumber.service.SerialNumManager;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.BasePoManagerImpl;
 import com.forgon.tools.json.JSONUtil;
+import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
 import com.forgon.tools.util.SqlUtils;
 import com.google.gson.Gson;
@@ -84,6 +88,13 @@
 	
 	private SterilisationManager sterilisationManager;
 	
+	private TousseDefinitionBelongDepartManager tousseDefinitionBelongDepartManager;
+	
+	public void setTousseDefinitionBelongDepartManager(
+			TousseDefinitionBelongDepartManager tousseDefinitionBelongDepartManager) {
+		this.tousseDefinitionBelongDepartManager = tousseDefinitionBelongDepartManager;
+	}
+
 	public void setMaterialDefinitionManager(
 			MaterialDefinitionManager materialDefinitionManager) {
 		this.materialDefinitionManager = materialDefinitionManager;
@@ -1069,11 +1080,20 @@
 		JSONObject obj = new JSONObject();
 		
 		LoginUserData loginUser = AcegiHelper.getLoginUser();
-		String orgUnitName = loginUser.getCurrentOrgUnitName();
+		String orgUnitName = "";
 		String hospitalName = loginUser.getHospitalName();
 		
+		List<OrgUnit> orgUnitList = tousseDefinitionBelongDepartManager.getTousseDefinitionBelongOrgUnitBytdId(tousseDefinition.getId());
+		if(CollectionUtils.isNotEmpty(orgUnitList)){
+			List<String> orgUnitNameList = new ArrayList<String>();
+			for (OrgUnit orgUnit : orgUnitList) {
+				orgUnitNameList.add(orgUnit.getName());
+			}
+			orgUnitName = "(" + StringTools.join(orgUnitNameList, ",") + ")";
+		}
+		
 		//(科室)包名
-		String name = "(" + orgUnitName + ")" + tousseDefinition.getName();
+		String name = orgUnitName + tousseDefinition.getName();
 		obj.put("name", name);
 		//包名
 		obj.put("tousseNameWithoutDepart", tousseDefinition.getName());