Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java
===================================================================
diff -u -r37454 -r37499
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 37454)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/service/RinserManagerImpl.java	(.../RinserManagerImpl.java)	(revision 37499)
@@ -330,18 +330,12 @@
 	@SuppressWarnings("unchecked")
 	@Override
 	public List<Rinser> getRinserByDepartCoding(String departCoding, String useStatus, Long rinserGroupId) {
-		String hql = String.format("select po from %s po where po.orgUnitCoding = '%s' and po.useStatus = '%s' ",
-				Rinser.class.getSimpleName(), departCoding, useStatus);
+		String hql = String.format("select po from %s po where po.orgUnitCoding = '%s' ",
+				Rinser.class.getSimpleName(), departCoding);
 		if(StringUtils.isNotBlank(useStatus)){
 			hql += String.format(" and po.useStatus = '%s' ", useStatus);
 		}
-		//只有开启了配置项才根据清洗机分组过滤
-		boolean enableRinserGroupFunction = 
-				ConfigUtils.getSystemSetConfigByNameBool("enableRinserGroupFunction");
-		if(enableRinserGroupFunction){
-			if(!DatabaseUtil.isPoIdValid(rinserGroupId)){
-				throw new SystemException("清洗机分组不能为空！");
-			}
+		if(DatabaseUtil.isPoIdValid(rinserGroupId)){
 			hql += String.format(" and po.rinserGroupId = %s ", rinserGroupId);
 		}
 		hql += " order by po.sequence ";