Index: ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js
===================================================================
diff -u -r17744 -r17755
--- ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js	(.../printConfig.js)	(revision 17744)
+++ ssts-web/src/main/webapp/disinfectsystem/config/cdlqyq1yy/print/printConfig.js	(.../printConfig.js)	(revision 17755)
@@ -810,6 +810,20 @@
 	    }	    
 	]
 }
+/**
+ * 根据配置是否打印科室来获取科室与包名称，作为标签显示的名称
+ * @param obj
+ * @returns {String}
+ */
+function getDepartAndName(obj){
+	ret = '';
+	if(obj.printOrgSource != "无" && !isUndefinedOrNullOrEmpty(obj.department)){
+		ret += obj.department;
+		ret += '-';
+	}
+	ret += obj.nameWithoutDepart;
+	return ret;
+}
 
 function printPackage_60x80_temp(barcode,name,material,operator,reviewer,sterilizationDate,validDate,hospitalName,sterilizer,frequency,markTousse,sterilingType) {
 	LODOP = getLodop(document.getElementById('LODOP'), document
@@ -1085,20 +1099,16 @@
 	
 	// 划线
 	if(obj.markTousse){
-		LODOP.ADD_PRINT_LINE('17mm','0mm','20mm','70mm',0,1);
-		LODOP.ADD_PRINT_LINE('30mm','0mm','30mm','70mm',0,1);
+		LODOP.ADD_PRINT_LINE('17mm','0mm','17mm','70mm',0,1);
+		LODOP.ADD_PRINT_LINE('31mm','0mm','31mm','70mm',0,1);
 	}
 	// 设置默认字体
 	setDefaultFontNameSizeBold('宋体',15,1);
 	// 默认条码属性
 	LODOP.SET_PRINT_STYLE('ShowBarText', true);
 	LODOP.SET_PRINT_STYLE('FontSize', 6);
 	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
-	var name = obj.nameWithoutDepart;
-	if(obj.department){
-		//如果有科室,打印科室
-		name = obj.department + '-' + obj.nameWithoutDepart
-	}
+	var name = getDepartAndName(obj);
 	
 	var fontSize = getFontSizeByStr(name,[
 	                                        {maxLen:8,fontSize:23},