Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r38066 -r38069
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 38066)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 38069)
@@ -2820,18 +2820,12 @@
 		if(CollectionUtils.isEmpty(baskets)){
 			return false;
 		}
-		String packingClassifyids = tousseInstanceManager.getPackingClassifyids();
-		if(StringUtils.isNotBlank(packingClassifyids)){
-			for(ClassifyBasket cb : baskets){
-				String id = cb.getId().toString();
-				id = ";" + id + ";";
-				if(packingClassifyids.indexOf(id) != -1){
-					return true;
-				}
-			}
+		Set<Long> cbIds = new HashSet<Long>();
+		for (ClassifyBasket cb : baskets) {
+			cbIds.add(cb.getId());
 		}
-		
-		return false;
+		Set<Long> cbIdOfpacked = tousseInstanceManager.getPackingClassifyids(cbIds);
+		return CollectionUtils.isEmpty(cbIdOfpacked)?false:true;
 	}
 	@Override
 	public JSONObject interfereWashAndDisinfectRecord(WashAndDisinfectRecord washAndDisinfectRecord,Map<String,String> paramMap) {
@@ -2908,11 +2902,12 @@
 			}
 		}
 		if( !CollectionUtils.isEmpty(diffIds)){
-			String packingClassifyids = tousseInstanceManager.getPackingClassifyids();
-			if(StringUtils.isNotBlank(packingClassifyids)){
+			Set<Long> cbIds = new HashSet<Long>();
+			cbIds.addAll(diffIds);
+			Set<Long> cbIdsOfPackinged = tousseInstanceManager.getPackingClassifyids(cbIds);
+			if(CollectionUtils.isNotEmpty(cbIdsOfPackinged)){
 				for(Long id : diffIds){
-					String idKey = ";" + id + ";";
-					if(packingClassifyids.indexOf(idKey) != -1){
+					if(cbIdsOfPackinged.contains(id)){
 						// 篮筐实例已装配
 						if(!oldbBasketIds.contains(id)){//新增的
 							if(!"true".equals(skipNewBasketVerification)){//未跳过新增验证