Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java
===================================================================
diff -u -r22096 -r22104
--- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 22096)
+++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java	(.../UseRecordManagerImpl.java)	(revision 22104)
@@ -3955,10 +3955,16 @@
 		String[] barcodesArr = tousseBarcodes.split(";");
 		List<TousseInstance> tousseInstanceList = new ArrayList<TousseInstance>();
 		for(int i=0;i<barcodesArr.length;i++){
-			BarcodeDevice Barcode = barcodeManager.getBarcodeByBarcode(barcodesArr[i]);
-			if(!(Barcode instanceof TousseInstance)){
+			BarcodeDevice barcode = barcodeManager.getBarcodeByBarcode(barcodesArr[i]);
+			if(barcode instanceof DisposableGoodsBatch){
 				throw new RuntimeException("不能对一次性物品进行快速回收");
 			}
+			if(barcode instanceof ExpensiveGoodsInstance){
+				throw new RuntimeException("不能对高值耗材进行快速回收");
+			}
+			if(!(barcode instanceof TousseInstance)){
+				throw new RuntimeException("只能对器械包进行快速回收");
+			}
 			//验证选中的器械包是否已被快速回收并关联到另外的使用记录
 			TousseInstance tousseInstance = tousseInstanceManager.
 					getTousseInstanceByBarcode(barcodesArr[i]);
@@ -4001,7 +4007,6 @@
 		newUseRecord.setTreatmentNum(useRecord.getTreatmentNum());
 		
 		objectDao.save(newUseRecord);
-		Long newUseRecordID = newUseRecord.getId();
 		for(TousseInstance t : tousseInstanceList){
 			t.setUseRecord_id(newUseRecord.getId());
 			tousseInstanceManager.saveOrUpdate(t);
@@ -5652,7 +5657,8 @@
 			for (UseRecordConvertDepartConfig useRecordConvertDepartConfig : useRecordConvertDepartConfigList) {
 				String departCode = useRecordConvertDepartConfig.getDepartCode();
 				List<UseRecord> auditedUseRecordList = 
-						objectDao.findBySql_ForUpdate(UseRecord.class.getSimpleName(), " where status='"+ UseRecord.STATUS_AUDITED +"' and departCoding='"+ departCode +"'");
+						objectDao.findBySql_ForUpdate(UseRecord.class.getSimpleName(), 
+								" where status in ('"+ UseRecord.STATUS_UNAUDITED +"','"+ UseRecord.STATUS_AUDITED +"') and departCoding='"+ departCode +"'");
 				if(CollectionUtils.isNotEmpty(auditedUseRecordList)){
 					Collection<Long> ids = new ArrayList<Long>();
 					for (UseRecord useRecord : auditedUseRecordList) {