Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r23236 -r23849
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 23236)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 23849)
@@ -312,7 +312,6 @@
 		var names = getPrintNames(isPrintUserFullName,namesObj);
 		var tousseInstances = retObj.tousseInstances;
 		var printNum = Ext.getCmp('tempPrintNum').getValue();//打印张数
-		var packageType = Ext.getCmp("packageType").getValue();
 		var sterilingType = Ext.getCmp("sterilingType1").getValue();
 		var sterilizer = Ext.getCmp("sterilizer").getValue();
 		var frequency = Ext.getCmp("frequency").getValue();
@@ -324,7 +323,7 @@
         }
 		if(tousseInstances.length > 0){
 			 var tousseName = Ext.getCmp('tousseName').getValue();
-			
+			 var packageType = tousseInstances[0].packageType;
 			ExpirationDateInfoTableManager.getExpirationDate(disinfectionDate,packageType,function(result){
 				var json = Ext.decode(result);
                 var validDate = json.expirationDate;
@@ -358,12 +357,12 @@
                             var materials = jsonObj.result;
                             
                             // 获取包装方式的简称
-        					var packageTypeAbbreviation = '';
-        					DWREngine.setAsync(false);
-        					TousseInstanceTableManager.getPackageTypeAbbreviation(packageType,function(_packageTypeAbbreviation){
-        						packageTypeAbbreviation = _packageTypeAbbreviation;
-        					});
-        					DWREngine.setAsync(true);
+        					var packageTypeAbbreviation = tousseInstance.packageTypeAbbreviation;
+//        					DWREngine.setAsync(false);
+//        					TousseInstanceTableManager.getPackageTypeAbbreviation(packageType,function(_packageTypeAbbreviation){
+//        						packageTypeAbbreviation = _packageTypeAbbreviation;
+//        					});
+//        					DWREngine.setAsync(true);
         					
         					var barcodes = [barocdeArray[j]];
                             var obj = {'barcodes':barcodes, 'name':toussName, 'name':toussName, 'nameWithoutDepart':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r23839 -r23849
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 23839)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 23849)
@@ -5838,6 +5838,7 @@
 				tousse.put("fixedBarcode", fixedBarcode);
 				tousse.put("isDisinfection", isDisinfection);
 				tousse.put("disinfectionItem", materials);
+				tousse.put("packageType", tousseInstance.getPackageType());
 				tousse.put("packageTypeAbbreviation", packageTypeAbbreviation);
 				tousse.put("printOrgSource", td.getPrintOrgSource());//新增器械包打印科室
 				tousse.put("department", TousseInstanceUtils.getTousseInstanceDepartForPrint(tousseInstance));