Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r14414 -r14442
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 14414)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java	(.../ForeignTousseApplicationAction.java)	(revision 14442)
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -111,6 +112,8 @@
 	
 	public void loadForeignTousseItems(){
 		String applicationId = StrutsParamUtils.getPraramValue("applicationId", null);
+		String loadApplicationInfo = StrutsParamUtils.getPraramValue("isLoadApplicationInfo", null);
+		JSONArray jsonArray = new JSONArray();
 		if(StringUtils.isBlank(applicationId)){
 			String tousseDefinitionId = StrutsParamUtils.getPraramValue("tousseDefinitionId", null);
 			TousseDefinition td = tousseDefinitionManager.getTousseDefinitionById(tousseDefinitionId);
@@ -121,21 +124,46 @@
 				}
 			}
 		}
+		ForeignTousseApplication app = null;
 		if(StringUtils.isNotBlank(applicationId)){
-			ForeignTousseApplication app = foreignTousseApplicationManager.getById(applicationId);
+			app = foreignTousseApplicationManager.getById(applicationId);
 			if(app != null){
 				boolean confirmRecycle = false;
 				if(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE.equals(app.getRecyclingStatus())){
 					confirmRecycle = true;
 				}
-				buildTousseItemsJson(app.getApplicationItems(),confirmRecycle);
+				jsonArray = buildTousseItemsJson(app.getApplicationItems(),confirmRecycle,jsonArray);
 			}
 		}
-		
+		if(StringUtils.isBlank(loadApplicationInfo)){
+			responsePrint(jsonArray.toString());
+		}else{
+			JSONObject obj  = new JSONObject();
+			if(app != null){
+				obj.put("hospitalNumber", getShowValue(app.getHospitalNumber()));
+				obj.put("clinicNumber", getShowValue(app.getClinicNumber()));
+				obj.put("patient", getShowValue(app.getPatient()));
+				obj.put("patientArea", getShowValue(app.getPatientArea()));
+				obj.put("ascriptionDepartment", getShowValue(app.getAscriptionDepartment()));
+				obj.put("surgery", getShowValue(app.getSurgery()));
+				String operationTime = "";
+				if(app.getOperationTime() != null){
+					operationTime = new SimpleDateFormat("yyyy-MM-dd HH:mm").format(app.getOperationTime());
+				}
+				obj.put("operationTime", operationTime);
+				obj.put("doctor", getShowValue(app.getDoctor()));
+				obj.put("remark", getShowValue(app.getRemark()));
+			}
+			obj.put("tousseInfo", jsonArray);
+			responsePrint(obj.toString());
+		}
 	}
-
-	private void buildTousseItemsJson(List<TousseItem> tousseItems,boolean confirmRecycle) {
-		JSONArray jsonArray = new JSONArray();
+	
+	private String getShowValue(String value){
+		return StringUtils.isBlank(value)?"":value;
+	}
+	
+	private JSONArray buildTousseItemsJson(List<TousseItem> tousseItems,boolean confirmRecycle,JSONArray jsonArray) {
 		if(tousseItems != null){
 			for (TousseItem tousseItem : tousseItems) {
 				String tousseName = tousseItem.getTousseName();
@@ -197,7 +225,7 @@
 				}
 			}
 		}
-		responsePrint(jsonArray.toString());
+		return jsonArray;
 	}
 
 	private void responsePrint(String result) {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r14438 -r14442
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 14438)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp	(.../setForeignTousseDefinition.jsp)	(revision 14442)
@@ -22,7 +22,7 @@
 	var row = '${param.row}';
 
 	//动态加载JS和CSS
