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);