Index: ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java
===================================================================
diff -u -r21759 -r21768
--- ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 21759)
+++ ssts-diposablegoods/src/main/java/com/forgon/disinfectsystem/diposablegoods/service/DiposableGoodsManagerImpl.java	(.../DiposableGoodsManagerImpl.java)	(revision 21768)
@@ -869,7 +869,7 @@
 		}
 		
 		
-		double floatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuationPercent();// 一次性物品浮动价格系数/
+		double floatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuationDoubleByOrgUnitCoding(null);  //一次性物品浮动价格系数/
 		OrgUnit org = new OrgUnit();
 		org.setOrgUnitCoding(handleDepartCode);
 		List<WareHouse> list = wareHouseManager.getWareHouseListByOrgUnit(org);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r21719 -r21768
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 21719)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 21768)
@@ -725,7 +725,7 @@
 			templates = departmentAppTemplateManager.getDepartmentAppTemplates(orgunitCodes);
 		}
 		
-		double diposableFloatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuationPercent();
+		double diposableFloatPercent = supplyRoomConfigManager.getDisposableGoodsFluctuationDoubleByOrgUnitCoding(null);  //一次性物品的浮动系数
 		double tousseDefinitionFloatPercent = supplyRoomConfigManager.getTousseFluctuationPercent();
 		
 		//1、处理科室申领模板配置的物品
@@ -1520,81 +1520,6 @@
 		StrutsResponseUtils.output(true, msg);
 	}
 	
-	public void updateTousseItemPrice(){
-		String sql = "where po.applicationTime between '2015-06-14 00:00:00' and '2015-06-30 00:00:00'";
-		@SuppressWarnings("unchecked")
-		List<InvoicePlan> list = objectDao.findBySql(InvoicePlan.class.getSimpleName(), sql);
-		Double pf = supplyRoomConfigManager.getDisposableGoodsFluctuationPercent();
-		Map<String, TousseDefinition> map  = new HashMap<String, TousseDefinition>();
-		if(list != null){
-			int i = 1;
-			for (InvoicePlan ip : list) {
-				for (TousseItem item : ip.getApplicationItems()) {
-					Double price = 0D;
-					Double rowPrice = 0D;
-					String type = ip.getType();
-					
-					String goodsName = item.getTousseName();
-					Integer amount = item.getAmount();
-					//器械包
-					if(InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM.equals(type)){
-						TousseDefinition td = getTousseDefinition(map, goodsName);
-						if(td != null){
-							price = td.getPrice();
-							rowPrice = MathTools.mul(price, amount).doubleValue();
-						}
-					//一次性物品
-					}else if(InvoicePlan.TYPE_DIPOSABLE_GOODS_APPLICATION_FORM.equals(type)){
-						String name = goodsName;
-						String sp = "";
-						int index = goodsName.indexOf("[");
-						if(index != -1){
-							name = goodsName.substring(0,index);
-							sp = goodsName.substring(index+1,goodsName.length()-1);
-						}
-						DisposableGoods disposableGoods = diposableGoodsManager.get(name, sp);
-						if(disposableGoods != null){
-							Double refPrice = disposableGoods.getReferencePrice();
-							price = MathTools.mul(refPrice, pf).doubleValue();
-							rowPrice = MathTools.mul(price, amount).doubleValue();
-						}
-					//消毒物品
-					}else if(InvoicePlan.TYPE_DISINFECT_GOODS_APPLICATION_FORM.equals(type)){
-						TousseDefinition td = getTousseDefinition(map, goodsName);
-						if(td != null){
-							price = td.getPrice();
-							rowPrice = MathTools.mul(price, amount).doubleValue();
-						}
-					//借物单
-					}else if(InvoicePlan.TYPE_BORROWINGSINGLE.equals(type)){
-						TousseDefinition td = getTousseDefinition(map, goodsName);
-						if(td != null){
-							price = td.getBorrowPrice();
-							rowPrice = MathTools.mul(price, amount).doubleValue();
-						}
-					}
-					item.setPrice(price);
-					item.setRowPrice(rowPrice);
-					objectDao.saveOrUpdate(item);
-					if(i % 200 == 0){
-						objectDao.flush();
-					}
-				}
-				i++;
-			}
-		}
-	}
-	private TousseDefinition getTousseDefinition(
-			Map<String, TousseDefinition> tousseDefinitionMap, String tousseName) {
-		TousseDefinition tousseDefinition = tousseDefinitionMap.get(tousseName);
-		if (tousseDefinition == null) {
-			tousseDefinition = tousseDefinitionManager
-					.getTousseDefinitionByName(tousseName);
-			tousseDefinitionMap.put(tousseName, tousseDefinition);
-		}
-		return tousseDefinition;
-	}
-	
 	public void loadTousseItems(){
 		String invoicePlanId = StrutsParamUtils.getPraramValue("invoicePlanId", null);
 		InvoicePlan invoicePlan = invoicePlanManager.get(invoicePlanId);