Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r17071 -r17266
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 17071)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 17266)
@@ -220,8 +220,7 @@
 //		print(tousseObj);
 //		setPrinterByConfig();
 //		LODOP.PRINT();
-		//先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
-		tousseObj.tousseNameWithOutDepart = tousseObj.tousseName;
+		
 		printLabel(tousseObj);
 		return;
 	}
@@ -481,6 +480,8 @@
 }
 // 根据配置为包名增加科室前缀
 function addDepartPrefixForTousseName(tousseObj){
+	// 先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
+	tousseObj.tousseNameWithOutDepart = tousseObj.tousseName;
 	if(tousseObj.printOrgSource != "无"){
 		if(tousseObj.department){
 			var departPrefix = "(" + tousseObj.department + ")";
Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r17256 -r17266
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 17256)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 17266)
@@ -165,6 +165,7 @@
 		var frequency = Ext.getCmp("frequency").getValue();
 		var department = retObj.department;
 		var selectedDepartment = '';
+		var packTime = date2string(new Date());
 		if(sstsConfig.selectDepartInCustomPacking){
 			selectedDepartment = Ext.getCmp('depart').getValue();
         }
@@ -221,6 +222,7 @@
                             obj.virtualSeqNums = [virtualSeqNumArray[j]];
                             obj.department = department;
                             obj.depart = department;
+                            obj.packTime = packTime;
                             //自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室
                             obj.printOrgSource = tousseInstance.printOrgSource;
                             if(selectedDepartment){
@@ -1190,12 +1192,7 @@
 			
 			//此处改为不管器械包定义是否打印,都打印标签
 			if(isPrint){
-				if(action.result.isDisinfection){//是否为消毒物品
-					alert('暂时不支持消毒物品!')
-//					printBarcodeOfDisinfection(action.result.barcode, action.result.disinfectionItem,isTraceable,fixedBarcode,expirationDate,action.result.packageTypeAbbreviation);
-				}else{
-					printBarcode(action.result,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount);
-				}
+				printBarcode(action.result,action.result.virtualSeqNums,disinfectionDate,isTraceable,fixedBarcode,idCardDefinitionUseAmount);
 			}else{
 				showResult("此器械包不打印标签！");
 			}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r17188 -r17266
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17188)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 17266)
@@ -3962,7 +3962,9 @@
 		// 将用户打包时常用的字段记录到session中
 		updatePackingConfigSession(session, inspector, inspectorCode, operator, operatorCode, reviewer, reviewerCode,sterileUserName,sterileUserCode,wrapper, wrapperCode,
 				packageType, sterilingType, sterilizerName, sterileFrequency);
-		
+//		if(true){
+//			throw new RuntimeException("装配速度测试");
+//		}
 		return json.toString();
 	}
 	
@@ -5395,7 +5397,9 @@
 		if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
 			sql += " and po.forDisplay = 1";
 		}
+		
 		TousseDefinition td = tousseDefinitionManager.getTousseDefinitionBySql(sql);
+		TousseDefinition ancestorTD = td;
 		if (td == null) {
 			throw new RuntimeException(String.format("装配失败，未找到[%s]的包定义!",
 					tousseName));
@@ -5410,11 +5414,11 @@
 			td = buildDisinfectGoodsDefinition(td);
 		}
 
-		if (TousseDefinition.STR_NO.equals(td.getIsPrint())) {
+		if (TousseDefinition.STR_NO.equals(ancestorTD.getIsPrint())) {
 			isPrint = false;
 			isTraceable = false;
 		} else {
-			if (TousseDefinition.STR_NO.equals(td.getIsTraceable())) {
+			if (TousseDefinition.STR_NO.equals(ancestorTD.getIsTraceable())) {
 				isTraceable = false;
 			}
 		}
@@ -5640,7 +5644,7 @@
 			retObj.put("success", true);
 			retObj.put("message", "保存成功");
 			retObj.put("isPrint", isPrint);
-			retObj.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(td));
+			retObj.put("isPrintOnDirectPacking", TousseDefinitionUtils.getBoolIsPrintOnDirectPacking(ancestorTD));
 			retObj.put("isTraceable", isTraceable);
 			retObj.put("idCardDefinitionUseAmount", idCardDefinitionUseAmount);
 			retObj.put("fixedBarcode", fixedBarcode);