Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r23425 -r24579
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 23425)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 24579)
@@ -1,3 +1,5 @@
+var haveJquery = (typeof($) != 'undefined');
+
 // 根据住院号或者诊疗号加载病人信息
 function loadPatientInfoByValAndType(jsonStr) {
 	if (jsonStr != '') {
@@ -96,9 +98,10 @@
 // 设置材料
 function setMaterialsForPrint(tousseObj,barcode){
 	var jsonObj = "";
+	
 	DWREngine.setAsync(false);
 	PackingTableManager.getMaterialByBarcode(barcode,function(result){
-		jsonObj = Ext.decode(result);
+		jsonObj = JSON.parse(result);
 	});
 	DWREngine.setAsync(true);
 	setMaterialsByMaterialObjForPrint(tousseObj,jsonObj);
@@ -123,7 +126,7 @@
 	var typeInfoObj = null;
 	DWREngine.setAsync(false);
 	PackingTableManager.getTypeInfoForPrint(barcode,function(result){
-		typeInfoObj = Ext.decode(result);
+		typeInfoObj = JSON.parse(result);
 	});
 	DWREngine.setAsync(true);
 	
@@ -249,7 +252,7 @@
             		var jsonObj = "";
             		DWREngine.setAsync(false);
             		PackingTableManager.getMaterialByBarcode(barcodes[j],function(result){
-            			jsonObj = Ext.decode(result);
+            			jsonObj = JSON.parse(result);
             		});
             		DWREngine.setAsync(true);
             		var barcodePaperType = jsonObj.barcodePaperType;
@@ -296,7 +299,7 @@
 	var jsonObj = "";
 	DWREngine.setAsync(false);
 	PackingTableManager.getMaterialByBarcode(barcodes[0],function(result){
-		jsonObj = Ext.decode(result);
+		jsonObj = JSON.parse(result);
 	});
 	DWREngine.setAsync(true);
 	setMaterialsByMaterialObjForPrint(tousseObj,jsonObj);
@@ -369,7 +372,11 @@
 	}
 	// 必须先调用此代码，然后才能调用Ext.MessageBox.updateProgress
 //	top.Ext.MessageBox.progress('【' + tousseObj.tousseName + '】打印中', '请稍候...');
-	top.Ext.MessageBox.progress('打印中', '请稍候...');
+	if(haveJquery){
+		
+	}else{
+		top.Ext.MessageBox.progress('打印中', '请稍候...');
+	}
 	for (var i=0;i<tousses.length;i++){
 		var toussesGroup = tousses[i];
 		var curGroupTousseAmount = toussesGroup.tousses.length;
@@ -380,7 +387,12 @@
 //		alert('columnAmount='+columnAmount)
 		if(columnAmount == 1){
 			for (var tgi=0;tgi<curGroupTousseAmount;tgi++){
-				top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+				if(haveJquery){
+					
+				}else{
+					top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+				}
+				
 				toussesGroup.tousses[tgi].columnAmount = columnAmount;
 				doPrintLabel(toussesGroup.tousses[tgi]);
 				++labelsCount;
@@ -393,7 +405,12 @@
 //			alert(cycleAmount)
 			for (var tgi=0;tgi<cycleAmount;tgi++){
 				for (var ci=0;ci<columnAmount;ci++){
-					top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+					if(haveJquery){
+						
+					}else{
+						top.Ext.MessageBox.updateProgress((labelsCount)/labelsAmount,'第' + (labelsCount) + '个,共' + labelsAmount +  '个');
+					}
+					
 					var indexInGroup = tgi*columnAmount+ci;
 					var printObj = toussesGroup.tousses[indexInGroup];
 					printObj.indexInColumn = ci;