Index: ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print/printConfig.js
===================================================================
diff -u -r21987 -r22901
--- ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print/printConfig.js	(.../printConfig.js)	(revision 21987)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmszxyy/print/printConfig.js	(.../printConfig.js)	(revision 22901)
@@ -933,42 +933,45 @@
 		    {label : "江门市中心医院", dataIndex : '', fontSize : 10, position : ["10","4%","90%",5]},
 	            {label : "外来器械接收单", dataIndex : 'header', fontSize : 17, position : ["30","15%","99%",22]},
 	            
-	            {label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["90","4%","90%",5]},
-	            {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["90","80mm","90%",5]},
-	            {label : "年龄：", dataIndex : 'patientAge', fontSize : 11, position : ["90","130mm","90%",5]},
+	            {label : "姓名：", dataIndex : 'patient', fontSize : 11, position : ["65","4%","90%",5]},
+	            {label : "性别：", dataIndex : 'patientSex', fontSize : 11, position : ["65","60mm","90%",5]},
+	            {label : "年龄：", dataIndex : 'patientAge', fontSize : 11, position : ["65","110mm","90%",5]},
 	            
-	            {label : "床号：", dataIndex : 'bedNumber', fontSize : 11, position : ["120","4%","90%",5]},
-	            {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["120","80mm","90%",5]},
+	            {label : "床号：", dataIndex : 'bedNumber', fontSize : 11, position : ["85","4%","90%",5]},
+	            {label : "住院号：", dataIndex : 'hospitalNumber', fontSize : 11, position : ["85","60mm","90%",5]},
 
-	            {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["150","4%","90%",10]},
-	            {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["150","80mm","90%",5]},
-	            {label : "结算科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["150","130mm","90%",10]},
+	            {label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["105","4%","90%",10]},
+	            {label : "申请科室：", dataIndex : 'depart', fontSize : 11, position : ["105","60mm","90%",5]},
+	            {label : "结算科室：", dataIndex : 'settleAccountsDepart', fontSize : 11, position : ["105","110mm","90%",10]},
 	            
-	            {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["180","4%","90%",10]},
-	            {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["180","80mm","90%",10]},
+	            {label : "申请人：", dataIndex : 'applicant', fontSize : 11, position : ["125","4%","90%",10]},
+	            {label : "打印时间:", dataIndex : 'printTime', fontSize : 11, position : ["125","60mm","90%",10]},
 	            
-	            {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["210","4%","90%",5]},
+	            {label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["145","4%","90%",5]},
 	            
+	            {label : "急诊  口", dataIndex : '', fontSize : 11, position : ["165","4%","90%",10]},
+	            {label : "平诊  口", dataIndex : '', fontSize : 11, position : ["165","80mm","90%",10]},
 	            
-	            {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["280","4%","90%",10]},
-	            {label : "手术医生：", dataIndex : 'doctor', fontSize : 11, position : ["320","4%","90%",10]},
-	            {label : "手术时间：", dataIndex : 'operationTime', fontSize : 11, position : ["360","4%","90%",10]},
 	            
-	            {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["400","4%","90%",10]},
+	            {label : "手术名称：", dataIndex : 'surgery', fontSize : 11, position : ["185","4%","90%",10]},
+	            {label : "手术医生：", dataIndex : 'doctor', fontSize : 11, position : ["205","4%","90%",10]},
+	            {label : "手术时间：", dataIndex : 'operationTime', fontSize : 11, position : ["205","60mm","90%",10]},
 	            
+	            {label : "手术器械清单：", dataIndex : '', fontSize : 11, position : ["225","4%","90%",10]},
 	            
-	            {label : "清洗注意事项：", dataIndex : '', fontSize : 11, position : ["680","4%","90%",5]},
-	            {label : "灭菌方式：", dataIndex : '', fontSize : 11, position : ["720","4%","90%",5]},
-	            {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["760","4%","90%",5]},
-	            {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["800","4%","90%",5]},
-	            {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["840","4%","90%",5]},
-	            {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["880","4%","90%",5]},
-	            {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["920","4%","90%",5]}
 	            
+	            {label : "清洗注意事项：", dataIndex : '', fontSize : 11, position : ["370","4%","90%",5]},
+	            {label : "灭菌方式：", dataIndex : '', fontSize : 11, position : ["390","4%","90%",5]},
+	            {label : "公司名称：", dataIndex : 'supplierName', fontSize : 11, position : ["410","4%","90%",5]},
+	            {label : "联系方式：", dataIndex : '', fontSize : 11, position : ["430","4%","90%",5]},
+	            {label : "送包日期及时间：", dataIndex : '', fontSize : 11, position : ["450","4%","90%",5]},
+	            {label : "送包者签名：", dataIndex : '', fontSize : 11, position : ["470","4%","90%",5]},
+	            {label : "回收者签名：", dataIndex : '', fontSize : 11, position : ["470","80mm","90%",5]}
+	            
 	        ],
 	        goodsTable :{
 	        	rowHeight : 25,
-	        	position : ["430","8%","170mm","1000"],
+	        	position : ["245","4%","140mm","125"],
 	        	content : [
 	                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
 	                {header : "名称", dataIndex : 'goodsName', width : 300, align : 'left', fontSize : 11},
@@ -982,7 +985,7 @@
 	            {label : "", dataIndex : ''}
 	        ]
 	    },barcodes : [
-					{codeType : "128Auto", dataIndex : 'serialNum', position : ["30","65%",210,30],
+					{codeType : "128Auto", dataIndex : 'serialNum', position : ["30","55%",210,30],
 						styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
 						          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
 						          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}