Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r37829 -r37858
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 37829)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 37858)
@@ -7155,8 +7155,7 @@
             //2、 当天审核的，未入筐的器械包
             //List<TousseSimpleVO> toussesOutsideBasketOfToday = getTodayReviewedTousseInstanceWithOutBasket(orgUnitCoding);
             //当天审核的，未入筐的器械包(新) ：包括固定条码汇总
-            boolean onlyQueryNoHave = MapUtils.isNotEmpty(sterilingTypeMap)?true:false;
-            List<TousseSimpleVO> toussesOutsideBasketOfToday = getTodayReviewedTousseInsWithOutBasketBySterilization(onlyQueryNoHave,orgUnitCoding, enableUrgentFunction, extraOrder, sterilingMode, enableSterilizersAndFrequencyFilterToSterilizeItems?sterilizerNameTemp:null, enableSterilizersAndFrequencyFilterToSterilizeItems?sterileFrequency:null, openGoodsSearch);
+            List<TousseSimpleVO> toussesOutsideBasketOfToday = getTodayReviewedTousseInsWithOutBasketBySterilization(orgUnitCoding, enableUrgentFunction, extraOrder, sterilingMode, enableSterilizersAndFrequencyFilterToSterilizeItems?sterilizerNameTemp:null, enableSterilizersAndFrequencyFilterToSterilizeItems?sterileFrequency:null, openGoodsSearch);
             for (TousseSimpleVO tousseOutsideBasket : toussesOutsideBasketOfToday) {
                 //器械包的灭菌程序，属于此灭菌分组或者此灭菌炉（或者器械包的灭菌程序为“无”）才会显示（没选灭菌炉就按灭菌分组过滤）
                 if (sterilingTypeMap != null && !Constants.HAS_TYPE_NO.equals(tousseOutsideBasket.getSterilingType())) {
@@ -7975,12 +7974,12 @@
 
     @Override
     public List<TousseSimpleVO> getTodayReviewedTousseInsWithOutBasketBySterilization(
-    		 boolean onlyQueryNoHave ,String orgUnitCode, boolean enableUrgentFunction ,String extraOrder, String sterilingMode
+    		 String orgUnitCode, boolean enableUrgentFunction ,String extraOrder, String sterilingMode
             ,String sterilizerName, String sterileFrequency, boolean openGoodsSearch) {
         ResultSet rs = null;
         List<TousseSimpleVO> tousseList = new ArrayList<TousseSimpleVO>();
         try {
-        	rs = objectDao.executeSql(getToDayReviewedTousseInsSql(onlyQueryNoHave, orgUnitCode, enableUrgentFunction, extraOrder, sterilingMode, sterilizerName, sterileFrequency,openGoodsSearch));
+        	rs = objectDao.executeSql(getToDayReviewedTousseInsSql(orgUnitCode, enableUrgentFunction, extraOrder, sterilingMode, sterilizerName, sterileFrequency,openGoodsSearch));
         	if(enableUrgentFunction){
         		while(rs.next()){
                     TousseSimpleVO ti = new TousseSimpleVO();
@@ -8039,9 +8038,6 @@
         }finally {
             DatabaseUtil.closeResultSetAndStatement(rs);
         }
-        if(onlyQueryNoHave){
-        	return tousseList;
-        }
         // 不追溯的包，包括非今天审核的
         ResultSet rs1 = null;
         try {
@@ -8100,10 +8096,9 @@
      * @param orgUnitCode
      * @param enableUrgentFunction 是否开启加急
      * @param extraOrder 排序语句
-     * @param onlyQueryNoHave 只查询TousseInstance.sterilingType='无'
      * @return
      */
-    private String getToDayReviewedTousseInsSql(boolean onlyQueryNoHave, String orgUnitCode, boolean enableUrgentFunction, String extraOrder, String sterilingMode
+    private String getToDayReviewedTousseInsSql(String orgUnitCode, boolean enableUrgentFunction, String extraOrder, String sterilingMode
     		,String sterilizerName, String sterileFrequency, boolean openGoodsSearch){
     	//待灭菌物品列表中显示按照科室供应室设置里面的每天开始时间作为时间节点(ZYYFS-118)
         Date out_beginTime = new Date();
@@ -8175,7 +8170,6 @@
                 + "and ti.reviewBasket_id is null  "+dateSql+" "
                 + sterilingModeSql
                 + sterilizerNameAndSterileFrequencySql
-                + (onlyQueryNoHave?" and ti.sterilingType='无' ":"")
                 + "and (pd.id is null and ti.orgunitcoding='"+orgUnitCode+"' or pd.id is not null and pd.handleDepartCoding='"+orgUnitCode+"') "+ 
                 " and (ti.hasReceived is null or ti.hasReceived='"+ Constants.STR_YES +"') ) )t";
 
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r37807 -r37858
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 37807)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 37858)
@@ -183,10 +183,9 @@
 	 * @param extraOrder 排序语句
 	 * @param sterilingMode 灭菌方式SZYK-5(不追溯的包取包定义的默认灭菌程序关联的灭菌方式；追溯的包直接取包实例上的灭菌方式)
 	 * @param openGoodsSearch 开启物品查询
-	 * @param onlyQueryNoHave 只查询TousseInstance.sterilingType='无'
 	 * @return
 	 */
-	public List<TousseSimpleVO> getTodayReviewedTousseInsWithOutBasketBySterilization(boolean onlyQueryNoHave ,String orgUnitCode, boolean enableUrgentFunction, String extraOrder, String sterilingMode
+	public List<TousseSimpleVO> getTodayReviewedTousseInsWithOutBasketBySterilization(String orgUnitCode, boolean enableUrgentFunction, String extraOrder, String sterilingMode
 			,String sterilizerName, String sterileFrequency, boolean openGoodsSearch);
 	
 	/**