Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java
===================================================================
diff -u -r22463 -r22527
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 22463)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java	(.../InvoicePlanManagerImpl.java)	(revision 22527)
@@ -584,7 +584,7 @@
 		filterEmptyInvoicePlan(invoicePlans);
 		filterInvoicePlanByDisposableGoodsType(config,invoicePlans,disposableGoodsTypeSet);
 		Collection<InvoicePlanVo> resultCol = new ArrayList<InvoicePlanVo>();
-		Map<InvoicePlanVo,List<InvoicePlan>> invoicePlanVoToInvoicePlanListMap = new HashMap<InvoicePlanVo, List<InvoicePlan>>();
+//		Map<InvoicePlanVo,List<InvoicePlan>> invoicePlanVoToInvoicePlanListMap = new HashMap<InvoicePlanVo, List<InvoicePlan>>();
 		for (final InvoicePlan invoicePlan : invoicePlans) {
 			if(hideUnprintedDisposableGoodsInvoicePlan && (invoicePlan.isDiposableGoodsAppliaction() && (invoicePlan.getPrinted() != InvoicePlan.PRINT_STATUS_PRINTED))){
 				continue;
@@ -614,21 +614,21 @@
 			if(invoicePlan.isBorrowingSingle()){
 				vo.setHighLight(true);
 			}
-			List<InvoicePlan> invoicePlanList = invoicePlanVoToInvoicePlanListMap.get(vo);
-			if(invoicePlanList == null){
-				invoicePlanList = new LinkedList<InvoicePlan>();
-				invoicePlanVoToInvoicePlanListMap.put(vo, invoicePlanList);
-			}
-			invoicePlanList.add(invoicePlan);
+//			List<InvoicePlan> invoicePlanList = invoicePlanVoToInvoicePlanListMap.get(vo);
+//			if(invoicePlanList == null){
+//				invoicePlanList = new LinkedList<InvoicePlan>();
+//				invoicePlanVoToInvoicePlanListMap.put(vo, invoicePlanList);
+//			}
+//			invoicePlanList.add(invoicePlan);
 		}
 		//
-		for (InvoicePlanVo invoicePlanVo : resultCol) {
-			List<InvoicePlan> invoicePlanList = invoicePlanVoToInvoicePlanListMap.get(invoicePlanVo);
-			Collection<ApplicationGoodsVo> applicationGoodsVos = getWaitDeliverGoods(invoicePlanList, applyDate, tousseType, disposableGoodsType);
-			if(applicationGoodsVos != null){
-				invoicePlanVo.setApplicationGoodsVos(applicationGoodsVos);
-			}
-		}
+//		for (InvoicePlanVo invoicePlanVo : resultCol) {
+//			List<InvoicePlan> invoicePlanList = invoicePlanVoToInvoicePlanListMap.get(invoicePlanVo);
+//			Collection<ApplicationGoodsVo> applicationGoodsVos = getWaitDeliverGoods(invoicePlanList, applyDate, tousseType, disposableGoodsType);
+//			if(applicationGoodsVos != null){
+//				invoicePlanVo.setApplicationGoodsVos(applicationGoodsVos);
+//			}
+//		}
 		
 		return resultCol;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r22474 -r22527
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 22474)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 22527)
@@ -14,6 +14,7 @@
 var invoiceDepartGroups = '';
 var appDepartCode = '';
 var view_recyclingapplicationStore = null;
+var checkedOrgUnitCoding = null;
 var diposableGooodsStore = new Ext.data.SimpleStore({
 	fields : [ 'typeName' ],
 	url : WWWROOT + '/disinfectSystem/diposableGoodsAction!getDiposableGoodsType.do'
@@ -266,23 +267,33 @@
                                           {name : 'urgentAmount'}
                                         ]);
 function onSelChange(sm){
-	var rs = sm.getSelections();
+//	var rs = sm.getSelections();
+//	view_recyclingapplicationStore.removeAll();
+//	for(var i=0;i<rs.length;++i){
+//		var record = rs[i];
+//		var voItems = record.data['applicationGoodsVos'];
+//		for(var i=0;i<voItems.length;i++) {
+//			var showTousseName = voItems[i].showTousseName;
+//			var count = voItems[i].count;
+//			var urgentAmount = voItems[i].urgentAmount;
+//			var newRecord = new ViewAppGridItem({
+//				showTousseName : showTousseName,
+//				urgentAmount : urgentAmount,
+//				count : count
+//			});
+//			view_recyclingapplicationStore.add(newRecord);
+//		}
+//	}
+	/////
 	view_recyclingapplicationStore.removeAll();
-	for(var i=0;i<rs.length;++i){
-		var record = rs[i];
-		var voItems = record.data['applicationGoodsVos'];
-		for(var i=0;i<voItems.length;i++) {
-			var showTousseName = voItems[i].showTousseName;
-			var count = voItems[i].count;
-			var urgentAmount = voItems[i].urgentAmount;
-			var newRecord = new ViewAppGridItem({
-				showTousseName : showTousseName,
-				urgentAmount : urgentAmount,
-				count : count
-			});
-			view_recyclingapplicationStore.add(newRecord);
-		}
+	var rs = sm.getSelections();
+	if(rs.length == 0){
+		return;
 	}
+	checkedOrgUnitCoding = rs[0].data['departCode'];
+	
+	view_recyclingapplicationStore.load();
+	
 }
 Ext.onReady(function() {
 //	Ext.QuickTips.init();
@@ -407,8 +418,19 @@
 	});
 	//申请物品
 	view_recyclingapplicationStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/invoiceAction!loadDepartApplicationAllGoodsByCondition.do',
+			method : 'POST'
+		}),
 		reader : view_rd
 	});
+	view_recyclingapplicationStore.on("beforeload", function(thiz, options) {
+		thiz.baseParams["orgUnitCoding"] = checkedOrgUnitCoding;
+//		view_recyclingapplicationStore.baseParams['invoicePlanId'] = selectedInvoicePlanId;
+		view_recyclingapplicationStore.baseParams['applyDate'] = selectedApplyDate;
+		view_recyclingapplicationStore.baseParams['tousseType'] = encodeURI(selectedTousseType);
+		view_recyclingapplicationStore.baseParams['disposableGoodsType'] = encodeURI(selectedDisposableGoodsType);
+	});
 	
 	
 	var	view_recyclingapplicationCm = new Ext.grid.ColumnModel([