Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r28386 -r28394
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 28386)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 28394)
@@ -1097,7 +1097,7 @@
         } else if(dbConnection.isOracle()){
             firstBarcodeSql = "(select barcode from "+ TousseInstance.class.getSimpleName() +" ti1 join "+ BarcodeDevice.class.getSimpleName() +" b1 on b1.id=ti1.id where ti1.tousseFixedBarcode=1 and ti1.tousseDefinition_id=tdAncestor.id and rownum <= 1) fixedBarcode ";
         }
-        String querySql = "select b.barcode,tdAncestor.name definitionName,po.tousseName,po.depart,po.departCoding,po.sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.orgUnitCoding,po.orgUnitName,po.reviewTime,po.sterilingType,po.validUntil,"
+        String querySql = "select b.barcode,tdAncestor.name definitionName,po.tousseName,po.depart,po.departCoding,po.sterilingMode,tdAncestor.isTraceable,po.isUrgentTousse,po.orgUnitCoding,po.orgUnitName,po.reviewTime,po.sterilingType,po.validUntil,po.taskGroup, po.reviewer, po.operator,"
                 + firstBarcodeSql
                 + "from " + TousseInstance.class.getSimpleName() + " po join " + BarcodeDevice.class.getSimpleName() + " b on po.id=b.id "
                 + "join "+ TousseDefinition.class.getSimpleName() +" td on po.tousseDefinition_id=td.id join "+ TousseDefinition.class.getSimpleName() +" tdAncestor on td.ancestorId=tdAncestor.id " + sql;
@@ -1177,9 +1177,15 @@
                     vo.setIsForeignTousse(rs.getString("isForeignTousse"));
                 }catch(Exception e){}
                 try{
-                    vo.setProxyDisinfectionId(rs.getLong("proxyDisinfection_Id"));
+                    vo.setTaskGroup(rs.getString("taskGroup"));
                 }catch(Exception e){}
                 try{
+                    vo.setReviewer(rs.getString("reviewer"));
+                }catch(Exception e){}
+                try{
+                    vo.setOperator(rs.getString("operator"));
+                }catch(Exception e){}
+                try{
                     Object stockAmountObj = rs.getObject("StockAmount");
                     if(stockAmountObj != null){
                         if(stockAmountObj instanceof BigDecimal){
@@ -7815,13 +7821,20 @@
              }
         }
         
-        //2、当天审核的，未入筐的器械包
-        List<TousseSimpleVO> tousseSimpleVOsWithOutBasket = this.getTodayReviewedTousseInsWithOutBasketBySterilization(orgUnitCoding, false, null);
-        //List<TousseSimpleVO> tousseSimpleVOsWithOutBasket = this.getAllReviewedTousseInstanceWithOutBasket(orgUnitCoding, null, null, null, null, null, null);
+        //2、未入筐的器械包
+        //List<TousseSimpleVO> tousseSimpleVOsWithOutBasket = this.getTodayReviewedTousseInsWithOutBasketBySterilization(orgUnitCoding, false, null);
+        List<TousseSimpleVO> tousseSimpleVOsWithOutBasket = this.getAllReviewedTousseInstanceWithOutBasket(orgUnitCoding, null, null, null, null, null, null);
         if(CollectionUtils.isNotEmpty(tousseSimpleVOsWithOutBasket)){
         	for (TousseSimpleVO vo : tousseSimpleVOsWithOutBasket) {
         		// 只过滤符合灭菌方式的数据
         		if(StringUtils.equals(sterilizationMode, vo.getSterilingMode())){
+        			// 任务组过滤
+        			if(StringUtils.isNotBlank(taskGroup)){
+        				if(!StringUtils.equals(taskGroup, vo.getTaskGroup())){
+        					continue;
+        				}
+        			}
+        			// 页面要入炉物品过滤
         			if(saveBarcodeList.contains(vo.getBarcode())){
             			continue;
             		}