Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r26704 -r26751
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26704)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 26751)
@@ -34,6 +34,7 @@
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.directory.model.OrgUnit;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifiedItemManager;
@@ -4034,8 +4035,9 @@
 			settleAccountsDepart = settleSupplyRoomConfig.getOrgUnitName();
 			settleAccountsDepartCoding = settleSupplyRoomConfig.getOrgUnitCoding();
 		}
-		SupplyRoomConfig supplyRoomConfig = 
-				supplyRoomConfigManager.getSystemParamsObj();
+		//获取结算科室编码查询结算科室(BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货)
+		OrgUnit orgUnit = (OrgUnit)objectDao.getByProperty(OrgUnit.class.getSimpleName(), 
+				"orgUnitCoding", settleAccountsDepartCoding);
 		RecyclingApplication application = new RecyclingApplication();
 		application.setSerialNumber(serialNumManager
 				.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION));
@@ -4055,8 +4057,8 @@
 		application.setHandleDepart(AcegiHelper.getCurrentOrgUnitName());
 		application.setHandleDepartCoding(AcegiHelper.getCurrentOrgUnitCode());
 		application.setRecyclingTime(recyclingRecord.getRecyclingTime());
-		//设置一次性物品价格浮动系统-用于自动扣减一次性物品库存的器械包添加回收时生成申请单的一次性物品价格浮动系数为0的问题
-		application.setDisposablePriceFluctuation(supplyRoomConfig.getDisposablePriceFluctuation());
+		//设置一次性物品价格浮动系统-用于自动扣减一次性物品库存的器械包添加回收时生成申请单的一次性物品价格浮动系数为0的问题((BJCYLYY-20 回收申请单添加的器械包，包内材料包含一次性物品，且包定义是否扣减包内材料选为是，发货时不能正常发货))
+		application.setDisposablePriceFluctuation(supplyRoomConfigManager.getDisposableGoodsFluctuationByOrgUnit(orgUnit));
 		application.setIncludeRecyclingItems(InvoicePlan.SIGNED_TRUE);
 		recyclingApplicationManager.saveOrUpdate(application);
 		return application;