Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r25738 -r25749
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25738)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25749)
@@ -2856,6 +2856,14 @@
 
 			idCardDefinitionJsonObj.addProperty("id", idCardDefinition.getId());
 			idCardDefinitionJsonObj.addProperty("useAmount", idCardDefinition.getUseAmount());
+			
+			// 获取标识牌定义的默认包装类型，返回给前端
+			String packageType = idCardDefinition.getPackageType();
+			if (StringUtils.isBlank(packageType)){
+				packageType = tousseDefinition.getPackageType();
+			}
+			idCardDefinitionJsonObj.addProperty("packageType", packageType);
+			
 			idCardInstanceJsonObj.add("tousseDefinition",
 					tousseDefinitionJsonObj);
 			idCardInstanceJsonObj.add("idCardDefinition",
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java
===================================================================
diff -u -r19830 -r25749
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 19830)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManager.java	(.../IDCardDefinitionManager.java)	(revision 25749)
@@ -19,6 +19,12 @@
 	public boolean isIdCardBarcodeMatchTousseDefinition(String idCardBarcode,
 			String tousseName);
 
+	/**
+	 * 根据标识牌定义的ID，获取标识牌定义
+	 * @param id 标识牌定义的ID
+	 * @param viewAll 是否获取所有的标识牌定义，包括废弃的标识牌定义
+	 * @return
+	 */
 	public String getIDCardDefinitionInfoByTousseID(String id,String viewAll);
 	public JSONArray getIDCardInstanceByIDCardDefinitionId(String id);
 	public JSONArray getTraceableMaterialByIDCardDefinitionId(String id);
Index: ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java
===================================================================
diff -u -r23824 -r25749
--- ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 23824)
+++ ssts-idcard/src/main/java/com/forgon/disinfectsystem/idcarddefinition/service/IDCardDefinitionManagerImpl.java	(.../IDCardDefinitionManagerImpl.java)	(revision 25749)
@@ -257,6 +257,16 @@
 					obj.put("idNumber", idCardDefinition.getIdNumber());
 					obj.put("deleted", idCardDefinition.getDeleted());
 					obj.put("status", idCardDefinition.getStatus());
+					
+					String packageType = idCardDefinition.getPackageType();
+					if (StringUtils.isBlank(packageType)){
+						TousseDefinition td = idCardDefinition.getTousseDefinition(objectDao);
+						if (td != null){
+							packageType = td.getPackageType();
+						}
+					}
+					obj.put("packageType", packageType);
+					
 					obj.put("description", description);
 					obj.put("curIdCardInstanceBarcode", idCardDefinition.getCurIdCardInstanceBarcode());
 					obj.put("tousseDefinitionID",