Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r16267 -r17032
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 16267)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 17032)
@@ -988,7 +988,7 @@
         		  tousseName  = "(" + department + ")" + tousseName;
         	  }*/
         	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
-        	  if(tousseObj.isPrintOrg == true){
+        	  if(tousseObj.printOrgSource != "无"){
         		  tousseName = "(" + department + ")" + tousseName;
         	  }
           }
@@ -2806,7 +2806,25 @@
 	}
 	return null;
 }
-
+function getTemplateConfigByPageType(pageType){
+	var templateName = getRawTemplateName(pageType);
+	if(templateName != null){
+		return allTemplate[templateName];
+	}
+	return null;
+}
+function setPageSizeByTemplateConfig(templateConfig){
+	if(templateConfig != null){
+		var width = templateConfig.width;
+		var height = templateConfig.height;
+		alert(width+','+height)
+		if(!isUndefinedOrNullOrEmpty(width) && !isUndefinedOrNullOrEmpty(height)){
+			doGetLodop();
+//			LODOP.SET_PRINT_PAGESIZE(1,width,height,"");
+			LODOP.SET_PRINT_PAGESIZE(1,"80mm","60mm","");
+		}
+	}
+}
 function invokeTemplatePrintFunction(pageType,obj){
 	var funName = getTemplatePrintFunName(pageType);
 	if(funName != null && !isUndefinedOrNull(window[funName])){