Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r16063 -r16074
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 16063)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 16074)
@@ -1028,7 +1028,7 @@
 		ret += obj.department;
 		ret += '-';
 	}
-	ret += obj.name;
+	ret += obj.nameWithoutDepart;
 	return ret;
 }
 function getDepartAndNameHtm(obj,departSize,tousseSize,departBold){
@@ -1057,7 +1057,7 @@
 	if(obj.isPrintOrg && !isUndefinedOrNullOrEmpty(obj.department)){
 		ret += '-';
 	}
-	ret += obj.name;
+	ret += obj.nameWithoutDepart;
 	if(!departBold){
 		ret += "</b>";
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r15986 -r16074
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 15986)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 16074)
@@ -433,7 +433,7 @@
 								printBarcode = tousseObj.fixedBarcode;
 		            		}
 							tousseObj.sterilizationUser = records[i].data['sterilizationUser'];
-							var printSummaryObj = {'barcode':printBarcode, 'name':tousseObj.tousseName, 'applicant':applicant, 'depart': depart, 'sterilizationDate':tousseObj.sterilizationDate, 'validDate':tousseObj.validDate, 
+							var printSummaryObj = {'barcode':printBarcode, 'name':tousseObj.tousseName,'nameWithoutDepart':tousseObj.tousseNameWithoutDepart, 'applicant':applicant, 'depart': depart, 'sterilizationDate':tousseObj.sterilizationDate, 'validDate':tousseObj.validDate, 
 									'hospitalName':hospitalName, 'sterilizer':sterilizer, 'frequency':frequency, 'material':material, 'sterilingType':tousseObj.sterilingType,
 									'maker':tousseObj.maker,'assistant':tousseObj.assistant};
 							top.Ext4.applyIf(printSummaryObj,tousseObj);
@@ -442,6 +442,8 @@
 						}
 						else{
 							top.Ext4.applyIf(tousseObj,records[i].data);
+							//先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
+							tousseObj.nameWithoutDepart = tousseObj.tousseName;
 							//打印消毒物品
 							if(tousseObj.isDisinfection){
 								printLabelOfDisinfection(tousseObj);
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--;
 						}
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r15622 -r16074
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 15622)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16074)
@@ -149,7 +149,7 @@
             		
             		
             		var printSummaryObj = {
-            				'barcode':barcodes[j],'virtualBasketSeqNum':seq,'name':tousseName,'material':"",'operator':operatorToPrint,'reviewer':reviewerToPrint,'sterilizationUser':sterilizationUserToPrint,'sterilizationDate':sterilizationDate,'validDate':validDate,
+            				'barcode':barcodes[j],'virtualBasketSeqNum':seq,'name':tousseName,'nameWithoutDepart':tousseObj.tousseNameWithoutDepart,'material':"",'operator':operatorToPrint,'reviewer':reviewerToPrint,'sterilizationUser':sterilizationUserToPrint,'sterilizationDate':sterilizationDate,'validDate':validDate,
             				'foreignPackageObjectArray':applicationItems,'sterilizer':sterilizer,'frequency':frequency,'markTousse':markTousse,'hospitalName':hospitalName,'total':total,
             				pageType:foreignDefaultLabelpaper,'labelType':foreignDefaultLabelpaper,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime,
             				'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea,
@@ -189,7 +189,7 @@
             		if(!isTraceable){//不追溯打固定条码
             			printBarcodeStr = fixedBarcode;
             		}
-            		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, 'sterilizationDate':sterilizationDate, 'validDate':validDate, 
+            		var obj = {'barcode':printBarcodeStr,'virtualBasketSeqNum':seq, 'name':tousseName,'nameWithoutDepart':tousseObj.tousseNameWithoutDepart,'pageType':barcodePaperType, 'materials':materials, 'operator':operatorToPrint, 'reviewer': reviewerToPrint,'sterilizationUser':sterilizationUserToPrint, '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.washOperator = tousseObj.washOperator;
@@ -217,6 +217,8 @@
 //		print(tousseObj);
 //		setPrinterByConfig();
 //		LODOP.PRINT();
+		//先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
+		tousseObj.tousseNameWithOutDepart = tousseObj.tousseName;
 		printLabel(tousseObj);
 		return;
 	}
@@ -372,6 +374,8 @@
 	return retTousses;
 }
 function doPrintLabel(tousseObj){
+	//先将名称存到另一个未含科室名的名称属性里(针对东莞中医院的打印调整)
+	tousseObj.tousseNameWithOutDepart = tousseObj.tousseName;
 	//打印消毒物品(如果为消毒物品,根据是否追溯的配置决定是否打印科室)。(消毒物品打印科室现在也改为同器械包一致，即按器械包定义的是否打印科室决定 since:2016-02-25)
 	if(tousseObj.isDisinfection){
 		printLabelOfDisinfection(tousseObj);