Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r21800 -r21844
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 21800)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 21844)
@@ -170,10 +170,10 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/Ext2CompUtil.js"></script>
 <script type="text/javascript">
-var curUserName = '${userName}';  //当前登录用户的全名
-var userCode = '${userCode}';  //当前登录用户的登录名
+var curUserName = '${userName}';       //登录用户的全名
+var userCode = '${userCode}';  		   //登录用户的登录名
 var currentOrgUnitName = '${depart}';  //登录用户的当前科室名称
-var dirOrgCode = '<%=request.getAttribute("departCoding")%>';  //登录用户的当前科室编码
+var dirOrgCode = '${departCoding}';    //登录用户的当前科室编码
 
 var comboApplicationForm = '<%=InvoicePlan.TYPE_COMBO_FORM%>';//通用申请单
 var recyclingCreateApplicationForm = '<%=InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION%>';//回收申请单
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r21838 -r21844
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21838)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 21844)
@@ -81,7 +81,7 @@
 		//2、设置“提交并新建”按钮重新打开表单的参数对象
 	    setOpenFormObj(form, tousseGroups, specifyDisposableTypes);
 	
-		comboApplication(0,$Id('departCoding').value,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null);
+		comboApplication(0,dirOrgCode,currentOrgUnitName,false,false,true,form, tousseGroups, specifyDisposableTypes, false, '', null);
 	}
 }
 
@@ -282,8 +282,7 @@
 
 //Ext4 结算科室Store
 var departJsonStore = new Ext4.data.JsonStore({
-	// pageSize : 15,
-	autoLoad : false,
+	autoLoad : true,
 	proxy : {
 		type : 'ajax',
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
@@ -298,24 +297,7 @@
 	    {name : 'name',mapping : 'name'}
 	  ]
 });
-departJsonStore.reload();
 
-//Ext4 项目store
-var projectStore = new Ext4.data.Store({
-	proxy : {
-		type : 'ajax',
-		url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getAllProject.do',
-		reader : {
-			type : 'json',
-			root : 'data'
-		}
-	},
-	fields : [
-	    {name : 'projCode',mapping : 'projCode'},
-	    {name : 'projName',mapping : 'projName'}
-	  ]
-});
-
 //申请科室Store
 var appDepartJsonStoreExt2 = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
@@ -336,7 +318,7 @@
 var appDepartJsonStore = new Ext4.data.Store({
 	//limit参数，每页显示条数，默认为25
 	pageSize: isIE6OrIE7 ? 15 : 50,
-	autoLoad:false,
+	autoLoad: true,
 	proxy : {
 		type : 'ajax',
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
@@ -351,7 +333,6 @@
 	    {name : 'name',mapping : 'name'}
 	  ]
 });
-appDepartJsonStore.reload();
 
 var invoicePlanForTousseType_Tousse = "器械包";
 var invoicePlanForTousseType_Diposable = "一次性物品";
@@ -1683,7 +1664,7 @@
 				|| type == tousseApplicationForm
 				|| type == diposableGoodsApplicationForm
 				|| type == disinfectGoodsApplicationForm){
-			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,hiddenCommitButton,hiddenSaveButton,
+			comboApplication(recyclingApplication.id,recyclingApplication.departCoding,recyclingApplication.depart,hiddenCommitButton,hiddenSaveButton,
 					hiddenReturnButton,type, '', specifyDisposableTypes,recyclingApplication.committedStatus,
 					recyclingApplication.handleDepartCoding,recyclingApplication);
 		}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r21838 -r21844
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 21838)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 21844)
@@ -715,7 +715,7 @@
 		}
 		
 		application.setCommittedStatus(isCommit);
