Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r28854 -r28866
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28854)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 28866)
@@ -2076,7 +2076,9 @@
 				return JSONUtil.buildErrorMsgJsonResult("此篮筐状态异常:"
 						+ container.getStatus());
 			}
-
+			if(!StringUtils.equals(AcegiHelper.getCurrentOrgUnitCode(), container.getDepartCode())){
+				return JSONUtil.buildErrorMsgJsonResult("该篮筐不属于当前科室、请扫描当前科室的篮筐");
+			}
 			Set<TousseInstance> tousseInstances = tousseInstanceManager
 					.getReviewedTousseInstanceByBasket(barcode);
 			JSONArray tousseInstanceJSONArray = JSONArray.fromObject(
@@ -2093,14 +2095,6 @@
 
 			// 器械包
 		} else if (barcodeDevice instanceof TousseInstance) {
-			// 验证器械包状态
-			Predicate<TousseInstance> predicate1 = new Predicate<TousseInstance>() {
-				@Override
-				public boolean evaluate(TousseInstance tousseInstance) {
-					return tousseInstanceManager
-							.isTousseStatusCorrect(tousseInstance);
-				}
-			};
 
 			Collection<TousseInstance> resultTousseInstanceList;
 			TousseInstance tousseInstance = (TousseInstance) barcodeDevice;
@@ -2116,9 +2110,19 @@
 						departCode, extraParam,
 						tousseDefinition);
 			} else {
+				// 验证器械包状态
+				Predicate<TousseInstance> predicate1 = new Predicate<TousseInstance>() {
+					@Override
+					public boolean evaluate(TousseInstance tousseInstance) {
+						/*return tousseInstanceManager
+								.isTousseStatusCorrect(tousseInstance);*/
+						return StringUtils.equals(tousseInstance.getStatus(), TousseInstance.STATUS_REVIEWED);
+					}
+				};
 				if (!predicate1.evaluate(tousseInstance)) {
-					return JSONUtil.buildErrorMsgJsonResult("器械包状态异常:"
-							+ tousseInstance.getStatus());
+					/*return JSONUtil.buildErrorMsgJsonResult("器械包状态异常:"
+							+ tousseInstance.getStatus());*/
+					return JSONUtil.buildErrorMsgJsonResult("器械包处于[" + tousseInstance.getStatus() + "]状态,不能进行灭菌装载");
 				}
 				
 				if (StringUtils.isNotEmpty(tousseInstance.getOrgUnitCoding())) {