Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r19907 -r20002
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 19907)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 20002)
@@ -2165,8 +2165,9 @@
 					//回收换筐后,可能出现这种情况,由于打印的地方有限制数量为0的数据不打印,所以此处暂时注释
 					//appItem.setIsPrinted(true);
 				}
-				//外来器械二次回收
-				if(!application.isSecondRecycleForForeignTousse()){
+				//外来器械二次回收,如果是外来器械申请单，那就不是使用记录转换的申请单，需要设置回收数量，不然状态就不对(回收后还是待回收状态)
+				//如果是外来器械申请单，并且是二次回收，那不是使用记录转换而合并单的情况，而是原来的申请单，不修改回收数量
+				if(!(application.isSecondRecycleForForeignTousse() && application.isForeignTousseAppliaction())){
 					appItem.setRecyclingAmount(currentAmount);
 				}