-		BigDecimal disposablePriceFluctuation = supplyRoomConfigManager.getDisposableGoodsFluctuationByOrgUnitCoding(application.getDepartCoding());
+		BigDecimal disposablePriceFluctuation = supplyRoomConfigManager.getDisposableGoodsFluctuationByOrgUnitCoding(application.getSettleAccountsDepartCoding());
 		application.setDisposablePriceFluctuation(disposablePriceFluctuation);  //设置一次性物品的浮动系数
 		
 		if (delivered && InvoicePlan.DELIVERSTATUS_PARTDELIVERED.equals(application.getDeliverStatus())) {
@@ -3229,7 +3229,6 @@
 
 		if (tousseItemVos != null) {
 			double tpf = supplyRoomConfigManager.getTousseFluctuationPercent();
-			double dpf = supplyRoomConfigManager.getDisposableGoodsFluctuationDoubleByOrgUnitCoding(application.getDepartCoding());  //一次性物品的浮动系数
 			
 			for (TousseItemVo newItemVo : tousseItemVos) {
 				TousseItem tousseItem = null;
@@ -3328,23 +3327,6 @@
 						includeInvoiceItems = InvoicePlan.SIGNED_TRUE;
 					}
 					tousseItem.setExpressRecycling(TousseDefinition.STR_NO);
-					//根据一次性物品的id来查找该一次性物品
-					Long diposableGoodId = tousseItem.getDisposableGoodsId();
-					DisposableGoods disposableGoods = diposableGoodsManager.get(diposableGoodId);
-					if (disposableGoods != null) {
-						Double price = disposableGoods.getReferencePrice();
-						//price = MathTools.mul(price, dpf, 2);
-						//如果页面上有价格，则用页面上的价格,因为申请单上物品的价格是取库存上的价格而不是一次性物品定义的价格
-						if (tousseItem.getPrice() != null){
-							price = tousseItem.getPrice();
-						}
-						BigDecimal bg = MathTools.mul(price, dpf);
-						price = bg == null ? 0.0 : bg.setScale(4, BigDecimal.ROUND_HALF_UP).doubleValue();
-						Double rowPrice = MathTools.mul(price,tousseItem.getEditAmount()).doubleValue();
-						tousseItem.setPrice(price);
-						tousseItem.setRowPrice(rowPrice);
-						tousseItem.setDisposableGoodsId(disposableGoods.getId());
-					}
 				}
 			}
 		}
@@ -5653,7 +5635,7 @@
 		invoicePlan.setSpelling(GB2Alpha.string2Alpha(hrpInvoicePlan.getDepart()));
 		invoicePlan.setWbCode(GB2WB.getWBCode(hrpInvoicePlan.getDepart()));
 		invoicePlan.setSubmitTime(hrpInvoicePlan.getApplicationTime());
-		BigDecimal disposablePriceFluctuation = supplyRoomConfigManager.getDisposableGoodsFluctuationByOrgUnitCoding(hrpInvoicePlan.getDepartCoding());
+		BigDecimal disposablePriceFluctuation = supplyRoomConfigManager.getDisposableGoodsFluctuationByOrgUnitCoding(invoicePlan.getSettleAccountsDepartCoding());
 		invoicePlan.setDisposablePriceFluctuation(disposablePriceFluctuation);  //设置一次性物品的浮动系数
 		objectDao.save(invoicePlan);
 		return invoicePlan;
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r21838 -r21844
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 21838)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 21844)
@@ -2,7 +2,8 @@
 /**
  * 添加申请单或者修改申请单（目前只有：“通用申请单”、“器械包申请单”、“敷料包申请单”、“消毒物品申请单”、“一次性物品申请单”、“专科器械申请单”这六种申请单会调用处方法）.
  * @param id						申请单id
- * @param deptCoding				申请科室的科室编码
+ * @param deptCoding				申请科室的科室编码（如果是添加则是登录用户的当前科室编码）
+ * @param depart					申请科室的科室名称（如果是添加则是登录用户的当前科室名称）
  * @param hiddenCommitButton		是否隐藏提交按钮
  * @param hiddenSaveButton			是否隐藏暂存按钮
  * @param hiddenReturnEditButton	是否隐藏返回修改按钮
@@ -13,7 +14,7 @@
  * @param handleDepartCoding		处理科室的科室编码（修改才有值）
  * @param recyclingApplication		申请单对象
  */
