Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r21858 -r21870
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 21858)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 21870)
@@ -1158,7 +1158,7 @@
 							//3、设置“结算科室的科室”
 							var originalSettleAccountsDepart = top.Ext4.getCmp("settleAccountsDepart").getValue();
 							var originalSettleAccountsDepartCoding = top.Ext4.getCmp("settleAccountsDepartCoding").getValue();
-							var index = appDepartJsonStore.findExact("name", departName);
+							var index = departJsonStore.findExact("name", departName);
 							if (index != -1){
 								if (departName != originalSettleAccountsDepart || departCode != originalSettleAccountsDepartCoding) {
 									top.Ext4.getCmp("settleAccountsDepartCoding").setValue(departCode);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java
===================================================================
diff -u -r21858 -r21870
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 21858)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/departmentapplicationtemplate/service/DepartmentAppTemplateManagerImpl.java	(.../DepartmentAppTemplateManagerImpl.java)	(revision 21870)
@@ -441,11 +441,22 @@
 				unit = (minAmount + "/" + unit);
 			}
 			
-			//如果tousseItem不为空则用他的价格,如果为空则用一次性物品库存的价格
-			Double price = tousseItem == null ? diposableGoodsManager.getRecentPrice(disposableGoods) : tousseItem.getPrice();
-
-			json = this.setDisposableGoodPrice(json, price, itemAmount, diposableFloatPercent);
-
+			/**
+			 * 价格如果是保存之后的是已经浮动过的，请勿再次浮动
+			 */
+			Double price = diposableGoodsManager.getRecentPrice(disposableGoods);
+			if (tousseItem != null) {
+				json.put("totalPrice", tousseItem.getRowPrice());
+				json.put("price", tousseItem.getPrice());
+			} else {
+				json.put("totalPrice", 0);
+				json.put("price", MathTools.mul(price, diposableFloatPercent).doubleValue());
+			}
+		
+			json.put("count", itemAmount);
+			json.put("countBackup", itemAmount);  //申请的数量备份起来
+			json.put("originalPrice", price);  //单价（没有浮动）
+			
 			String packageSpec = disposableGoods.getPackageSpec();
 			if(StringUtils.isBlank(packageSpec)){
 				packageSpec = "";