Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r16025 -r16074
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 16025)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 16074)
@@ -216,12 +216,16 @@
         					});
         					DWREngine.setAsync(true);
         					
-                            var obj = {'barcode':pBarcode, 'name':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
+                            var obj = {'barcode':pBarcode, 'name':toussName, 'name':toussName, 'nameWithoutDepart':toussName,'pageType':barcodePaperType, 'materials':materials, 'operator':names.operatorToPrint, 'reviewer': names.reviewerToPrint,'sterilizationUser':names.sterilizationUserToPrint,'washOperator':'', 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
                     				'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'markTousse':markTousse, 'sterilingType':sterilingType ,'materialAmount':jsonObj.materialAmount,'diposableGoodsAmount':jsonObj.diposableGoodsAmount,'totalAmount':jsonObj.totalAmount,
                     				'idCardDefinitionUseAmount':idCardDefinitionUseAmount,'packageTypeAbbreviation':packageTypeAbbreviation};
                             obj.sterilizerName = sterilizer;
                             obj.sterileFrequency = frequency;
                             obj.department = department;
+                            //自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室
+                            if(obj.department){
+                            	obj.isPrintOrg = true;
+                            }
                             defaultPrintPackage(obj);
                             tempPrintNum--;
 						}