Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r37995 -r38068
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 37995)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 38068)
@@ -121,6 +121,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
 import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
 import com.forgon.disinfectsystem.entity.packing.IDCardInfoForPackingTask;
+import com.forgon.disinfectsystem.entity.packing.PackingRecord_ClassifyBasket;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
 import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.receiverecord.ReceiveRecord;
@@ -4904,26 +4905,12 @@
     }
     
     @Override
-    public String getPackingClassifyids(){
-        String sql = " select distinct classifyBasketIds from TousseInstance ti ";
-        ResultSet result = objectDao.executeSql(sql);
-        StringBuilder sb = new StringBuilder();
-        sb.append(";");
-        try {
-            while (result.next()) {
-                String ids = result.getString(1);
-                if(StringUtils.isNotBlank(ids)){
-                    ids += ";";
-                    sb.append(ids);
-                }
-            }
-        } catch (SQLException e) {
-            e.printStackTrace();
-        }finally {
-            DatabaseUtil.closeResultSetAndStatement(result);
-        }
-        sb.append(";");
-        return sb.toString();
+    public Set<Long> getPackingClassifyids(Set<Long> cbIds){
+    	if(CollectionUtils.isEmpty(cbIds)){
+    		return new HashSet<Long>();
+    	}
+        String sql = " SELECT pc.classifybasketId FROM "+ PackingRecord_ClassifyBasket.class.getSimpleName() +" pc where 1=1 "+SqlUtils.getInLongListSql("pc.classifybasketId", cbIds);      
+        return objectDao.getLongSet(sql);
     }
 
     @Override
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java
===================================================================
diff -u -r37913 -r38068
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 37913)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManager.java	(.../TousseInstanceManager.java)	(revision 38068)
@@ -714,9 +714,9 @@
 	 */
 	public void autoWasteTousseInstanceTodayPackedButNotReviewed();
 	/**
-	 * 获取所有已装配的清洗篮筐实例的id
+	 * 根据篮筐实例查询其中已装配的清洗篮筐实例的id
 	 */
-	public String getPackingClassifyids();
+	public Set<Long> getPackingClassifyids(Set<Long> cbIds);
 	/**
 	 * 合并包实例的丢失备注.
 	 * @param tousseInstances	器械包实例集合