Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r28749 -r28760
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 28749)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 28760)
@@ -4749,7 +4749,7 @@
 			List<CustomIntoBasket> typedBasket = washClassifyTypeToBasketJsonMap.get(md_washClassifyType);
 			
 			if(typedBasket == null){
-				String msg2 = getWashContainerWarnningPrompt(md_washClassifyType);
+				String msg2 = getWashContainerWarnningPrompt(md_washClassifyType,md.getNameSpecification());
 				
 				return JSONUtil.buildJsonObject(false,msg2);
 			}
@@ -4812,7 +4812,7 @@
 			}
 			//部分器械还未入筐
 			if(totalIntoBasketAmount > 0){
-				String msg2 = "部分器械未能入筐，" + getWashContainerWarnningPrompt(md_washClassifyType);
+				String msg2 = "部分器械未能入筐，" + getWashContainerWarnningPrompt(md_washClassifyType,md.getNameSpecification());
 				String message = "";
 				if(CollectionUtils.isNotEmpty(errorMsg)){
 					message = String.join("；", errorMsg);
@@ -5057,7 +5057,7 @@
 				List<CustomIntoBasket> typedBaskets = washClassifyTypeToBasketsMap.get(md_washClassifyType);
 				
 				if(typedBaskets == null){
-					String msg2 = getWashContainerWarnningPrompt(md_washClassifyType);
+					String msg2 = getWashContainerWarnningPrompt(md_washClassifyType,md.getNameSpecification());
 					
 					return JSONUtil.buildJsonObject(false,msg2);
 				}
@@ -5349,12 +5349,11 @@
 	 * @param md_washClassifyType
 	 * @return
 	 */
-	private String getWashContainerWarnningPrompt(String md_washClassifyType) {
-		String msg = "缺少清洗分类类型为空的篮筐，请扫描！";
-		if (StringUtils.isNotBlank(md_washClassifyType)){
-			msg = "缺少装载【" + md_washClassifyType + "】类型的篮筐，请扫描！";
+	private String getWashContainerWarnningPrompt(String md_washClassifyType, String nameSpecification) {
+		if(StringUtils.isBlank(md_washClassifyType)){
+			return "【"+ nameSpecification +"】的清洗分类类型为空，缺少该类型的篮筐，请扫描加载篮筐后再入筐！";
 		}
-		return msg;
+		return "【"+ nameSpecification +"】的清洗分类类型为"+ md_washClassifyType +"，缺少该类型的篮筐，请扫描加载篮筐后再入筐！";
 	}
 	
 	private Map<String, List<CustomIntoBasket>> buildWashClassifyTypeMap(List<CustomIntoBasket> baskets) {
@@ -6406,27 +6405,29 @@
 				continue;//外来器械申请单不用打印
 			}
 			List<TousseItem> tousseItems = ip.getApplicationItems();
-			if(CollectionUtils.isNotEmpty(tousseItems)){
-				for (TousseItem tousseItem : tousseItems) {
-					String tousseName = tousseItem.getTousseName();
-					Integer amount = null;
-					if(priorityRecyclingAmount && tousseItem.getRecyclingAmount() != null){
-						if(tousseItem.getRecyclingAmount().intValue() == 0){//回收时删除不需要打印
-							continue;
-						}
-						amount = tousseItem.getRecyclingAmount();
-					}else{
-						amount = tousseItem.getAmount();
+			if(CollectionUtils.isEmpty(tousseItems)){
+				continue;
+			}
+			for (TousseItem tousseItem : tousseItems) {
+				Integer amount = null;
+				if(priorityRecyclingAmount && tousseItem.getRecyclingAmount() != null){
+					if(tousseItem.getRecyclingAmount().intValue() == 0){//回收时删除不需要打印
+						continue;
 					}
-					if (amount != null && amount > 0){
-						Integer sum = nameToAmount.get(tousseName);
-						if (sum == null) {
-							nameToAmount.put(tousseName, amount);
-						} else {
-							nameToAmount.put(tousseName, sum + amount);
-						}
-					}
+					amount = tousseItem.getRecyclingAmount();
+				}else{
+					amount = tousseItem.getAmount();
 				}
+				if(amount == null || amount <= 0){
+					continue;
+				}
+				String tousseName = tousseItem.getTousseName();
+				Integer sum = nameToAmount.get(tousseName);
+				if (sum == null) {
+					nameToAmount.put(tousseName, amount);
+				} else {
+					nameToAmount.put(tousseName, sum + amount);
+				}
 			}
 		}
 		if(MapUtils.isEmpty(nameToAmount)){
@@ -6638,7 +6639,7 @@
 				List<CustomIntoBasket> typedBaskets = washClassifyTypeToBasketsMap.get(md_washClassifyType);
 				
 				if(typedBaskets == null){
-					String msg2 = getWashContainerWarnningPrompt(md_washClassifyType);
+					String msg2 = getWashContainerWarnningPrompt(md_washClassifyType,md.getNameSpecification());
 					
 					return JSONUtil.buildJsonObject(false,msg2);
 				}