Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js
===================================================================
diff -u -r20617 -r20846
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 20617)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.js	(.../goodsApplicationView.js)	(revision 20846)
@@ -1611,6 +1611,8 @@
 		addAndEditForeignTousseApplication(id);
 	}else if(type == customTousseApplicationForm){
 		addAndEditCustomTousse(id,null,'01',function(){});
+	}else if(type == expensiveGoodsForm) {  //高值耗材申请单
+		addOrEidtExpensiveGoodsApplicationForm (id);
 	}
 };
 
@@ -2758,6 +2760,13 @@
 			handler : function() {
 				comboApplicationSyn();
 			}
+		},{
+			text : '申请高值耗材',
+			iconCls : 'btn_ext_add_tousse',
+			hidden : SSTS_ExpensiveGoodsApplication_Create,
+			handler : function() {
+				addOrEidtExpensiveGoodsApplicationForm('');
+			}
 		}
 	];
 
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp
===================================================================
diff -u -r20562 -r20846
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 20562)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp	(.../goodsApplicationView.jsp)	(revision 20846)
@@ -169,8 +169,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 currentOrgUnitName = '${depart}';
+var curUserName = '${userName}';  //登录用户全名
+var currentOrgUnitName = '${depart}';  //登录用户的当前科室名称
+var dirOrgCode = '<%=request.getAttribute("departCoding")%>';  //登录用户的当前科室编码
+
 var comboApplicationForm = '<%=InvoicePlan.TYPE_COMBO_FORM%>';//通用申请单
 var recyclingCreateApplicationForm = '<%=InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION%>';//回收申请单
 var tousseApplicationForm = '<%=InvoicePlan.TYPE_TOUSSE_APPLICATION_FORM%>';//器械包申请单
@@ -183,7 +185,7 @@
 var foreignPorxyApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION%>';//外部代理灭菌单
 var foreignTousseApplicationForm = '<%=InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION%>';//外来器械包申请单
 var expansionTousseForm = '<%=InvoicePlan.TYPE_TOUSSE_EXPANSION_FORM%>';//普通器械包扩充申请单
-var dirOrgCode = '<%=request.getAttribute("departCoding")%>';
+var expensiveGoodsForm = '<%=InvoicePlan.TYPE_EXPENSIVEGOODS_FORM%>';//高值耗材申请单
 var tousseTypeCustom = '<%=TousseDefinition.PACKAGE_TYPE_CUSTOM%>';//自定义器械包
 var tousseTypeDisinfect = '<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION%>;<%=TousseDefinition.PACKAGE_TYPE_STERILIZATION%>';//消毒物品和灭菌物品
 var endCause = ${endCause};
@@ -335,6 +337,49 @@
 	SSTS_ForeignTousseApplication_Return = false;
 </operation:authorize>
 
+
+/**
+ * 《高值耗材申请单添加》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Create = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Create">
+	SSTS_ExpensiveGoodsApplication_Create = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单修改》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Update = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Update">
+	SSTS_ExpensiveGoodsApplication_Update = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单查询》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Select = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Select">
+	SSTS_ExpensiveGoodsApplication_Select = false;
+</operation:authorize>
+
+/**
+ * 《高值耗材申请单删除》权限
+ */
+var SSTS_ExpensiveGoodsApplication_Delete = true;
+<operation:authorize ifAnyGranted="SSTS_ExpensiveGoodsApplication_Delete">
+	SSTS_ExpensiveGoodsApplication_Delete = false;
+</operation:authorize>
+
+if (!sstsConfig.enableExpensiveGoods) {
+	SSTS_ExpensiveGoodsApplication_Create = true;
+	SSTS_ExpensiveGoodsApplication_Update = true;
+	SSTS_ExpensiveGoodsApplication_Select = true;
+	SSTS_ExpensiveGoodsApplication_Delete = true;
+}
+
+
+
+
 //回收状态数组
 var recyclingStatusArr = new Array();
 recyclingStatusArr.push('<%=InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE%>');
@@ -437,6 +482,9 @@
 	.script("${ctx}/dwr/interface/DataSynchronizationTableManager.js")
 	.script("${ctx}/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js")
 	
+	<!-- 高值耗材申请单 -->
+	.script("${ctx}/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js")
+	
 	<!-- 自定义器械包 -->
 	.script("${ctx}/disinfectsystem/basedatamanager/tousse/customTousseForm.js")
 	
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r20788 -r20846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 20788)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 20846)
@@ -335,6 +335,71 @@
 		
 		return vos;
 	}