-function comboApplication(id,deptCoding,hiddenCommitButton,hiddenSaveButton,hiddenReturnEditButton,type,tousseGroups,specifyDisposableTypes,
+function comboApplication(id,deptCoding,depart,hiddenCommitButton,hiddenSaveButton,hiddenReturnEditButton,type,tousseGroups,specifyDisposableTypes,
 		originalCommittedStatus,handleDepartCoding,recyclingApplication) {
 	//器械包申请单的物品视图是否分成两个grid
 	tousseApplicationFormGridSplit = false;
@@ -53,6 +54,22 @@
 		   ]
 	});
 	
+	//项目的store
+	var projectStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!getAllProject.do',
+			reader : {
+				type : 'json',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'projCode',mapping : 'projCode'},
+		    {name : 'projName',mapping : 'projName'}
+		  ]
+	});
+	
 	//仓库名称combo的store
 	var storeCodeStore = new Ext4.data.Store({
 		proxy : {
@@ -1028,6 +1045,7 @@
 			{xtype : 'hidden',name : 'count',id : 'count',value : '1'}, 
 			{xtype : 'hidden',name : 'id',id : 'id'}, 
 			{xtype : 'hidden',name : 'deliverStatus',id : 'deliverStatus'}, 							//发货状态
+			{xtype : 'hidden',name : 'applicantCode',id : 'applicantCode'}, 							//申请人编码
 			{xtype : 'hidden',name : 'tousseInstanceInfos',id : 'tousseInstanceInfos'}, 
 			{xtype : 'hidden',name : 'tousseId',id : 'tousseId'}, 
 			{xtype : 'hidden',name : 'externalCode',id : 'externalCode'}, 
@@ -1085,7 +1103,6 @@
 					id : 'applicant',
 					name : 'applicant',
 					allowBlank : false,
-					value : $Id('userName').value,
 					readOnly : true,
 					fieldCls : 'fieldReadOnlyNoRemoveAndTop'
 				},{
@@ -1151,7 +1168,7 @@
 							//3、设置处理科室，如果加载后的数量为1，则进行默认处理科室赋值，如果isOpenLoadTemplateByUnit=true需要重新加载申领模板
 							handleDepartStore.load({
 								callback: function(records, operation, success) {
-									if (records.length == 1){
+									if (records && records.length == 1){
 										var record = records[0];
 										top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
 										top.Ext4.getCmp('handleDepart').setValue(record.data.name);
@@ -1357,122 +1374,94 @@
 		loadMask = new Ext4.LoadMask({msg:'数据处理中，请稍候......',target:applicationWindow});
 	}
 	
-	if(!isFirstSupplyRoomUser){
-		var departComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #depart")[0];
-		departComp.forceSelection = false;
-		departComp.setRawValue($Id('depart').value);
-		departComp.forceSelection = true;
-		var departCodingComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0];
-		departCodingComp.setRawValue($Id('departCoding').value);
-
-		if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
-			if(sstsConfig.departsForInvoicePlanSelectProject
-					&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + $Id('depart').value + ";") != -1){
-				top.Ext4.getCmp('projCode').setVisible(true);
-				projectStore.reload();//加载项目数据
-			}else{
-				top.Ext4.getCmp('projCode').setVisible(false);
-				top.Ext4.getCmp('projCode').setValue('');
-			}
-		}
-		
-		if(!id || id == 0){  //添加
-			//选择申请科室后,根据申请科室及单类型加载处理科室,如果加载后的数量为1,则进行默认处理科室赋值
-			handleDepartStore.proxy.extraParams.applyDepartCode = $Id('departCoding').value;
-			handleDepartStore.load({
-				callback: function(records, operation, success) {
-					var record = records;
-					if (records && records.length == 1){
-						record = records[0];
-						top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
-						top.Ext4.getCmp('handleDepart').setValue(record.data.name);
-						
-						comboGoodsStore.proxy.extraParams.cssdOrgUnitCode = record.data.cssdOrgUnitCode;
-                        comboGoodsStore.load({params:{cssdOrgUnitCode:record.data.cssdOrgUnitCode}});
-					}
-				}
-			});
-		}
-	}
 	
-	//加载仓库数据
+	//----------------------------------
+	//1、如果启用仓位功能，要显示“仓位”的combo并且加载仓库数据
 	if(sstsConfig.enableStoreCode 
 			&& (type == diposableGoodsApplicationForm || type == comboApplicationForm)
 			&& isShowStoreCodeCombo(deptCoding)){
 		top.Ext4.getCmp('storeCode').setVisible(true);
 		storeCodeStore.proxy.extraParams.departmentCode = deptCoding;
-		storeCodeStore.reload();  //加载仓库数据
+		storeCodeStore.reload();
 	} else{
 		top.Ext4.getCmp('storeCode').setVisible(false);
-//		top.Ext4.getCmp('storeCode').setValue('');
 	}
 	
-	if(id == ""){//添加 
-		//如果一级供应室用户，则光标定位到“申请科室combo”，否则光标定位到“物品名称combo”
-		if (isFirstSupplyRoomUser) {
-			top.Ext4.ComponentQuery.query("#recyclingApplicationForm #depart")[0].focus('', 10);
-		} else {
-			top.Ext4.getCmp('package1').focus('', 10);
+	//2、如果启用了课题组接口功能且科室为科教项目经费，则需要显示“项目”的combo并且加载项目数据
+	if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
+		if(sstsConfig.departsForInvoicePlanSelectProject
+				&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + depart + ";") != -1){
+			top.Ext4.getCmp('projCode').setVisible(true);
+			projectStore.reload();
+		}else{
+			top.Ext4.getCmp('projCode').setVisible(false);
 		}
-		//申请时间获取服务器时间
+	}
+	
+	if(!id){//添加 
+		//1、设置“申请人”和“申请时间”
+		top.Ext4.getCmp('applicant').setValue(curUserName);
+		top.Ext4.getCmp('applicantCode').setValue(userCode);
 		getServerTime('yyyy-MM-dd HH:mm',top.Ext4,'applicationTimeStr');
-
-		//申请科室是否为结算科室
-		RecyclingApplicationTableManager.isSettleAccountsDepart($Id('departCoding').value,function(yes){
-			if(yes){
-				if(!isFirstSupplyRoomUser){
-					var comp = top.Ext4.getCmp('settleAccountsDepart');
-					comp.forceSelection = false;
-					comp.setValue($Id('depart').value);
-					comp.forceSelection = true;
-					top.Ext4.getCmp('settleAccountsDepartCoding').setValue($Id('departCoding').value);		
+		
+		//2、设置“申请科室”和“结算科室”
+		if (!isFirstSupplyRoomUser) {
+			top.Ext4.getCmp('depart').setRawValue(depart);
+			top.Ext4.getCmp('departCoding').setValue(deptCoding);
+			DWREngine.setAsync(false);
+			RecyclingApplicationTableManager.isSettleAccountsDepart(deptCoding,function(yes){
+				if(yes){
+					top.Ext4.getCmp('settleAccountsDepart').setValue(depart);	
+					top.Ext4.getCmp('settleAccountsDepartCoding').setValue(deptCoding);	
 				}
+			});
+			DWREngine.setAsync(true);
+		}
+		
+		//3、设置“处理科室”
+		handleDepartStore.load({
+			callback: function(records, operation, success) {
+				if (records && records.length == 1){
+					var record = records[0];
+					top.Ext4.getCmp("handleDepartCoding").setValue(record.data.cssdOrgUnitCode);
+					top.Ext4.getCmp('handleDepart').setValue(record.data.name);
+				}
 			}
 		});
+		
+		//4、如果一级供应室用户，则光标定位到“申请科室combo”，否则光标定位到“物品名称combo”
+		if (isFirstSupplyRoomUser) {
+			top.Ext4.getCmp('depart').focus('', 10);
+		} else {
+			top.Ext4.getCmp('package1').focus('', 10);
+		}
 	} else if (recyclingApplication) {
 		//设置“申请单id”、“流水号”、“发货状态”、“申请人”、“住院号”、“申请科室”、“结算科室”、“处理科室”、“申请时间”、“备注”、“仓库编码”、“项目”12个属性
 		top.Ext4.getCmp("id").setValue(recyclingApplication.id);
 		top.Ext4.getCmp("serialNumber").setValue(recyclingApplication.serialNumber);
 		top.Ext4.getCmp("deliverStatus").setValue(recyclingApplication.deliverStatus);
 		top.Ext4.getCmp("applicant").setValue(recyclingApplication.applicant);
+		top.Ext4.getCmp("applicantCode").setValue(recyclingApplication.applicantCode);
 		top.Ext4.getCmp("hospitalNumber").setValue(recyclingApplication.hospitalNumber);
 
-		var departComp = top.Ext4.ComponentQuery.query("#recyclingApplicationForm #depart")[0];
-		departComp.forceSelection = false;
-		departComp.setValue(recyclingApplication.depart);
-		departComp.forceSelection = true;
-		top.Ext4.ComponentQuery.query("#recyclingApplicationForm #departCoding")[0].setValue(recyclingApplication.departCoding);
-		
-		top.Ext4.getCmp("settleAccountsDepart").forceSelection = false;
-		top.Ext4.getCmp("settleAccountsDepart").setValue(recyclingApplication.settleAccountsDepart);		
-		top.Ext4.getCmp("settleAccountsDepart").forceSelection = true;
+		top.Ext4.getCmp("departCoding").setValue(recyclingApplication.departCoding);
+		top.Ext4.getCmp("depart").setRawValue(recyclingApplication.depart);
 		top.Ext4.getCmp("settleAccountsDepartCoding").setValue(recyclingApplication.settleAccountsDepartCoding);
-		
-		top.Ext4.getCmp("handleDepart").forceSelection = false;
-		top.Ext4.getCmp("handleDepart").setValue(recyclingApplication.handleDepart);
-		top.Ext4.getCmp("handleDepart").setRawValue(recyclingApplication.handleDepart);		
-		top.Ext4.getCmp("handleDepart").forceSelection = true;
+		top.Ext4.getCmp("settleAccountsDepart").setValue(recyclingApplication.settleAccountsDepart);
 		top.Ext4.getCmp("handleDepartCoding").setValue(recyclingApplication.handleDepartCoding);
+		handleDepartStore.load();  //这里也加载一下吧
+		top.Ext4.getCmp("handleDepart").setRawValue(recyclingApplication.handleDepart);
 		
 		if(recyclingApplication.applicationTime){
 			top.Ext4.getCmp('applicationTimeStr').setValue(Ext.util.Format.date(new Date(recyclingApplication.applicationTime.time),'Y-m-d H:i'));
 		}
 		
 		top.Ext4.getCmp("remark").setValue(recyclingApplication.remark);
 		top.Ext4.getCmp('storeCode').setValue(recyclingApplication.storeCode);
+		top.Ext4.getCmp('projCode').setValue(recyclingApplication.projCode);
 		
-		//如果启用了课题组接口功能且科室为科教项目经费
-		if(sstsConfig.showProjectNameComboWhenApplyDiposableGoods == true){
-			if(sstsConfig.departsForInvoicePlanSelectProject
-					&& (";" + sstsConfig.departsForInvoicePlanSelectProject + ";").indexOf(";" + recyclingApplication.depart + ";") != -1){
-				top.Ext4.getCmp('projCode').setVisible(true);
-				projectStore.reload();//加载项目数据
-				top.Ext4.getCmp('projCode').setValue(recyclingApplication.projCode);
-			}
-		}
-		
 		if(recyclingApplication.editable == 'false' || isInterveneAmount){  //不可编辑
-			departComp.setReadOnly(true);
+			top.Ext4.getCmp("depart").setReadOnly(true);
 			top.Ext4.getCmp("settleAccountsDepart").setReadOnly(true);
 			top.Ext4.getCmp("handleDepart").setReadOnly(true);
 			top.Ext4.getCmp("remark").setReadOnly(true);