Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r26716 -r26719
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 26716)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 26719)
@@ -2650,6 +2650,10 @@
 							if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
 								foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_RECYCLED);
 								foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_RECYCLED);
+								//申请单追加备注(说明情况)
+								CssdUtils.appendRemarkOfInvoicePlan(foreignTousseApplication, 
+										String.format("【%s】的【%s】录入使用记录转换申请单后会创建一张新的申请单,单号为【%s】的原外来器械包申请单的回收状态设置为已回收.",
+												tousseInstance.getBarcode() , tousseInstance.getTousseName() , foreignTousseApplication.getSerialNumber()));
 							}
 							objectDao.saveOrUpdate(foreignTousseApplication);
 							
@@ -2660,19 +2664,31 @@
 						}
 					}else{
 						if(foreignTousseApplication != null){
-							String foreignTousseBarcode = foreignTousseApplication.getTousseBarcodes();
-							if(StringUtils.isBlank(foreignTousseBarcode)){
-								foreignTousseBarcode = ";";
+							SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+							//如果科室供应室的"外来器械是否二次回收"为"否"时,回收状态设置为"已回收":KPSZXYY-43 外来器械包增加设置使用记录转换申请后不做二次回收
+							if(StringUtils.equals(Constants.STR_NO, supplyRoomConfig.getForeignTousseIsSecondRecycle())){
+								if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
+									foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_RECYCLED);
+									foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_RECYCLED);
+									//申请单追加备注(说明情况)
+									CssdUtils.appendRemarkOfInvoicePlan(foreignTousseApplication, 
+											String.format("【%s】的【%s】录入使用记录转换申请单后,单号为【%s】的原外来器械包申请单的回收状态设置为已回收.",
+													tousseInstance.getBarcode() , tousseInstance.getTousseName() , foreignTousseApplication.getSerialNumber()));
+								}
+							}else{
+								String foreignTousseBarcode = foreignTousseApplication.getTousseBarcodes();
+								if(StringUtils.isBlank(foreignTousseBarcode)){
+									foreignTousseBarcode = ";";
+								}
+								foreignTousseApplication.setTousseBarcodes(foreignTousseBarcode + tousseInstance.getBarcode() + ";");
+								
+								if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
+									foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
+									foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
+								}
 							}
-							foreignTousseApplication.setTousseBarcodes(foreignTousseBarcode + tousseInstance.getBarcode() + ";");
-							
-							if(InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED.equals(foreignTousseApplication.getRecyclingStatus())){
-								foreignTousseApplication.setRecyclingStatus(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE);
-								foreignTousseApplication.setOrderByFiled(InvoicePlan.RECYCLING_AWAITRECYCLE);
-							}
 							objectDao.saveOrUpdate(foreignTousseApplication);
 						}
-						continue;
 					}
 				} else if (tousseDefinition.isCustomTousse()) {
 					applyCustomTousseMap.put(tousseDefinition.getId(),