+	
+	/**
+	 * 保存高值耗材申请单.
+	 */
+	public void saveExpensiveGoodsApplication() {
+		String tousseItems = StrutsParamUtils.getPraramValue("tousseItems", "");
+		if (StringTools.isNotBlank(tousseItems)) {
+			JSONObject result = JSONUtil.buildJsonObject(true, "保存成功"); 
+			try {
+				JSONArray items = JSONArray.fromObject(tousseItems);
+				recyclingApplicationManager.saveOrUpdateExpensiveGoodsApplication(recyclingApplication, items);
+			} catch (Exception e) {
+				e.printStackTrace();
+				result = JSONUtil.buildJsonObject(false, e.getMessage());
+			}
+			StrutsResponseUtils.output(result);
+		} else {
+			StrutsResponseUtils.output(JSONUtil.buildJsonObject(false, "申请项不能为空！"));
+		}
+	}
+	
+	/**
+	 * 加载高值耗材申请单的申请单明细.
+	 */
+	public void loadExpensiveGoodsApplication() {
+		JSONObject result = JSONUtil.buildJsonObject(false, "找不到对应的申请单！");
+		if (DatabaseUtil.isPoIdValid(recyclingApplication.getId())) {
+			result = JSONUtil.buildJsonObject(true, "加载成功！");
+			result.put("data", buildRecyclingApplicationJson(recyclingApplication));
+		}
+		StrutsResponseUtils.output(result);
+	}
+	
+	private String buildRecyclingApplicationJson(RecyclingApplication recyclingApplication) {
+		JSONObject obj = new JSONObject();
+		obj.put("id", recyclingApplication.getId());
+		obj.put("depart", recyclingApplication.getDepart());
+		obj.put("departCoding", recyclingApplication.getDepartCoding());
+		obj.put("settleAccountsDepart", recyclingApplication.getSettleAccountsDepart());
+		obj.put("settleAccountsDepartCoding", recyclingApplication.getSettleAccountsDepartCoding());
+		obj.put("handleDepart", recyclingApplication.getHandleDepart());
+		obj.put("handleDepartCoding", recyclingApplication.getHandleDepartCoding());
+		obj.put("serialNumber", recyclingApplication.getSerialNumber());
+		obj.put("applicant", recyclingApplication.getApplicant());
+		obj.put("applicationTimeStr", recyclingApplication.getApplicationTimeStr());
+		obj.put("patient", recyclingApplication.getPatient());
+		obj.put("remark", recyclingApplication.getRemark());
+		obj.put("deliverStatus", recyclingApplication.getDeliverStatus());
+		
+		//设置申请项
+		JSONArray items = new JSONArray();
+		List<TousseItem> applicationItems = recyclingApplication.getApplicationItems();
+		if (CollectionUtils.isNotEmpty(applicationItems)) {
+			for (TousseItem tousseItem : applicationItems) {
+				JSONObject item = new JSONObject();
+				item.put("id", tousseItem.getId());
+				item.put("amount", tousseItem.getAmount());
+				item.put("expensiveGoodsId", tousseItem.getExpensiveGoodsId());
+				item.put("showName", tousseItem.getTousseName());
+				items.add(item);
+			}
+		}
+		obj.put("tousseItems", items);
+		return obj.toString();
+	}
 
 	/**
 	 * 保存申请单
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r20823 -r20846
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 20823)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 20846)
@@ -216,6 +216,11 @@
 	   <operation operationId="SSTS_ExpensiveGoods_Update" operationName="��ֵ�IJ��޸�"></operation>
 	   <operation operationId="SSTS_ExpensiveGoods_Select" operationName="��ֵ�IJIJ�ѯ"></operation>
 	   <operation operationId="SSTS_ExpensiveGoods_Delete" operationName="��ֵ�IJ�ɾ��"></operation>
+	   
+	   <operation operationId="SSTS_ExpensiveGoodsApplication_Create" operationName="��ֵ�IJ����뵥���"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsApplication_Update" operationName="��ֵ�IJ����뵥�޸�"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsApplication_Select" operationName="��ֵ�IJ����뵥��ѯ"></operation>
+	   <operation operationId="SSTS_ExpensiveGoodsApplication_Delete" operationName="��ֵ�IJ����뵥ɾ��"></operation>
 
 	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Manager" operationName="��ֵ�IJ��Թ�������"></operation>
 	   <operation operationId="SSTS_ExpensiveGoodsPurchaseGodownEntry_Create" operationName="��ֵ�IJ��Թ�������"></operation>
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js
===================================================================
diff -u -r20620 -r20846
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 20620)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationForm.js	(.../goodsApplicationForm.js)	(revision 20846)
@@ -1682,21 +1682,7 @@
     return false;
 }
 
-
 /**
- * 转换records，因为Ext4的combo的select事件有点小bug，第二个参数records在API写的是一个数组类型，但是在某种情况下他是一个对象（即：手动输入一个Store存在的数据时），因此写下此函数，转换一下
- * @param records
- * @returns
- */
-function transformRecords(records) {
-	var record = records;
-	if (records && records.length > 0){
-		record = records[0];
-	}
-	return record;
-}
-
-/**
  * 判断是否需要显示仓库名称的combo
  * @param deptCoding
  * @returns {Boolean}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java
===================================================================
diff -u -r20844 -r20846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 20844)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java	(.../RecyclingApplicationManagerImpl.java)	(revision 20846)
@@ -65,6 +65,7 @@
 import com.forgon.disinfectsystem.diposablegoods.service.DiposableGoodsManager;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoods;
 import com.forgon.disinfectsystem.entity.assestmanagement.DisposableGoodsBatchStock;
+import com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoods;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.taskGroup.TaskGroup;
@@ -2967,7 +2968,7 @@
 
 		Date currentDateTime = new Date();
 		
-		// 改成申请时间为空或者暂存后提交申请时间赋值,暂存后暂存后和提交后再提交不赋值,
+		//申请时间的赋值，两种操作需要赋值 1、“第一次提交” 2、“暂存后的提交”
 		if(application.getApplicationTime() == null || (committedStatus && !oldCommittedStatus)){
 			application.setApplicationTime(currentDateTime);
 		}
@@ -5347,6 +5348,7 @@
 									tousseItem.setPrice(price);
 									tousseItem.setRowPrice(rowPrice);
 									tousseItem.setInvoicePlan(invoicePlan);
+									tousseItem.setInvoicePlanID(invoicePlan.getId());
 									
 									applicationItems.add(tousseItem);
 								} else {
@@ -5562,5 +5564,69 @@
 			}
 		}
 	}
+
+	@Override
+	public void saveOrUpdateExpensiveGoodsApplication(
+			RecyclingApplication recyclingApplication, JSONArray items) {
+		String deliverStatus = recyclingApplication.getDeliverStatus();
+		if (StringTools.isNotBlank(deliverStatus) && !InvoicePlan.DELIVERSTATUS_AWAITDELIVER.equals(deliverStatus)) {
+			throw new RuntimeException("发货状态必须为待发货才能修改！");
+		}
+		
+		if (items != null && items.size() > 0) {
+			//1、设置申请项
+			List<TousseItem> oldApplicationItems = recyclingApplication.getApplicationItems();  //旧的申请项集合
+			List<TousseItem> newApplicationItems = new ArrayList<TousseItem>();  //新的申请项集合
+			for (Object object : items) {
+				JSONObject jsonObj = (JSONObject) object;
+				TousseItem tousseItem = tousseItemManager.get(jsonObj.optLong("id", 0));
+				if (tousseItem == null || tousseItem.getAmount() <= 0) {
+					tousseItem = new TousseItem();
+					tousseItem.setExpensiveGoodsId(jsonObj.optLong("expensiveGoodsId"));
+					tousseItem.setTousseName(jsonObj.optString("showName"));
+					tousseItem.setTousseType(ExpensiveGoods.TYPE_NAME);
+					tousseItem.setInvoicePlan(recyclingApplication);
+					tousseItem.setInvoicePlanID(recyclingApplication.getId());
+					objectDao.save(tousseItem);
+				}
+				tousseItem.setAmount(jsonObj.optInt("amount"));
+				newApplicationItems.add(tousseItem);
+			}
+			
+			//删除掉前台已经删除的申请项
+			if (CollectionUtils.isNotEmpty(oldApplicationItems)) {
+				List<Long> oldApplicationItemIds = oldApplicationItems.stream().map(i->i.getId()).collect(Collectors.toList());
+				List<Long> newApplicationItemIds = newApplicationItems.stream().map(i->i.getId()).collect(Collectors.toList());
+				oldApplicationItemIds.removeAll(newApplicationItemIds);
+				if (CollectionUtils.isNotEmpty(oldApplicationItemIds)) {
+					objectDao.delete(TousseItem.class.getSimpleName(), oldApplicationItemIds);
+				}
+			}
+			recyclingApplication.setApplicationItems(newApplicationItems);
+			
+			//2、设置时间
+			String applicationTimeStr = recyclingApplication.getApplicationTimeStr();
+			if(recyclingApplication.getApplicationTime() == null){
+				recyclingApplication.setApplicationTime(ForgonDateUtils.safelyParseDate(applicationTimeStr));
+			}
+			recyclingApplication.setSubmitTime(new Date());
+			
+			//3、设置单类型和状态等等信息
+			if (StringUtils.isBlank(recyclingApplication.getSerialNumber())) {
+				recyclingApplication.setSerialNumber(serialNumManager.getSerialNumberStr(SerialNum.TYPE_RECYCLINGAPPLICATION));
+			}
+			recyclingApplication.setCommittedStatus(true);
+			recyclingApplication.setOrderByFiled(InvoicePlan.ORDERBYFIELD_ONE);
+			recyclingApplication.setDeliverStatus(InvoicePlan.DELIVERSTATUS_AWAITDELIVER);
+			recyclingApplication.setIncludeInvoiceItems(1);
+			recyclingApplication.setIncludeRecyclingItems(0);
+			recyclingApplication.setSequence(supplyRoomConfigManager.getOrgUnitSequence(recyclingApplication.getDepartCoding()));
+			recyclingApplication.setType(InvoicePlan.TYPE_EXPENSIVEGOODS_FORM);
+			
+			saveOrUpdate(recyclingApplication);
+		} else {
+			throw new RuntimeException("申请项不能为空！");
+		}
+	}
 	
 }
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/expensiveGoodsApplication/expensiveGoodsApplicationForm.js	(revision 20846)
@@ -0,0 +1,664 @@
+var windowObj = null;
+var formObj = null;
+//高值耗材的store
+var expensiveGoodsStore = null;
+//高值耗材申请项top.Ext4.tree.Panel的数据仓库
+var treePanelStore = null;
+
+/**
+ * 结算科室的store
+ */
+var settleAccountsDepartmentStore = new Ext4.data.Store({
+	autoLoad: true,  //先加载一下
+	proxy : {
+		type : 'ajax',
+		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
+		reader : {
+			type : 'json',
+			totalProperty : 'totalCount',
+			root : 'data'
+		}
+	},
+	fields : [
+	    {name : 'departmentCode',mapping : 'id'}, 
+	    {name : 'departmentName',mapping : 'name'}
+	   ]
+});
+
+/**
+ * 添加或者修改高值耗材申请单.
+ * @param id	高值耗材申请单id
+ */
+function addOrEidtExpensiveGoodsApplicationForm (id) {
+	/**
+	 * 申请科室的store
+	 */
+	var applyDepartmentStore = new Ext4.data.Store({
+		pageSize: 100,
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/systemmanage/orgUnit/searchApplyDepartmentByKeyWord.do',
+			reader : {
+				type : 'json',
+				totalProperty : 'totalCount',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'departmentCode',mapping : 'departmentCode'}, 
+		    {name : 'departmentName',mapping : 'departmentName'}
+		   ]
+	});
+	
+	/**
+	 * 处理科室的store
+	 */
+	var handleDepartmentStore = new Ext4.data.Store({
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!searchExpensiveGoodsHandleDepartment.do',
+			reader : {
+				type : 'json',
+				totalProperty : 'totalCount',
+				root : 'data'
+			}
+		},
+		fields : [
+		    {name : 'departmentCode',mapping : 'departmentCode'}, 
+		    {name : 'departmentName',mapping : 'departmentName'}
+		],
+		listeners: {
+			load : function(thiz, records, successful, eOpts) {
+				if (records.length > 0) {
+					top.Ext4.getCmp('handleDepart').setValue(records[0].data.departmentName);
+					top.Ext4.getCmp('handleDepartCoding').setValue(records[0].data.departmentCode);
+					top.Ext4.getCmp('handleDepartment').setValue(records[0].data.departmentCode);
+				}
+			}
+		}
+	});
+	
+	
+	/**
+	 * 申请的物品模型
+	 */
+	Ext4.define('ExpensiveGoodsModel', {
+		extend : 'Ext4.data.Model',
+		idProperty: 'expensiveGoodsId', //指定id属性
+		fields: [
+		{name : 'id'},					//申请项的id
+		{name : 'amount'},				//申请项的数量
+		{name : 'expensiveGoodsId'},	//高值耗材id
+		{name : 'showName'},			//高值耗材的显示名称（即：名称[规格]）
+		{name : 'name'},				//高值耗材的名称
+		{name : 'specification'}		//高值耗材的规格
+	]});
+	
+	expensiveGoodsStore = new Ext4.data.Store({
+		pageSize: 100,
+		fields: [
+		 		{name : 'id'},					//高值耗材id
+		 		{name : 'showName'},			//高值耗材的显示名称（即：名称[规格]）
+		 		{name : 'name'},				//高值耗材的名称
+		 		{name : 'specification'}		//高值耗材的规格
+		],
+		proxy : {
+			type : 'ajax',
+			url : WWWROOT + '/disinfectSystem/expensiveGoodsAction!searchExpensiveGoods.do',
+			reader : {
+				type : 'json',
+				totalProperty : 'totalCount',
+				root : 'data'
+			}
+		}
+	});
+	
+	
+	
+	treePanelStore = Ext4.create('Ext4.data.TreeStore', {
+		autoLoad : true,
+		clearOnLoad : true,
+		model : 'ExpensiveGoodsModel',
+		proxy : {
+			type : 'memory',
+			reader : {
+				type : 'json',
+				root : 'children'
+			}
+		}
+	});
+	
+	/**
+	 * 高值耗材申请项top.Ext4.tree.Panel
+	 */
+	top.Ext4.define('expensiveGoodsApplicationTreeGrid', {
+        extend: 'top.Ext4.tree.Panel',
+        xtype: 'tree-grid',
+        useArrows: true,
+        rootVisible: false,
+        multiSelect: false,
+        columnLines: true,
+        rowLines: true,
+        cls: 'no-leaf-icons',
+        columns : [{
+    		dataIndex: 'id', hidden: true
+    	},{
+    		dataIndex: 'expensiveGoodsId', hidden: true
+    	},{
+    		dataIndex: 'name', hidden: true
+    	},{
+    		dataIndex: 'specification', hidden: true
+    	},{
+    		header: '名称', dataIndex: 'showName', width: 250
+    	},{
+    		header: '申请数量', dataIndex : 'amount', width: 100, align: 'center', sortable: false,
+            editor: {
+                xtype: 'numberfield',
+                allowBlank: true,
+                allowDecimals :false,
+                minValue: 0,
+                maxValue: 9999,
+    	        listeners: {
+                    specialkey: function(field, event, eOpts) {
+                        if (event.getKey() === event.TAB) {
+                            //阻止按Tab,因为这里的CellEditing按了tab会有bug
+                            event.stopEvent();
+                        }
+                    }
+                }
+            }
+    	}],
+        viewConfig : {
+        	toggleOnDblClick: false,
+        	markDirty:false
+        },
+        initComponent: function() {
+        	this.cellEditing = new top.Ext4.grid.plugin.CellEditing({
+                clicksToEdit: 2,
+                listeners: {
+                    beforeedit: function(editor, context, eOpts){
+                    	var record = context.record;
+                    	
+                    },
+                    edit:function(editor, context, eOpts){
+                    	
+                    }
+                }
+            });
+            Ext4.apply(this, {
+            	plugins: [this.cellEditing]
+            });
+            this.superclass.initComponent.call(this);
+        }
+    });
+	
+	formObj = new top.Ext4.form.Panel({
+		frame : true,
+		border : 0,
+		labelSeparator : '：',
+		bodyPadding : '5 5 0',
+        autoScroll : true,
+		buttonAlign : 'center',
+		fieldDefaults : {
+			labelAlign : 'right'
+		},
+		layout : {
+			type : 'vbox'
+		},
+		items : [
+		{xtype: 'hidden', name: 'id', id : 'id', value: id},       
+		{xtype: 'hidden', name: 'depart', id : 'depart'},        
+		{xtype: 'hidden', name: 'departCoding', id : 'departCoding'},        
+		{xtype: 'hidden', name: 'settleAccountsDepart', id : 'settleAccountsDepart'},        
+		{xtype: 'hidden', name: 'settleAccountsDepartCoding', id : 'settleAccountsDepartCoding'},        
+		{xtype: 'hidden', name: 'handleDepart', id : 'handleDepart'},        
+		{xtype: 'hidden', name: 'handleDepartCoding', id : 'handleDepartCoding'},        
+		{xtype: 'hidden', name: 'tousseItems', id : 'tousseItems'},        
+		
+		{
+			xtype: 'fieldset',
+			title: '基本信息',
+			layout: 'column',
+			height : 160,
+			width: '100%',
+			items: [{  //流水号、申请人、时间
+				xtype : 'container',
+				layout : {type : 'hbox'},
+				height: 30,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '流水号',
+					maxLength : '41',
+					flex : 1,
+					id : 'serialNumber',
+					name : 'serialNumber',
+					allowBlank : true,
+					readOnly : true,
+					fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+				},{
+					xtype : 'textfield',
+					fieldLabel : '申请人',
+					maxLength : '255',
+					flex : 1,
+					id : 'applicant',
+					name : 'applicant',
+					allowBlank : false,
+					readOnly : true,
+					fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+				},{
+					xtype : 'textfield',
+					fieldLabel : '时间',
+					flex : 1,
+					id : 'applicationTimeStr',
+					name : 'applicationTimeStr',
+					allowBlank : false,
+					readOnly : true,
+					fieldCls : 'fieldReadOnlyNoRemoveAndTop'
+				}]
+			},{  //申请科室、结算科室、处理的供应室
+				xtype : 'container',
+				layout : {type : 'hbox'},
+				height: 30,
+				items : [{
+					xtype : 'combo',
+					flex : 1,
+					fieldLabel: '申请科室',
+					id : 'department',
+					name : 'department',
+					valueField : 'departmentCode',
+					displayField : 'departmentName',
+					store : applyDepartmentStore,
+					queryParam : 'spell',
+					pageSize : 100,
+					minChars : 0,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					matchFieldWidth: false,
+					listConfig: {width: 300},
+					allowBlank : false,
+					flex : 1,
+					listeners: {
+						focus : function(thiz){
+							thiz.selectText();
+						},
+						select : function(_this, records, index) {
+							var record = transformRecords(records);
+							var departmentName = record.data.departmentName;
+							var departmentCode = record.data.departmentCode;
+							
+							//1、设置申请科室
+							formObj.getForm().findField('depart').setValue(departmentName);
+							formObj.getForm().findField('departCoding').setValue(departmentCode);
+							
+							//2、设置结算科室
+							setSettleAccountsDepartmentByApplyDepartment(settleAccountsDepartmentStore, departmentCode, departmentName);
+						}
+					}
+				},{
+					xtype : 'combo',
+					flex : 1,
+					fieldLabel: '结算科室',
+					id : 'settleAccountsDepartment',
+					name : 'settleAccountsDepartment',
+					valueField : 'departmentCode',
+					displayField : 'departmentName',
+					store : settleAccountsDepartmentStore,
+					queryParam : 'spell',
+					minChars : 0,
+					matchFieldWidth: false,
+					listConfig: {width: 300},
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : false,
+					listeners: {
+						focus : function(thiz){
+							thiz.selectText();
+						},
+						select : function(_this, records, index) {
+							var record = transformRecords(records);
+							top.Ext4.getCmp('settleAccountsDepart').setValue(record.data.departmentName);
+							top.Ext4.getCmp('settleAccountsDepartCoding').setValue(record.data.departmentCode);
+						}
+					}
+				},{
+					xtype : 'combo',
+					flex : 1,
+					fieldLabel: '处理科室科室',
+					id : 'handleDepartment',
+					name : 'handleDepartment',
+					valueField : 'departmentCode',
+					displayField : 'departmentName',
+					store : handleDepartmentStore,
+					queryParam : 'spell',
+					matchFieldWidth: false,
+					listConfig: {width: 300},
+					forceSelection : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					allowBlank : false,
+					listeners: {
+						focus : function(thiz){
+							thiz.selectText();
+						},
+						select : function(_this, records, index) {
+							var record = transformRecords(records)
+							top.Ext4.getCmp('handleDepart').setValue(record.data.departmentName);
+							top.Ext4.getCmp('handleDepartCoding').setValue(record.data.departmentCode);
+						}
+					}
+				}]
+			},{  //病人
+				xtype : 'container',
+				layout : {type : 'hbox'},
+				height: 30,
+				items : [{
+					xtype : 'textfield',
+					fieldLabel : '病人姓名',
+					maxLength : '50',
+					id : 'patient',
+					name : 'patient',
+					allowBlank : true,
+					flex : 1
+				}]
+			},{  //备注
+				xtype: 'container',
+				height: 30,
+				width: 800,
+				layout: {type: 'hbox'},
+				items: [{
+					xtype : 'textfield',
+					fieldLabel : '备注',
+					id : 'remark',
+					name : 'remark',
+					flex : 1
+				}]
+			}]
+		},{
+			xtype: 'container',
+			width: '100%',
+			height: 350,
+			layout: 'fit',
+			items: {
+				xtype : 'tree-grid',
+				store : treePanelStore,
+				tbar:[{
+					text: "物品名称:"
+				},{
+					xtype: 'combo',
+					id : 'expensiveGoods',
+					name : 'expensiveGoods',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'id',
+					displayField : 'showName',
+					matchFieldWidth: false,
+					width : 300,
+					listConfig: {width : 300},
+					store : expensiveGoodsStore,
+					forceSelection : true,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					allowBlank : true,
+					pageSize:100
+				},{
+					text:"数量:"
+				},{
+					xtype : 'numberfield',
+					id : 'amount',
+					name : 'amount',
+					style : 'text-align: left',
+					width : 60,
+					maxValue: 9999,
+			        minValue: 1,
+					allowNegative : false,
+					allowDecimals : false,
+					listeners : {
+						specialkey : function(field, ee) {
+							if (ee.getKey() == Ext.EventObject.ENTER) {
+								addExpensiveGoods();
+							}
+						}
+					}
+				},{
+					xtype:'button',
+					id : 'addTousseBt',
+					iconCls : 'btn_ext_add',
+					handler : function() {
+						addExpensiveGoods();
+					}
+				}]
+			}
+		}],
+		buttons : [{
+			id : 'saveBtn',
+			text : '保存',
+			handler : saveExpensiveGoodsApplicationForm
+		}, {
+			text : '取消',
+			handler : function() {
+				windowObj.close();
+			}
+		}]
+	});
+	
+	windowObj = new top.Ext4.window.Window({
+		layout : 'fit',
+		title : '申请高值耗材',
+		width : 900,
+		height : 600,
+		resizable :false,
+		modal : true,
+		border : false,
+		plain : true,
+		items : formObj
+	});
+	windowObj.show();
+	
+	if (id) {
+		formObj.form.load({
+			url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!loadExpensiveGoodsApplication.do',
+	        method : 'POST',
+	        waitMsg : '正在保存数据，请稍候',
+	        waitTitle : '提交表单',
+	        success : function(form, action) {
+	        	var invoicePlan = action.result.data;
+	        	var depart = formObj.getForm().findField('depart').getValue();
+	        	var settleAccountsDepart = top.Ext4.getCmp('settleAccountsDepart').getValue();
+	        	var handleDepart = top.Ext4.getCmp('handleDepart').getValue();
+	        	
+	        	
+	        	
+	        	//1、设置“申请科室”、“结算科室”、“处理科室”combo的显示值
+	        	top.Ext4.getCmp('department').setRawValue(depart);
+	        	top.Ext4.getCmp('settleAccountsDepartment').setRawValue(settleAccountsDepart);
+	        	top.Ext4.getCmp('handleDepartment').setRawValue(handleDepart);
+	        	
+	        	//2、设置申请项
+	        	treePanelStore.proxy.data = {children: invoicePlan.tousseItems};
+	        	treePanelStore.load();
+	        	
+	        	//3、状态等于待发货才允许修改
+	        	if (invoicePlan.deliverStatus != '待发货') {
+	        		top.Ext4.getCmp('saveBtn').disable();
+	        	}
+	        	
+	        },
+	        failure : function(form, action) {
+	        },
+			params : {
+				id : id
+			}
+		});
+	} else {  //新加
+		//1、设置默认的“申请人”、“申请时间”
+		top.Ext4.getCmp('applicant').setValue(curUserName);
+		getServerTime('yyyy-MM-dd HH:mm',top.Ext4,'applicationTimeStr');
+		
+		
+		//2、设置默认的“申请科室”、“结算科室”、“处理科室”
+		formObj.getForm().findField('depart').setValue(currentOrgUnitName);
+		formObj.getForm().findField('departCoding').setValue(dirOrgCode);
+		top.Ext4.getCmp('department').setRawValue(currentOrgUnitName);
+		setSettleAccountsDepartmentByApplyDepartment(settleAccountsDepartmentStore, dirOrgCode, currentOrgUnitName);
+		handleDepartmentStore.load();
+	}
+	
+}
+
+/**
+ * 添加高值耗材到申请物品列表.
+ * @returns {Boolean}
+ */
+function addExpensiveGoods() {
+	var amount = top.Ext4.getCmp('amount').getValue();
+	var id = top.Ext4.getCmp('expensiveGoods').getValue();
+	var showName = top.Ext4.getCmp('expensiveGoods').getRawValue();
+	
+	//1、先校验物品和数量
+	if (!id || !showName) {
+		showResult('请选择要添加的物品！');
+		return false;
+	}
+	
+	if (isNaN(amount) || amount <= 0) {
+		showResult('申请数量必须大于0！');
+		return false;
+	}
+	
+	//2、如果申请列表已经存在此物则提示“此物已经存在！”（即：同一种物品并且数量大于0）
+	var findNode = treePanelStore.getNodeById(id);
+	if (findNode && findNode.get('amount')) {
+		showResult('此物已经存在！');
+		return false;
+	} else {
+		if (findNode) {
+			findNode.set('amount', amount);
+		} else {
+			var selectRecord = expensiveGoodsStore.findRecord('id', id);
+			var node = Ext4.create('ExpensiveGoodsModel', {
+				id : 0,
+				amount: amount,
+				expensiveGoodsId : selectRecord.get('id'),
+				showName : selectRecord.get('showName'),
+				name : selectRecord.get('name'),
+				specification : selectRecord.get('specification')
+			});
+			treePanelStore.getRootNode().appendChild(node);
+		}
+		top.Ext4.getCmp('expensiveGoods').setValue();
+		top.Ext4.getCmp('amount').setValue();
+	}
+	
+	
+}
+
+
+/**
+ * 保存高值耗材申请单.
+ */
+function saveExpensiveGoodsApplicationForm() {
+	if (!formObj.getForm().isValid()) {
+		showResult('请正确填写表单各值');
+		return false;
+	}
+	
+	//设置申请项信息
+	if (setApplyItems()) {
+		var msgBox = new top.Ext4.window.MessageBox();
+		msgBox.confirm({
+			title: '温馨提示',
+			padding: '0 10 10 10',
+			msg: '确认提交吗？',
+			fn: function(btn){
+				if (btn == 'yes'){
+					submitExpensiveGoodsApplication();
+            	}
+			},
+			buttons: Ext4.Msg.YESNO,
+			icon: Ext4.Msg.QUESTION
+		});
+	} else {
+		showResult("请填写申请的物品！");
+		return;
+	}
+}
+
+/**
+ * 向后台提交高值耗材申请单.
+ */
+function submitExpensiveGoodsApplication() {
+	top.Ext4.getCmp('saveBtn').disable();
+	formObj.form.submit({
+        url : WWWROOT + '/disinfectSystem/recyclingApplicationAction!saveExpensiveGoodsApplication.do',
+        method : 'POST',
+        waitMsg : '正在保存数据，请稍候',
+        waitTitle : '提交表单',
+        success : function(form, action) {
+        	windowObj.close();
+    		grid.dwrReload();
+    		showResult(action.result.message);
+        },
+        failure : function(form, action) {
+        	top.Ext4.getCmp('saveBtn').enable();
+        	showResult(action.result.message);
+        }
+    });
+}
+
+/**
+ * 设置申请项信息.
+ * @param treeStore
+ * @returns {Boolean}	申请项为空则返回false，否则返回true
+ */
+function setApplyItems(){
+	var nodes = treePanelStore.getRootNode().childNodes;
+	
+	var items = [];
+	for (var i=0; i<nodes.length; i++){
+		var node = nodes[i];
+		var amount = node.get('amount');
+		if (!isNaN(amount) && amount > 0) {
+			var item = {
+				id: node.get('id'),
+				amount: node.get('amount'),
+				expensiveGoodsId: node.get('expensiveGoodsId'),
+				showName: node.get('showName'),
+				name: node.get('name'),
+				specification: node.get('specification')
+			};
+			items.push(item);
+		}
+	}
+	
+	if (items.length > 0) {
+		top.Ext4.getCmp('tousseItems').setValue(JSON.stringify(items));
+		return true;
+	} else {
+		return false;
+	}
+}
+
+
+/**
+ * 根据申请科室设置结算科室.
+ * @param settleAccountsDepartmentStore	结算科室的store
+ * @param departmentCode				申请科室编码
+ * @param departmentName				申请科室名称
+ */
+function setSettleAccountsDepartmentByApplyDepartment(settleAccountsDepartmentStore, departmentCode, departmentName) {
+	var index = settleAccountsDepartmentStore.find('departmentCode', departmentCode);
+	if (index != -1) {
+		top.Ext4.getCmp('settleAccountsDepart').setValue(departmentName);
+		top.Ext4.getCmp('settleAccountsDepartCoding').setValue(departmentCode);
+		
+		top.Ext4.getCmp('settleAccountsDepartment').setValue(departmentCode);
+	}
+}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java
===================================================================
diff -u -r20762 -r20846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 20762)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManager.java	(.../RecyclingApplicationManager.java)	(revision 20846)
@@ -368,4 +368,12 @@
 	 * @param applicationTime	申请时间
 	 */
 	public void interfereApplicationTime(String[] ids, Date applicationTime);
