Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r16330 -r16346
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 16330)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 16346)
@@ -710,7 +710,11 @@
 													var result = Ext.util.JSON.decode(jsonStr);
 													if(result !=null && result !=""){
 														if(result.returnType == 'container'){
-															addPendingWashAndDisinfectBasketToRecord(barcode);
+															if(result.isCurUserDepart != null && result.isCurUserDepart == true){
+																addPendingWashAndDisinfectBasketToRecord(barcode);
+															}else{
+																showResult('请扫描本科室的篮筐!');
+															}
 														}else if(result.returnType == 'rinser'){
 															loadWashMachineByBarcode(barcode);
 														}else if(result.returnType == 'cleanmethod'){
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java
===================================================================
diff -u -r15717 -r16346
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java	(.../BarcodeTableManager.java)	(revision 15717)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/barcode/dwr/table/BarcodeTableManager.java	(.../BarcodeTableManager.java)	(revision 16346)
@@ -1,10 +1,12 @@
 package com.forgon.disinfectsystem.barcode.dwr.table;
 
 import java.text.SimpleDateFormat;
+
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
 
+import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseInstanceUtils;
@@ -57,6 +59,7 @@
 		JSONObject obj = new JSONObject();
 		obj.put("returnType", "");
 		obj.put("message", "未能查询到该条码相关信息");
+		String curUserDepartCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 		if(StringUtils.isNotBlank(barcode)){
 			BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(barcode);
 			if(barcodeDevice !=null){
@@ -72,6 +75,14 @@
 					obj.put("returnType", "container");
 					obj.put("containerType", container.getPurpose());
 					obj.put("status", container.getStatus());
+					String coding = container.getDepartCode();
+					if(StringUtils.isNotBlank(curUserDepartCoding)){
+						if(curUserDepartCoding.equals(coding)){
+							obj.put("isCurUserDepart", true);
+						}else{
+							obj.put("isCurUserDepart", false);
+						}
+					}
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_CLEANMETHOD)){
 					obj.put("returnType", "cleanmethod");
 				}else if(barcodeDevice.getType()!=null && barcodeDevice.getType().equals(BarcodeDevice.BARCODE_TYPE_RINSER)){