Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java
===================================================================
diff -u -r25718 -r25726
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 25718)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/TousseInstanceAction.java	(.../TousseInstanceAction.java)	(revision 25726)
@@ -49,13 +49,17 @@
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstanceImplantData;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseMaterialErrorDamage;
+import com.forgon.disinfectsystem.entity.idcarddefinition.IDCardDefinition;
+import com.forgon.disinfectsystem.entity.idcardinstance.IDCardInstance;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.sterilizationTransition.SterilizationTransitionItemVO;
 import com.forgon.disinfectsystem.entity.systemwarning.SystemWarningItemVO;
 import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
 import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
+import com.forgon.disinfectsystem.idcarddefinition.service.IDCardDefinitionManager;
+import com.forgon.disinfectsystem.idcardinstance.service.IDCardInstanceManager;
 import com.forgon.disinfectsystem.packing.service.PackingManager;
 import com.forgon.disinfectsystem.stockmanage.departmentstock.vo.TousseInstanceVo;
 import com.forgon.disinfectsystem.tousse.imagefilemanager.service.ImageFileManager;
@@ -130,8 +134,19 @@
 	
 	private ExceptionHandler exHandler;
 	
+	private IDCardInstanceManager idCardInstanceManager;
 	
+	private IDCardDefinitionManager idCardDefinitionManager;
 	
+	public void setIdCardDefinitionManager(
+			IDCardDefinitionManager idCardDefinitionManager) {
+		this.idCardDefinitionManager = idCardDefinitionManager;
+	}
+
+	public void setIdCardInstanceManager(IDCardInstanceManager idCardInstanceManager) {
+		this.idCardInstanceManager = idCardInstanceManager;
+	}
+
 	public void setExHandler(ExceptionHandler exHandler) {
         this.exHandler = exHandler;
     }
@@ -315,7 +330,7 @@
 	
 	/**
 	 * 
-	 * 根据包实例的条码，即输入器械包外标签的条码
+	 * 根据包实例或者标识牌的条码，即输入器械包外标签的条码
 	 * 返回包定义的JSON对象
 	 * 暂时只返回包定义的ID和包名字
 	 * 
@@ -329,15 +344,36 @@
 		
 		TousseDefinition td = null;
 		
+		String tdId = "";
+		String name = "";
+		
 		if (tousseInstance != null){
 			td = tousseInstance.getTousseDefinition();
+			tdId = td.getId().toString();
+			name = td.getName();
 		}
+		else{
+			// 查询是否标识牌条码
+			IDCardInstance idCardInstance = idCardInstanceManager.getIDCardInstanceByBarcode(barcode);
+			if (idCardInstance != null){
+				Long idCardDefinitionId = idCardInstance.getIdCardDefinitionID();
+				if (idCardDefinitionId != null && idCardDefinitionId != 0){
+					IDCardDefinition idCardDefinition = idCardDefinitionManager.get(idCardDefinitionId);
+					td = idCardDefinition.getTousseDefinition(objectDao);
+					if (td != null){
+						tdId = td.getId().toString();
+						name = td.getName();
+					}
+				}
+			}
+			
+		}
 
 		Map<String, Object> map = new HashMap<String, Object>();
 		
 		JSONObject obj = new JSONObject();
-		obj.put("tousseDefinitionId", td.getId());
-		obj.put("name", td.getName());
+		obj.put("tousseDefinitionId", tdId);
+		obj.put("name", name);
 		map.put("success", true);
 		map.put("data", obj);