-	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/style.css" rel="stylesheet" type="text/css" />');
+	document.write('<link href="${ctx}/disinfectsystem/touchScreen/recycle/${param.resolution}/images/foreignTousseStyle.css" rel="stylesheet" type="text/css" />');
 
 	function add(row) {
 		$('#recycleAmount' + row).html(parseInt($('#recycleAmount' + row).html(), 10) + 1);
@@ -176,14 +176,29 @@
 		$.ajax({
 			type : 'post',
 			url : WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!loadForeignTousseItems.do',
-			data : {applicationId : applicationId,tousseDefinitionId : tousseDefinitionID},
+			data : {applicationId : applicationId,tousseDefinitionId : tousseDefinitionID,isLoadApplicationInfo:true},
 			dataType : 'json',
 			success : function(msg) {
+				if(msg == ""){
+					return;
+				}
 				
-				supplierName = msg[0].supplierName;
-				tousseName = msg[0].tousseName;
-				var amount = msg[0].amount;
-				var price = msg[0].price;
+				$('#hospitalNumber').text("住院号：" + msg.hospitalNumber);
+				$('#clinicNumber').text("诊疗号：" + msg.clinicNumber);
+				$('#patient').text("病人姓名：" + msg.patient);
+				$('#patientArea').text("病区：" + msg.patientArea);
+				$('#ascriptionDepartment').text("病人所属科室："+msg.ascriptionDepartment);
+				$('#doctor').text("医生：" + msg.doctor);
+				$('#remark').text("备注：" + msg.remark);
+				$('#surgery').text("手术名称：" + msg.surgery);
+				$('#operationTime').text("手术时间：" + msg.operationTime);
+				
+				var foreignTousseArray = msg.tousseInfo;
+				
+				supplierName = foreignTousseArray[0].supplierName;
+				tousseName = foreignTousseArray[0].tousseName;
+				var amount = foreignTousseArray[0].amount;
+				var price = foreignTousseArray[0].price;
 				var tousseElement = $('<tr>'
 						+ '<input type="hidden" id="type0" value="tousse"/>'
 						+ '<td class="w111">'+supplierName+'</td>'
@@ -196,7 +211,7 @@
 						+ '</tr>');
 				$("#recyclingErrorTable").append(tousseElement);
 				
-				var children = msg[0].children;
+				var children = foreignTousseArray[0].children;
 				
 				var rowNum = 1;
 				for(var i = 0;i < children.length ; i++){
@@ -228,9 +243,32 @@
 		});
 	});
 </script>
-<body onload="zoomTouchScreenViewToActualScreenSize(1000,730,${param.width},${param.height});">
+<body onload="zoomTouchScreenViewToActualScreenSize(1100,950,${param.width},${param.height});">
 	<div class="clds-box">
 		<div class="table">
+		    <table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<tr class="title">
+					<th width="25%" align="left" id="hospitalNumber">住院号：</th>
+					<th width="25%" align="left" id="clinicNumber">诊疗号：</th>
+					<th width="25%" align="left" id="patient">病人姓名：</th>
+					<th width="25%" align="left" id="patientArea">病区：</th>
+				</tr>
+				<tr class="title">
+					<th width="25%" align="left" id="patientArea">病区：</th>
+					<th width="25%" align="left" id="ascriptionDepartment">病人所属科室：</th>
+					<th width="25%" align="left" id="doctor">医生：</th>
+					<th width="25%" align="left" ></th>
+				</tr>
+				<tr class="title">
+				    <th width="99%" align="left" colspan="4" id="surgery">手术名称：</th>
+				</tr>
+				<tr class="title">
+				    <th width="99%" align="left" colspan="4" id="operationTime">手术时间：</th>
+				</tr>
+				<tr class="title">
+					<th width="100%" align="left" colspan="4" id="remark"></th>
+				</tr>
+			</table>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr class="title">
 					<th width="25%">供应商</th>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css	(revision 14442)
@@ -0,0 +1,289 @@
+/*清除文档类型声明中的默认属性*/
+body {font-family:"微软雅黑",serif;font-size:12px; background:#fff; overflow:hidden;}
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,blockquote,p,table{padding:0; margin:0;}   
+table,td,tr,th{font-size:12px;}
+li{list-style-type:none;}
+fieldset,img{border:none; color:gray;}
+ol,ul {list-style:none;}   
+h1,h2,h3,h4,h5,h6 {font-size:12px; font-weight:normal;}   
+q:before,q:after {content:'';}   
+abbr,acronym {border:0;}
+address,caption,cite,code,dfn,em,th,var {font-weight:normal; font-style:normal;}
+em,i{ float:right; font-family:Arial, Helvetica, sans-serif;}
+
+/*通用字体样式定义*/
+a {color:#000;text-decoration:none;}
+a:visited {text-decoration:none;}
+a:hover {color:#BA2636;text-decoration:underline;}
+a:active {color:#BA2636;text-decoration:none;}
+/*通用定义*/
+.clear{clear:both; height:0px; display:block; font-size:1px; overflow:hidden}
+.clearfix:after {clear:both; height:0; overflow:hidden; display:block; visibility:hidden; content:"."; }
+.left{ float:left;}
+.right{ float:right;}
+.blank5 {clear:both; height:5px; display:block; font-size:1px;overflow:hidden;}
+.blank10 {clear:both; height:10px; display:block; font-size:1px;overflow:hidden;}
+.blank15 {clear:both; height:15px; display:block; font-size:1px;overflow:hidden;}
+.blank20 {clear:both; height:20px; display:block; font-size:1px;overflow:hidden;}
+.blank40 {clear:both; height:40px; display:block; font-size:1px;overflow:hidden;}
+
+.mbody{ background:url(body_bg.jpg) no-repeat; width:1980px; height:1080px; margin:0 auto; position:relative}
+.add-form{ position:absolute; width:855px; height:151px; top:233px; left:175px}
+.add-form div{ position:absolute;}
+.add-form .input{ background:url(pic_bg.jpg) no-repeat 0 -135px; width:272px; height:42px; border:0px; font-size:26px; padding:10px 10px; line-height:40px;}
+.add-form .name{ top:5px; left:70px;}
+.add-form .time{ top:5px; right:10px;}
+.add-form .room{ bottom:4px; left:70px;}
+.add-form .add{ bottom:4px; right:-161px;}
+.add-form .add a{background:url(pic_bg.jpg) no-repeat; width:169px; height:62px; display:block; line-height:200px; overflow:hidden}
+.add-form .add a:hover{ background-position:0 -63px;}
+.add-form .add2{ bottom:4px; right:-153px;top:6px}
+.add-form .add2{background:url(customerIntobasket.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;}
+.add-form .add2:hover{background:url(customerIntobaskethovert.png) no-repeat; width:150px; height:64px; line-height:200px; overflow:hidden;}
+
+.data-table{position:absolute; width:1160px; height:500px; bottom:90px; left:33px}
+.data-table .box{ height:435px; overflow-y:scroll; overflow-x:hidden;}
+.data-table .box table{ margin:0 auto; width:1083px}
+.data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
+.data-table .input-a-yellow{ background:url(pic_bg.jpg) no-repeat 0 -1030px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
+.data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;}
+.data-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;}
+.data-table .add:hover{ background-position:-318px -64px}
+.data-table .minus{ background:url(pic_bg.jpg) no-repeat -367px 0px; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;}
+.data-table .minus:hover{ background-position:-367px -64px}
+
+.data-table .btn-box{ margin-top:6px;}
+.data-table .btn-box table{ margin:0 auto}
+.data-table .btn-box input{ background:url(btn-box.jpg) no-repeat; border:none; line-height:200px; overflow:hidden; text-indent:-9999px}
+.data-table .btn-box .btn-e{ background:url(btn_save.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;}
+.data-table .btn-box .btn-b:hover{ background-position:-142px -64px; }
+.data-table .btn-box .btn-c{ background:url(btn_confirm.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-c:hover{ background:url(btn_confirm1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-d{ background:url(btn_cancel.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-d:hover{ background:url(btn_cancel1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-f{ background:url(btn_exit.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; }
+.data-table .btn-box .btn-f:hover{ background:url(btn_exit1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.data-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; }
+.data-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.mbody .btn-h{ margin-left: 790px;margin-top: 420px; background:url(allIntoBasket.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
+.mbody .btn-h:hover{ margin-left: 790px;margin-top: 420px; background:url(allIntoBaskehovert.png) no-repeat; background-position:0 0; width:150px; height:64px; border:none; line-height:200px; overflow:hidden;}
+
+
+.data-table a{line-height:200px; overflow:hidden; display:block}
+.data-table .btn-a{background:url(pic_bg.jpg) no-repeat 0px -284px; width:83px; height:63px; }
+.data-table .btn-a:hover{ background-position:0 -349px}
+.data-table .btn-b{background:url(pic_bg.jpg) no-repeat -89px -284px; width:83px; height:63px; }
+.data-table .btn-b:hover{ background-position:-89px -349px}
+.data-table .btn-b-edit{background:url(pic_bg_edit.jpg) no-repeat -89px -284px; width:83px; height:63px; }
+.data-table .btn-b-edit:hover{ background-position:-89px -349px}
+.data-table .btn-d{background:url(pic_bg.jpg) no-repeat -267px -284px; width:83px; height:63px; }
+.data-table .btn-d:hover{ background-position:-267px -349px}
+.data-table .btn-c{background:url(pic_bg.jpg) no-repeat -178px -284px; width:83px; height:63px; }
+.data-table .btn-c:hover{ background-position:-178px -349px}
+.data-table .btn-c-edit{background:url(pic_bg_edit.jpg) no-repeat -178px -284px; width:83px; height:63px; }
+.data-table .btn-c-edit:hover{ background-position:-178px -349px}
+.data-table td{ padding:4px 2px}
+
+.fenpei-table{ position:absolute;width:629px; height:167px; top:320px; right:113px}
+.fenpei-table .box{height:212px; overflow-y:scroll;overflow-x:hidden}
+.fenpei-table .box table{ margin:0 auto; width:620px}
+.fenpei-table .box .w1{ width:140px;}
+.fenpei-table .box .w2{ width:86px;}
+.fenpei-table .box .w3{ width:255px;}
+
+.fenpei-table .btn{ background:url(pic_bg.jpg) no-repeat 0 -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
+.fenpei-table .btn:hover{ background-position:0 -475px;}
+.fenpei-table table,.zhuangzai-table table{ border-right:1px solid #ddd; border-bottom:1px solid #ddd}
+.fenpei-table td,.zhuangzai-table table td{ font-size:18px; color:#666;border-top:1px solid #ddd; border-left:1px solid #ddd; text-align:center; padding:3px 0}
+
+.zhuangzai-table{position:absolute;width:629px; height:695px; bottom:64px; right:113px}
+.zhuangzai-table .box{height:690px; overflow-y:scroll; overflow-x:hidden}
+.zhuangzai-table table td{ padding:7px 0}
+.zhuangzai-table .name,.zhuangzai-table .num{}
+.zhuangzai-table span{ margin-left:10px;}
+.zhuangzai-table .add{background:url(pic_bg.jpg) no-repeat -318px -136px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
+.zhuangzai-table .minus{background:url(pic_bg.jpg) no-repeat -318px -162px; width:22px; height:23px; display:inline-block; margin-right:10px;cursor:pointer}
+.zhuangzai-table .sed{ display:none}
+.zhuangzai-table .list-item li{ background:url(table_bg.gif) no-repeat top center; padding:8px 0px 7px 0;font-size:18px; color:#666; line-height:58px; }
+.zhuangzai-table .list-item li em{ width:85px; text-align:center;}
+.zhuangzai-table .list-item li i{ width:129px; text-align:center}
+.zhuangzai-table .list-item li .btn{ background:url(pic_bg.jpg) no-repeat -86px -417px; width:84px; height:58px; display:block; line-height:200px; overflow:hidden; margin:0 auto}
+.zhuangzai-table .list-item li .btn:hover{ background-position: -86px -475px; }
+.zhuangzai-table .list-item dl{ margin-top:7px; width:625px; background:#f9fce8; }
+.zhuangzai-table .list-item dd{ float:left;  border-bottom:1px solid #ddd;border-right:1px solid #ddd; padding:7px 0; text-align:center; }
+.zhuangzai-table .list-item .name{ width:235px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .name span{ no-repeat 0 10px; padding-left:0px;}
+.zhuangzai-table .list-item .barcode{ width:160px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .num{ width:86px;height:58px;line-height:25px;overflow:hidden;}
+.zhuangzai-table .list-item .del{ width:114px;}
+
+.copyRight{ position:absolute; bottom:0; height:29px; text-align:center; font-family:Tahoma, Geneva, sans-serif; width:1980px; font-size:16px; line-height:29px;}
+
+.clds-box{ width:1300px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
+.clds-box .table{ border:1px solid #ddd; padding:1px}
+.clds-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;}
+.clds-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;}
+.clds-box .box{height:500px; overflow-y:scroll; background:#fff; overflow-x:hidden,text-align:left; float:left}
+.clds-box .box table{ margin:0 auto; width:1280px}
+.clds-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0}
+.clds-box .box .w1{ width:236px;}
+.clds-box .box .w2{ width:171px}
+.clds-box .box .w3{ width:190px;}
+.clds-box .box .w4{ width:143px}
+.clds-box .box .w5{ width:475px}
+.clds-box .box .w6{ width:171px}
+
+.clds-box .box .w11{ width:380px;}
+.clds-box .box .w22{ width:190px}
+.clds-box .box .w33{ width:190px;}
+.clds-box .box .w44{ width:190px}
+.clds-box .box .w55{ width:475px}
+.clds-box .box .w66{ width:171px}
+
+.clds-box .box .w111{ width:500px;}
+.clds-box .box .w222{ width:500px;height:60px;}
+.clds-box .box .w333{ width:190px;}
+.clds-box .box .w444{ width:190px}
+.clds-box .box .w555{ width:190px}
+.clds-box .box .w666{ width:190px}
+.clds-box .box .w777{ width:190px}
+
+.clds-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden }
+.clds-box .add:hover{ background-position:0 -751px; }
+.clds-box .minus{background:url(pic_bg.jpg) no-repeat -72px -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden}
+.clds-box .minus:hover{ background-position:-72px -751px; }
+.clds-box .send{ margin-top:15px;}
+.clds-box .send td{ text-align:center;}
+.clds-box .send .submit{ display:block; width:137px; height:63px; background:url(btn_save.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .submit:hover{ display:block; width:137px; height:63px; background:url(btn_save1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .cancel{ display:block; width:137px; height:63px; background:url(btn_cancel.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .cancel:hover{ display:block; width:137px; height:63px; background:url(btn_cancel1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.clds-box .send table{ width:50%; margin:0 auto}
+
+.image-box{ width:290px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:0px 0px}
+.image-box .table{ border:1px solid #ddd; padding:1px}
+.image-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:20px;}
+.image-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:40px;}
+.image-box .box{height:393px; overflow-y:scroll; background:#fff; overflow-x:hidden}
+.image-box .box table{ margin:0 auto; width:290px}
+.image-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:13px; color:#2e6271; padding:8px 0}
+.image-box .box .w7{font-size:18px; width:20px}
+.image-box .box .w8{font-size:18px; width:20px}
+
+.remark-box{ margin:0 auto; font-size:13px; background:#f0f0f0; padding:0px 0px}
+.remark-box .table{ border:1px solid #ddd; padding:1px}
+.remark-box .box{ overflow-y:scroll; background:#fff; overflow-x:hidden}
+.remark-box .box .notice{color:#2e6271;}
+.remark-box .box .noticetitle{text-align:center;font-size:15px;color:#2e6271;}
+
+.afrl-box{ width:1980px; margin:0 auto; font-size:18px; background:#f0f0f0; padding:15px 10px}
+.afrl-box .table{ border:1px solid #ddd; padding:1px}
+.afrl-box .table th{ border-right:1px solid #fff;border-bottom:1px solid #ddd; color:#369; font-size:26px;}
+.afrl-box .title{ background:url(tit_bg_01.jpg) repeat-x; height:45px;}
+.afrl-box .box{height:800px; overflow-y:scroll; background:#fff; overflow-x:hidden}
+.afrl-box .box table{ margin:0 auto; width:1965px}
+.afrl-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0}
+.afrl-box .box .v1{ width:388px;}
+.afrl-box .box .v2{ width:388px}
+.afrl-box .box .v3{ width:388px;}
+.afrl-box .box .v4{ width:388px}
+.afrl-box .box .v5{ width:388px}
+.afrl-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden }
+.afrl-box .add:hover{ background-position:0 -751px; }
+.afrl-box .minus{background:url(pic_bg.jpg) no-repeat -72px -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden}
+.afrl-box .minus:hover{ background-position:-72px -751px; }
+.afrl-box .send{ margin-top:15px;}
+.afrl-box .send td{ text-align:center;}
+.afrl-box .send .submit{ display:block; width:137px; height:63px; background:url(btn_save.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send .submit:hover{ display:block; width:137px; height:63px; background:url(btn_save1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send .cancel{ display:block; width:137px; height:63px; background:url(btn_cancel.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send .cancel:hover{ display:block; width:137px; height:63px; background:url(btn_cancel1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send .new{ display:block; width:137px; height:63px; background:url(btn_new1.png) no-repeat 0px 0px; margin:0 auto;line-height:200px; overflow:hidden}
+.afrl-box .send table{ width:50%; margin:0 auto}
+
+.selblog .select_box{width:133px;height:48px; margin:0 auto}
+.selblog div.tag_select{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 0;padding:0 10px 0 20px;line-height:45px; text-align:left;}
+.selblog div.tag_select_hover{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 -49px;padding:0 10px 0 20px;line-height:45px;text-align:left;}
+.selblog div.tag_select_open{display:block;color:#000;width:103px;height:48px;background:transparent url(../images/selblog.gif) no-repeat 0 -98px;padding:0 10px 0 20px;line-height:45px;text-align:left;}
+
+.selblog ul.tag_options{position: absolute;list-style:none;padding:0 0 0px;margin:10;width:85px; background:transparent url(../images/selblog.gif) no-repeat -152px -5px; height:75px;}
+.selblog ul.tag_options li{display:block;width:65px;padding:0 10px;height:35px;text-decoration:none;line-height:35px;color:#000;}
+
+.selblog ul.tag_options li.open_hover{color:#F00}
+.selblog ul.tag_options li.open_selected{color:#900}
+
+.add-bao{ width:915px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:20px 0; margin-top:20px}
+.add-bao .num{ width:850px; margin:0 auto}
+.add-bao .num li{ float:left; width:94px; margin-bottom:8px;}
+.add-bao .num li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px;  width:52px; height:62px;  font-size:26px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif}
+.add-bao .num li a:hover{ color:#F00}
+.add-bao .search td{ font-size:40px;}
+.add-bao .search .input{ background:url(pic_bg.jpg) no-repeat 0 -545px; width:291px; height:62px; line-height:45px; overflow:hidden; padding:0 10px; border:none; font-size:26px;}
+.add-bao .search .btn{background:url(pic_bg.jpg) no-repeat -177px -417px; width:143px; height:62px; border:none}
+.add-bao .search .btn:hover{ background-position:-177px -480px;}
+.add-bao .search table{ margin:0 auto}
+.add-bao .title{ width:890px; margin:15px auto}
+.add-bao .list-item{ width:890px; margin-left: 50px}
+.add-bao .list-item li{ float:left; width:400px; padding-right:10px; margin-bottom:8px;}
+.add-bao .list-item li a{ background:url(pic_li.jpg) no-repeat 0 0; width:395px; height:54px; line-height:62px; overflow:hidden; padding:0 10px;font-size:22px; display:block}
+
+.num-ten{ width:575px; margin:0 auto; border:1px solid #ccc; background:url(bao_bg.jpg) repeat-x; padding:30px 0; margin-top:20px}
+.num-ten .num{ width:520px; margin:0 auto}
+.num-ten .num li{ float:left; width:100px; margin-bottom:8px;}
+.num-ten .num li a{ display:block;background:url(pic_bg.jpg) no-repeat -319px -545px;  width:52px; height:62px; font-size:40px; padding:0 5px; line-height:62px; text-align:center; color:#2e6271; margin:0 auto; font-family:Tahoma, Geneva, sans-serif}
+.num-ten .num li a:hover{ color:#F00}
+.num-ten .search td{ font-size:26px; }
+.num-ten .search .input{ background:url(pic_bg.jpg) no-repeat -288px -822px; width:148px; height:62px; line-height:45px; overflow:hidden; padding:0 3px; border:none; font-size:26px;}
+.num-ten .search .btn-a{background:url(pic_bg.jpg) no-repeat -140px -691px; width:103px; height:62px; border:none; margin-right:5px}
+.num-ten .search .btn-a:hover{ background-position:-140px -755px;}
+.num-ten .search .btn-b{background:url(pic_bg.jpg) no-repeat -248px -691px; width:103px; height:62px; border:none}
+.num-ten .search .btn-b:hover{ background-position:-248px -755px;}
+.num-ten .search table{ margin:0 auto}
+
+
+.selectDate-table{width:1080px; height:250px;}
+.selectDate-table .box{ height:250px; overflow-y:hidden; overflow-x:hidden;}
+.selectDate-table .box table{ margin:0 auto; width:933px}
+.selectDate-table input{text-align:center;}
+.selectDate-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:396px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
+.selectDate-table .input-a-yellow{ background:url(pic_bg.jpg) no-repeat 0 -1030px; border:none; width:396px; height:62px; font-size:26px; padding:0 10px; line-height:40px;}
+.selectDate-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:62px; height:62px; font-size:26px; padding:0 0px; line-height:40px;}
+.selectDate-table .input-title{ border:none; width:105px; height:62px; font-size:26px; padding:0 5px; line-height:40px;}
+.selectDate-table .input-head{ border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:40px;}
+.selectDate-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;}
+.selectDate-table .add:hover{ background-position:-318px -64px}
+.selectDate-table .minus{ background:url(pic_bg.jpg) no-repeat -367px 0px; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;}
+.selectDate-table .minus:hover{ background-position:-367px -64px}
+
+.selectDate-table .btn-box{ margin-top:6px;}
+.selectDate-table .btn-box table{ margin:0 auto}
+.selectDate-table .btn-box input{ background:url(btn-box.jpg) no-repeat; border:none; line-height:200px; overflow:hidden; text-indent:-9999px}
+.selectDate-table .btn-box .btn-e{ background:url(btn_save.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-e:hover{ background:url(btn_save1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-b{ background-position:-142px 0; width:203px; height:64px;}
+.selectDate-table .btn-box .btn-b:hover{ background-position:-142px -64px; }
+.selectDate-table .btn-box .btn-c{ background:url(btn_confirm.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-c:hover{ background:url(btn_confirm1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-d{ background:url(btn_cancel.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-d:hover{ background:url(btn_cancel1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-f{ background:url(btn_exit.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; }
+.selectDate-table .btn-box .btn-f:hover{ background:url(btn_exit1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+.selectDate-table .btn-box .btn-g{ background:url(btn_stop.png) no-repeat; background-position:0 0; width:137px; height:64px; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block; }
+.selectDate-table .btn-box .btn-g:hover{ background:url(btn_stop1.png) no-repeat; background-position:0 0; border:none; line-height:200px; overflow:hidden; text-indent:-9999px; display:block;}
+
+
+.selectDate-table a{line-height:200px; overflow:hidden; display:block}
+.selectDate-table .btn-a{background:url(pic_bg.jpg) no-repeat 0px -284px; width:83px; height:63px; }
+.selectDate-table .btn-a:hover{ background-position:0 -349px}
+.selectDate-table .btn-b{background:url(pic_bg.jpg) no-repeat -89px -284px; width:83px; height:63px; }
+.selectDate-table .btn-b:hover{ background-position:-89px -349px}
+.selectDate-table .btn-d{background:url(pic_bg.jpg) no-repeat -267px -284px; width:83px; height:63px; }
+.selectDate-table .btn-d:hover{ background-position:-267px -349px}
+.selectDate-table .btn-c{background:url(pic_bg.jpg) no-repeat -178px -284px; width:83px; height:63px; }
+.selectDate-table .btn-c:hover{ background-position:-178px -349px}
+.selectDate-table td{ padding:4px 4px}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r14412 -r14442
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14412)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 14442)
@@ -1332,6 +1332,7 @@
 			height = size.height;
 			
 			offsetTop = offsetTop*zoomRatio;
+			
 		    $.layer({
 		        type : 2,
 		        title : [tousseName + '  信息',true],