Index: ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js
===================================================================
diff -u -r16626 -r17032
--- ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 16626)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/directPacking.js	(.../directPacking.js)	(revision 17032)
@@ -227,7 +227,7 @@
                             obj.depart = department;
                             //自定义装配时,如果所选科室有值,则默认为要打印科室,无论包定义设置是否打印科室
                             if(obj.department){
-                            	obj.isPrintOrg = true;
+                            	obj.printOrgSource = '回收科室';
                             }
                             defaultPrintPackage(obj);
                             tempPrintNum--;
Index: ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js
===================================================================
diff -u -r16669 -r17032
--- ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 16669)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/rePrintBarcodeWin.js	(.../rePrintBarcodeWin.js)	(revision 17032)
@@ -103,7 +103,7 @@
 				{name : 'isPrint'},
 				{name : 'isTraceable'},
 				{name : 'isSterile'},
-				{name : 'isPrintOrg'},
+				{name : 'printOrgSource'},
 				{name : 'department'},
 				{name : 'applicant'},
 				{name : 'maker'},
@@ -230,8 +230,8 @@
 		hidden:true,
 		sortable : true
 	},{
-		header : '是否打印科室',
-		dataIndex : 'isPrintOrg',
+		header : '打印科室来源',
+		dataIndex : 'printOrgSource',
 		width : 120,
 		sortable : true,
 		hidden :true
@@ -403,7 +403,7 @@
 						DWREngine.setAsync(true);
 					}
 					tousseObj.foreignTousseApp_id = tousseAppID;
-					tousseObj.isPrintOrg = records[i].data['isPrintOrg'];
+					tousseObj.printOrgSource = records[i].data['printOrgSource'];
 					tousseObj.department = records[i].data['department'];
 					tousseObj.depart = tousseObj.department;
 					tousseObj.applicant = records[i].data['applicant'];
@@ -461,7 +461,7 @@
 							}
 							// 打印器械包
 							else{
-								if(tousseObj.isPrintOrg == true){
+								if(tousseObj.printOrgSource != "无"){
 						            tousseObj.tousseName = "(" + tousseObj.department + ")" + tousseObj.tousseName;;
 								}
 								printLabel(tousseObj);
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])){