Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js
===================================================================
diff -u -r25052 -r25451
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 25052)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/container/containerForm.js	(.../containerForm.js)	(revision 25451)
@@ -22,7 +22,6 @@
 			fields : [ "orgUnitCoding", "orgUnitName"]
 		})
 	});
-	
 	var washClassifyStore = new Ext.data.JsonStore({
 		url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getHttpOptionResultSet.do',
 	    root: 'data',
@@ -89,7 +88,14 @@
 							top.Ext.getCmp('departCode').setValue((record.data.orgUnitCoding));
 						}
 					}
-				}]
+				},{
+                    xtype : 'textfield',
+                    fieldLabel : "绑定科室编码",
+                    allowBlank : true,
+                    name : "bindDepartCodes",
+                    id : "bindDepartCodes",
+                    anchor : '95%'
+                }]
 			}, {
 				columnWidth : 0.5,
 				layout : 'form',
@@ -134,7 +140,7 @@
 					displayField : 'value',
 					store : washClassifyStore,
 					allowBlank: true,
-					editable:true,
+					editable:false,
 					forceSelection : true,
 					triggerAction : 'all',
 					anchor : '95%'
@@ -221,8 +227,20 @@
 	});
 	print_container(barcodeStr,name,unitName2,PRINT_TYPE_PRINT);//打印条码
 }
-
 function validateAndSubmit(print){
+	/*Annie 判断使用空格，特殊符号*/
+    var bindDepartCodes = top.Ext.getCmp('bindDepartCodes').getValue();
+	if(bindDepartCodes != ''){
+         var pattern = new RegExp("[`~!@#$^&*()=|{}':',\\[\\].<>/?~！@#￥\\\\……&*（）——|{}【】‘；：”“'。，、？]");
+        if(pattern.test(bindDepartCodes)){
+            showResult('存在使用非法字符,如果有多个科室编码请使用分号;隔开');
+            return false;
+        }
+        if(bindDepartCodes.indexOf(' ')!== -1 ){
+            showResult('不能使用空格,如果有多个科室编码请使用分号;隔开');
+            return false;
+		}
+	}
 	Ext.Ajax.request({
 		url :  WWWROOT + '/disinfectSystem/baseData/containerAction!validate.do',
 		params : {validateId : top.Ext.getCmp('id').getValue(),valifateName:top.Ext.getCmp('containerName').getValue()},
@@ -253,6 +271,7 @@
 				showResult(result.message);
 				top.Ext.getCmp('saveBtn').enable();
 				top.Ext.getCmp('saveAndPrint').enable();
+
 			}
 		},
 		failure : function(response, options) {
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp
===================================================================
diff -u -r25392 -r25451
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25392)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp	(.../recycleForTouchScreen.jsp)	(revision 25451)
@@ -270,9 +270,9 @@
             <div class="depart">科&nbsp;&nbsp;&nbsp;室&nbsp;&nbsp;<input id="depart" name="depart" type="text" class="input" readonly="readonly" onclick='openSelectDepart();' /></div>
             <div class="appType">类&nbsp;&nbsp;型&nbsp;&nbsp;&nbsp;<input id="appType" name="appType" type="text" readonly="readonly" class="input"/></div>
             <div class="applyTime">申请时间&nbsp;&nbsp;<input id="applyTime" name="applyTime" type="text" readonly="readonly" class="input"/></div>
-            <%--<c:if test="${param.resolution != 1980}">--%>
-            <%--&lt;%&ndash;<div class=scanDiv><input id="codeScan" name="codeScan" type="text" class="inputScan" /></div>&ndash;%&gt;--%>
-            <%--</c:if>--%>
+            <c:if test="${param.resolution != 1980}">
+            <div class=scanDiv><input id="codeScan" name="codeScan" type="text" class="inputScan" /></div>
+            </c:if>
             <div class="add2" id="customIntoBasketDiv" onclick="openCustomIntoBasketPage();"></div>
             <div class="add"><a href="javascript:void(0);" id="add-bao" onclick="openSelectTousse();">添加器械包</a></div>
             <div class="addQM"><a href="javascript:void(0);" id="add-QM" onclick="addQM();" style="${recycleAddQualityMonitoring}"></a></div>
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp
===================================================================
diff -u -r18993 -r25451
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp	(.../addDepart.jsp)	(revision 18993)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/addDepart.jsp	(.../addDepart.jsp)	(revision 25451)
@@ -136,7 +136,7 @@
 	       window.parent.selectDepart(departName,departCode);
 		   closeLayer();
 	   }
-       
+    window.parent.openDepart(departCode);
    }
    
    function pageUp(){
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r25392 -r25451
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25392)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 25451)
@@ -116,7 +116,6 @@
 $(document).ready(function(){
     if(sstsConfig.isCheckIntoTheBox){
     	$('#isCheckIntoTheBox').show();
-        // alert(sstsConfig.isCheckIntoTheBox)
     }
 });
 /**
@@ -3035,7 +3034,6 @@
     var recyclingRecordId = $('#recyclingApplicationId').val();
     if (isTousseItemTableEmpty() && recyclingRecordId == ''){
         alert("空白的回收单不能保存！");
-        alert("空白的回收单不能保存！");
         return false;
     }
     var isEmptyFormSubmit = true;
@@ -3626,6 +3624,32 @@
 	});
 	return canEmpty;
 }
+
+/*Annie 根据科室编码获取绑定的篮筐*/
+function openDepart(departCode){
+    var  openDepart=$('#depart').val()
+	if( openDepart || openDepart!=''){
+		$.ajax({
+			type:'get',
+			url: WWWROOT + '/disinfectSystem/baseData/containerAction!getWashContainerByBindDepartCode.do',
+			data:'bindDepartCode=' +departCode,
+			dataType:'json',
+			success:function(retuls){
+				if(retuls != ''){
+                    $('#scanContainerBarcodeTipUl').hide();
+                    $("#basketsUl").empty();
+                    for (var i =0 ;i < retuls.length; i++){
+                        createBasketUiElement(retuls[i].barcode,retuls[i].id,retuls[i].containerName,retuls[i].washClassifyType);
+                        loadBarcodeDevice(retuls[i].barcode);
+					}
+				}else{
+                    $("#basketsUl").empty();
+                    $('#scanContainerBarcodeTipUl').show();
+				}
+			}
+		})
+	}
+}
 function selectDepart(departName,departCode){
 	var oldValue = document.getElementById('departCode').value;
     //加载科室申领模板