Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r37529 -r38662
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 37529)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 38662)
@@ -1932,6 +1932,8 @@
 	recyclingapplicationStore1.removeAll();
 	recyclingapplicationStore1.on("beforeload", function (thiz, options) {
 		thiz.baseParams["orgUnitCoding"] = orgUnitCoding;
+		//后台对科室编码的参数过滤很多用的departCode这个参数,所以请求时加上此参数
+		thiz.baseParams["departCode"] = orgUnitCoding;
 		recyclingapplicationStore1.baseParams['invoicePlanId'] = selectedInvoicePlanId;
 		recyclingapplicationStore1.baseParams['applyDate'] = selectedApplyDate;
 		recyclingapplicationStore1.baseParams['tousseType'] = encodeURI(selectedTousseType);
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r38340 -r38662
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 38340)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 38662)
@@ -592,6 +592,8 @@
 	});
 	view_recyclingapplicationStore.on("beforeload", function(thiz, options) {
 		thiz.baseParams["orgUnitCoding"] = checkedOrgUnitCoding;
+		//后台对科室编码的参数过滤很多用的departCode这个参数,所以请求时加上此参数
+		thiz.baseParams["departCode"] = orgUnitCoding;
 //		view_recyclingapplicationStore.baseParams['invoicePlanId'] = selectedInvoicePlanId;
 		view_recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate;
 		view_recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r38499 -r38662
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 38499)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 38662)
@@ -689,7 +689,11 @@
 	@Override
 	public Collection<ApplicationGoodsVo> getWaitDeliverGoods(SearchInvoicePlanOrGoodsParams filterParams) {
 
-		Long invoicePlanId = Long.parseLong(filterParams.getInvoicePlanId());
+		String getInvoicePlanId = filterParams.getInvoicePlanId();
+		Long invoicePlanId = null;
+		if(DatabaseUtil.isPoIdValid(getInvoicePlanId)){
+			invoicePlanId = Long.parseLong(getInvoicePlanId);
+		}
 		String orgUnitCoding = filterParams.getOrgUnitCoding();
 		Long warehouseId;
 		String applyDate;