+
+	/**
+	 * 保存或者更新高值耗材申请单.
+	 * @param recyclingApplication	高值耗材申请单
+	 * @param newItems				此次提交的申请项
+	 */
+	public void saveOrUpdateExpensiveGoodsApplication(
+			RecyclingApplication recyclingApplication, JSONArray newItems);
 }
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r19288 -r20846
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 19288)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 20846)
@@ -2733,4 +2733,17 @@
 	} else {
 		return false;
 	}
-}
\ No newline at end of file
+}
+
+/**
+ * 转换records，因为Ext4的combo的select事件有点小bug，第二个参数records在API写的是一个数组类型，但是在某种情况下他是一个对象（即：手动输入一个Store存在的数据时），因此写下此函数，转换一下
+ * @param records
+ * @returns
+ */
+function transformRecords(records) {
+	var record = records;
+	if (records && records.length > 0){
+		record = records[0];
+	}
+	return record;
+}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r20688 -r20846
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 20688)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 20846)
@@ -209,90 +209,58 @@
 	}
 
 	public String findRecyclingApplicationTableList(Map<String, List<String>> parameterMap) {
-		//实例化sql拼接的辅助类
-		ReAppTableSqlHandler reAppTableSqlHandler = ReAppTableSqlHandler.getInstance(dateQueryAdapter);
+		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
+		StringBuilder sqlBuilder = new StringBuilder(" where 1=1 ");
+		
+		//1、当前登录用户的过滤（即：1、处理科室用户能看到已经提交的单  2、申请科室用户只能看到本科室申请的单）
+		String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
+		String loginUserSql = String.format(" and ((po.handleDepartCoding = '%s' and po.committedStatus = 1) or po.departCoding = '%s') ", currentOrgUnitCode, currentOrgUnitCode);
+		sqlBuilder.append(loginUserSql);
+		
+		//2、不包含的申请单类型
 		List<String> excludeTypelist = new ArrayList<String>();
 		excludeTypelist.add(InvoicePlan.TYPE_PROXYDISINFECTION);
 		excludeTypelist.add(InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM);
 		excludeTypelist.add(InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION);
-		
-		if (CssdUtils.getSystemSetConfigByNameBool("hideReservationList", false)) {
+		if (CssdUtils.getSystemSetConfigByNameBool("hideReservationList", false)) {  //手术预约申请单
 			excludeTypelist.add(InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION);
 		}
-		
-		StringBuilder sqlBuilder = new StringBuilder();
-
-		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
-		sqlBuilder.append(" WHERE (" + SqlBuilder.build_IN_Statement("po.type", SqlBuilder.NOT_IN, excludeTypelist));
-		String listType = sqlWhereParamMap.get("listType");
-		String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
-		int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(currentOrgUnitCode);
-		
-		// 如果不是一二级供应室，则把科室当做申请科室处理
-		if (supplyRoomType == SupplyRoomConfig.SUPPLYROOM_TYPE_SYSTEM_CONFIG){
-			supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_APPLY;
+		if (!CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods", false)) {  //高值耗材申请单
+			excludeTypelist.add(InvoicePlan.TYPE_EXPENSIVEGOODS_FORM);
 		}
+		String excludeTypeSql = String.format(" and %s ", SqlBuilder.build_IN_Statement("po.type", SqlBuilder.NOT_IN, excludeTypelist));
+		sqlBuilder.append(excludeTypeSql);
 		
-		
-		String deliverStatusSql = SqlBuilder.build_IN_Statement(
-				"po.deliverStatus", SqlBuilder.IN,
-				InvoicePlan.DELIVERSTATUS_AWAITDELIVER,
-				InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
-		
-		//不发货的单，今天处理完，也要在科室申领那里显示出来
-		deliverStatusSql = String.format("(%s or po.deliverStatus='' or po.deliverStatus is null)", deliverStatusSql);
-		
-		String returnStatusSql = SqlBuilder.build_IN_Statement(
-				"po.returnStatus", SqlBuilder.IN,
-				InvoicePlan.RETURN_STATUS_UNRETURNED,
-				InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED);
+		//3、未处理完的单和今天处理完的单
+		if("todoList".equals(sqlWhereParamMap.get("listType"))){
+			//回收状态（“待回收”、“部分回收”）
+			String recyclingStatusSql = SqlBuilder.build_IN_Statement(
+					"po.recyclingStatus", SqlBuilder.IN, InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
 
-		String recyclingStatusSql = SqlBuilder.createStatus("recyclingStatus", InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE, InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE);
-
-
-		switch(supplyRoomType){
-		case SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM:
-		// 一级供应室
-		case SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM:{
-			//未处理完的单和今天处理完的单
-			if("todoList".equals(listType)){
-				boolean showAllApplicationOfTodayInTODOList = true;
-				
-				Date todayBegin = DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH);		
-				String todaySql = "po.lastInvoiceTime >= " + dateQueryAdapter.dateAdapter(todayBegin);
-				
-				if (showAllApplicationOfTodayInTODOList) {
-					sqlBuilder.append(String.format(
-							" AND ( (%s) OR (%s) OR (%s) OR (%s) )", deliverStatusSql,
-							returnStatusSql, todaySql, recyclingStatusSql));
-				} else {
-					sqlBuilder.append(String.format(" AND ( (%s) OR (%s) )",
-							deliverStatusSql, returnStatusSql));
-				}
-			}
-			sqlBuilder.append(String.format(" AND (po.handleDepartCoding = '%s' or po.departCoding = '%s') AND (po.committedStatus <> 0 or po.applicant = '%s') ",
-					currentOrgUnitCode,currentOrgUnitCode,AcegiHelper.getLoginUser().getUserFullName()));
-			break;
+			//发货状态（“待发货”、“部分发货”、“不发货的单”）
+			String deliverStatusSql = String.format(
+					" (po.deliverStatus='%s' or po.deliverStatus='%s' or po.deliverStatus='' or po.deliverStatus is null) ",
+					InvoicePlan.DELIVERSTATUS_AWAITDELIVER, InvoicePlan.DELIVERSTATUS_PARTDELIVERED);
+			
+			
+			//归还状态（“未归还”、“部分归还”、“归还待确认”）
+			String returnStatusSql = SqlBuilder.build_IN_Statement(
+					"po.returnStatus", SqlBuilder.IN, InvoicePlan.RETURN_STATUS_UNRETURNED, InvoicePlan.RETURN_STATUS_PARTIALLY_RETURNED,
+					InvoicePlan.RETURN_STATUS_AWAITCONFIRM);
+			
+			//今天处理的单
+			String todaySql = "po.lastInvoiceTime >= " + dateQueryAdapter.dateAdapter(DateUtils.truncate(new Date(), Calendar.DAY_OF_MONTH));
+			
+			sqlBuilder.append(String.format(" and (%s or %s or %s or %s) ", recyclingStatusSql, deliverStatusSql, returnStatusSql, todaySql));
 		}
-		default:
-			// 对于一级,二级供应室以外的其他科室，加上按部门过滤的语句，只能查看本部门的申请单和自己申请的单
-			sqlBuilder.append(String.format(" AND (po.departCoding = '%s' or po.applicant = '%s') ", currentOrgUnitCode,AcegiHelper.getLoginUser().getUserFullName()));
-			//如果是省医的科室申领
-			if("todoList".equals(listType) && ObjectUtils.equals("gdsy", CssdUtils.getProjectName())){
-				reAppTableSqlHandler.createApplyFilterSql(sqlBuilder, deliverStatusSql);
-			}
-		}
-		//对应最上面的where
-		sqlBuilder.append(")");
+		
+		//4、其他一些条件的过滤
+		ReAppTableSqlHandler reAppTableSqlHandler = ReAppTableSqlHandler.getInstance(dateQueryAdapter);
 		reAppTableSqlHandler.createFilterSql(sqlWhereParamMap, sqlBuilder);
-
-		String sql = sqlBuilder.toString();
-		logger.debug(sql);
+		
 		return gridManager.renderGrid(parameterMap,
-				InvoicePlan.class.getSimpleName(), sql, new String[] {
-						"applicationItems", "returnedTousseItems", "invoice",
-						"recyclingRecord",
-						"recyclingApplications", "parent" });
+				InvoicePlan.class.getSimpleName(), sqlBuilder.toString(), new String[] {
+						"applicationItems", "returnedTousseItems", "invoice", "recyclingRecord", "recyclingApplications", "parent" });
 	}