Index: ssts-web/src/main/webapp/debug/print/printDebug.js
===================================================================
diff -u -r16234 -r18269
--- ssts-web/src/main/webapp/debug/print/printDebug.js	(.../printDebug.js)	(revision 16234)
+++ ssts-web/src/main/webapp/debug/print/printDebug.js	(.../printDebug.js)	(revision 18269)
@@ -1,6 +1,6 @@
 
 var barcode = '010926225';
-var maxToussNameLength = 13;
+var maxToussNameLength = 15;
 var maxMaterialNameLength = 10;
 var maxMaterialsAmount = 30;
 var toussName = '';
@@ -25,6 +25,8 @@
 var virtualBasketSeqNum = 72;
 var tousseDepartment = '急诊科';
 var weight = '2KG';
+var isPrintOrg = true;
+var isUrgentTousse = true;
 function buildName(char,charAmount){
 	var name = '';
 	while(true){
@@ -115,7 +117,8 @@
 		'idCardDefinitionUseAmount' : idCardDefinitionUseAmount,
 		'packageTypeAbbreviation': packageTypeAbbreviation,
 		virtualBasketSeqNum: virtualBasketSeqNum,
-		isPrintOrg:true,
+		isPrintOrg: isPrintOrg,
+		isUrgentTousse:isUrgentTousse,
 		weight: weight
 	}
 	return obj;
@@ -179,7 +182,7 @@
 	var obj = buildPrintObj(formType,totalAmount,totalAmount-2,2);
 	defaultPrintPackage(obj);
 }
-function printForeignTousse(formType,totalAmount,materialsAmount,diposableGoodsAmount) {
+function printDebug_printForeignTousse(formType,totalAmount,materialsAmount,diposableGoodsAmount) {
 	var obj = buildForeignToussePrintObj(formType,materialsAmount + diposableGoodsAmount,materialsAmount,diposableGoodsAmount);
 	defaultPrintForeignToussePackage(obj);
 }
@@ -414,7 +417,9 @@
 }
 function testSwitchPrinter2(){
 	if(testSwitchPrinterCurIndex < testSwitchPrinterCount){
-		printCurPrinter(testSwitchPrinterCurIndex);
+		if(!printCurPrinter(testSwitchPrinterCurIndex)){
+			return;
+		}
 		++testSwitchPrinterCurIndex;
 		setTimeout("testSwitchPrinter2();", 1 * 1000);
 	}
@@ -433,6 +438,7 @@
 		invokeResult = LODOP.SET_PRINTER_INDEX(-1);
 		printerName = 'null';
 		funName = 'LODOP.SET_PRINTER_INDEX(-1)';
+		alert('未读取到配置!')
 	}else{
 		
 		invokeResult = LODOP.SET_PRINTER_INDEX(printerName);
@@ -472,6 +478,7 @@
 	LODOP.ADD_PRINT_TEXT("30mm","1mm","100mm","6mm", s1);
 	setFontSizeBold(10,0);// 设置字体
 	LODOP.PRINT();
+	return invokeResult;
 }
 Ext.onReady(function() {
 	Ext.QuickTips.init();
@@ -571,7 +578,7 @@
 				cls : 'css_printBtns',
 				ctcls : 'ctcss_printBtns',
 				handler : function() {
-					printForeignTousse('模板-外来器械中标签', 8);
+					printDebug_printForeignTousse('模板-外来器械中标签', 8);
 				}
 			} ]
 		},{
@@ -688,7 +695,7 @@
 				cls : 'css_printBtns',
 				ctcls : 'ctcss_printBtns',
 				handler : function() {
-					printForeignTousse('小标签', 8);
+					printDebug_printForeignTousse('小标签', 8);
 				}
 			} ]
 		}, {
@@ -701,7 +708,7 @@
 				cls : 'css_printBtns',
 				ctcls : 'ctcss_printBtns',
 				handler : function() {
-					printForeignTousse('中标签', 8);
+					printDebug_printForeignTousse('中标签', 8);
 				}
 			} ]
 		}, {
@@ -714,7 +721,7 @@
 				cls : 'css_printBtns',
 				ctcls : 'ctcss_printBtns',
 				handler : function() {
-					printForeignTousse('大标签', 8);
+					printDebug_printForeignTousse('大标签', 8);
 				}
 			} ]
 		},{