Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java
===================================================================
diff -u -r36242 -r36246
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java	(.../SterilisationManagerImpl.java)	(revision 36242)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilisation/service/SterilisationManagerImpl.java	(.../SterilisationManagerImpl.java)	(revision 36246)
@@ -254,10 +254,10 @@
 					while(rs.next()){
 						if(arr.size() == 0){
 							defaultId = rs.getLong("sid");
-							if(DatabaseUtil.isPoIdValid(defaultId)){
+							String ssterilisation = rs.getString("ssterilisation");
+							if(DatabaseUtil.isPoIdValid(defaultId) && !"无".equals(ssterilisation) && StringUtils.isNotBlank(ssterilisation)){								
 								JSONArray defaultItem = new JSONArray();
 								defaultItem.add(defaultId);
-								String ssterilisation = rs.getString("ssterilisation");
 								defaultItem.add(ssterilisation);
 								String purpose = "";
 								String ssterilizationPurpose = rs.getString("ssterilizationPurpose");
@@ -290,9 +290,6 @@
 					return arr;
 				}
 			});
-			if(jsonArray.size() == 0){
-				setAllSterilisationJSONarray(jsonArray);
-			}
 		}else{
 			setAllSterilisationJSONarray(jsonArray);
 		}
Index: forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java
===================================================================
diff -u -r36239 -r36246
--- forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 36239)
+++ forgon-core/src/main/java/com/forgon/security/service/UserManagerImpl.java	(.../UserManagerImpl.java)	(revision 36246)
@@ -992,7 +992,7 @@
 						+ "join SS_USER_ROLE sur on sur.ROLE_ID=sro.ROLE_ID "
 						+ "join SS_USERS s on s.id=sur.USER_ID "
 						+ "join barcodeDevice bd on bd.id=s.id "
-						+ "where bd.barcode=? and so.operationId=?);");
+						+ "where bd.barcode=? and so.operationId=?;");
 				return con.prepareStatement(sbd.toString());
 			}
 		}, new PreparedStatementSetter() {
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java
===================================================================
diff -u -r36239 -r36246
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 36239)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/foreignproxydisinfection/dwr/table/ForeignProxyDisinfectionTableManager.java	(.../ForeignProxyDisinfectionTableManager.java)	(revision 36246)
@@ -140,14 +140,6 @@
 			JSONUtil.addProperty(json, "returnType", "");
 			return JSONUtil.addMessage(json, "条码不能为空!").toString();
 		}
-		if("审核".equals(model)){
-			//启用器械包的可选灭菌程序功能 ZSRY-20
-			boolean enableAvailableSterilizationProgramsOfTousseFunction = CssdUtils.getSystemSetConfigByNameBool("enableAvailableSterilizationProgramsOfTousseFunction",false);
-			if(enableAvailableSterilizationProgramsOfTousseFunction){
-				JSONUtil.addProperty(json, "returnType", "");
-				return JSONUtil.addMessage(json, "启用可选灭菌程序时无法扫描灭菌篮筐进行审核!").toString();
-			}
-		}
 		//拆分barcode,分号前作为首,之后作为尾
 		String[] barCodeArray = barcodes.split(";");
 		String barcode = barCodeArray[0];
@@ -184,6 +176,14 @@
 					json.put("returnType", "multiTousseInstancesSuccess");
 					json.put("tousseInstances", tousses);
 				} else if(barcodeDevice instanceof Container){
+					if("审核".equals(model)){
+						//启用器械包的可选灭菌程序功能 ZSRY-20
+						boolean enableAvailableSterilizationProgramsOfTousseFunction = CssdUtils.getSystemSetConfigByNameBool("enableAvailableSterilizationProgramsOfTousseFunction",false);
+						if(enableAvailableSterilizationProgramsOfTousseFunction){
+							JSONUtil.addProperty(json, "returnType", "");
+							return JSONUtil.addMessage(json, "启用可选灭菌程序时无法扫描灭菌篮筐进行审核!").toString();
+						}
+					}
 					Container container = (Container)barcodeDevice;
 					barcodeType = container.getPurpose();
 					barcodeName = container.getContainerName();