Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java
===================================================================
diff -u -r18216 -r18584
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 18216)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/RaRoomControlHelper.java	(.../RaRoomControlHelper.java)	(revision 18584)
@@ -105,7 +105,7 @@
         if (StringUtils.isNotBlank(typeSql)) {
             whereSql += String.format(" and %s", typeSql);
         }
-        whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySql(tousseName, tousseType, whereSql);
+        whereSql = supplyRoomControlManager.setDisinfectionGoodsQuerySqlForRecyclingApplication(tousseName, tousseType, whereSql);
         return whereSql;
     }
 
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r17512 -r18584
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 17512)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 18584)
@@ -510,6 +510,21 @@
 		}
 		return sql;
 	}
+	
+	@Override
+	public String setDisinfectionGoodsQuerySqlForRecyclingApplication(String tousseName,
+			String tousseType, String sql) {
+		if(StringUtils.isNotBlank(tousseName)){
+			if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
+				//sql += " and po.\"tousseName\" like '%" + tousseName + "%'";
+				//v4.1去掉下划线后,消毒物品现在也改为按包名查询
+				sql += " and po.\"tousseName\" = '" + tousseName + "'";
+			}else{
+				sql += " and po.\"tousseName\" = '" + tousseName + "'";
+			}
+		}
+		return sql;
+	}
 
 	@SuppressWarnings("unchecked")
 	@Override
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java
===================================================================
diff -u -r16631 -r18584
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java	(.../SupplyRoomControlManager.java)	(revision 16631)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManager.java	(.../SupplyRoomControlManager.java)	(revision 18584)
@@ -40,5 +40,22 @@
 
 	Integer []countBySql(String sql);
 
+	/**
+	 * 设置查询条件(用于运作监控模块的清洗、装配、审核、灭菌、发货部分的数据查询)
+	 * @param tousseName
+	 * @param tousseType
+	 * @param sql
+	 * @return
+	 */
 	String setDisinfectionGoodsQuerySql(String tousseName, String tousseType, String sql);
+	
+	/**
+	 * 设置查询条件(用于运作监控模块的回收申请部分的数据查询)
+	 * @param tousseName
+	 * @param tousseType
+	 * @param sql
+	 * @return
+	 */
+	public String setDisinfectionGoodsQuerySqlForRecyclingApplication(String tousseName,
+			String tousseType, String sql);
 }