Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
===================================================================
diff -u -r12835 -r12865
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 12835)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 12865)
@@ -101,6 +101,7 @@
 		}
 		return null;
 	}
+	
 	public String getListSql() {
 		String sql = "";
 		
@@ -136,6 +137,7 @@
 		}
 		return sql;
 	}
+	
 	public String getCountSql(){
 		String countSql = "select count(*) from RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id" 
 				+ " where r.orgUnitCoding = '" 
Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r12852 -r12865
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 12852)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 12865)
@@ -1819,26 +1819,28 @@
 			}
 		}else{
 			recyclingRecord.setRecyclingApplicationType(InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION);
+			String deptCode = recyclingRecord.getDepartCode();
 			String orgUnitCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
 			List<SupplyRoomConfig> configs = supplyRoomConfigManager.getSecondSupplyRoomList();
 			boolean isOperatingRoom = false;
 			if(configs != null){
 				for (SupplyRoomConfig config : configs) {
 					if(config.getOrgUnitCoding().equals(orgUnitCode)){
-						isOperatingRoom = true;
+						if(orgUnitCode.equals(deptCode)){
+							isOperatingRoom = true;
+						}
 						break;
 					}
 				}
 			}
-			String deptCode = recyclingRecord.getDepartCode();
+			
 			SupplyRoomConfig cf = supplyRoomConfigManager.getFirstSupplyRoomConfig();
 			boolean isCSSD = false;
 			if(cf.getOrgUnitCoding().equals(deptCode)){
 				isCSSD = true;
 			}
 			//非手术室、供应室 生成回收申请单
 			if(!isOperatingRoom && !isCSSD){
-				//发货来源是回收单
 				if(SupplyRoomConfig.INVOICE_ORIGIN_RECYCLING.equals(invoiceOrigin)){
 					application = new RecyclingApplication();
 					application.setSerialNumber(serialNumManager