Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp
===================================================================
diff -u -r29513 -r31146
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp	(.../foreignTousseApplicationReport.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp	(.../foreignTousseApplicationReport.jsp)	(revision 31146)
@@ -38,6 +38,7 @@
 <!-- 日期控件引入 -->
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>
 <script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 
 <script type="text/javascript">
 
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js
===================================================================
diff -u -r30854 -r31146
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 30854)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/foreignTousseApplicationReport.js	(.../foreignTousseApplicationReport.js)	(revision 31146)
@@ -11,8 +11,14 @@
 	}
 }
 var myMask;
+var enableShowForeignTousseApplicationReportMaterials;
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	if(sstsConfig.hasOwnProperty('enableShowForeignTousseApplicationReportMaterials') && sstsConfig.enableShowForeignTousseApplicationReportMaterials){
+		enableShowForeignTousseApplicationReportMaterials = true;
+	}else{
+		enableShowForeignTousseApplicationReportMaterials = false;
+	}
 	function reloadReport(){
 		var startTime= $Id('startTime').value;
 		var endTime = $Id('endTime').value;
@@ -28,15 +34,33 @@
 		if(noDisplayTerminatedIPValue == '是'){
 			noDisplayTerminatedIP = false;
 		}
+		var showNoInvoieValue = $Id('showNoInvoie').value;
+		var showNoInvoie = true;
+		if(showNoInvoieValue == '否'){
+			showNoInvoie = false;
+		}
+		var materialId;
+		if(enableShowForeignTousseApplicationReportMaterials){
+			materialId = Ext.getCmp('materialSearch').getValue();//材料id
+			if(!Ext.getCmp('materialSearch').getRawValue() || Ext.getCmp('materialSearch').getRawValue() == ""){//避免清空后还有id的情况
+				materialId = "";
+			}
+		}
+		var foreignTousseName = Ext.getCmp('foreignTousseName').getRawValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
 		});
 		myMask.show();
-
+		var jasperreportName;
+		if(enableShowForeignTousseApplicationReportMaterials){
+			jasperreportName = 'foreignTousseApplicationShowMaterialsReport.jasper';
+		}else{
+			jasperreportName = 'foreignTousseApplicationReport.jasper';
+		}
 		var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 		var params = {
-			jasperreportName : 'foreignTousseApplicationReport.jasper',
+			jasperreportName : jasperreportName,
 			startDay : startTime,
 			endDay : endTime,
 			deptName : deptName,
@@ -46,6 +70,9 @@
 			departOfPatient : departOfPatient,
 			companyName : companyName,
 			noDisplayTerminatedIP : noDisplayTerminatedIP,
+			materialId:materialId,
+			showNoInvoie:showNoInvoie,
+			foreignTousseName:foreignTousseName,
 			reportName:'foreignTousseApplicationReport'
 		}
 
@@ -56,7 +83,19 @@
 	var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01";
 	var endDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/" + dt.getDate() + " 23:59";
 	
-	
+	//外来器械包的store
+	var foreignTousseJsonStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!queryForeignOrSplitTousseName.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+		    {name : 'name',mapping : 'name'}
+		  ]
+		)
+	});
 	var departJsonStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do',
@@ -83,6 +122,25 @@
 		  ]
 		)
 	});
+	//材料名称store
+	var materialStore;
+	if(enableShowForeignTousseApplicationReportMaterials){
+		materialStore = new Ext.data.Store({
+			proxy: new Ext.data.HttpProxy({
+				url: WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!getForeignMaterialDefinitionData.do',
+				method: 'POST'
+			}),
+			reader : new Ext.data.JsonReader({
+				totalProperty : 'totalCount',
+				root : 'data'
+			}, [
+			    {name : 'id',mapping : 'materialDefinitionId'},
+			    {name : 'name',mapping : 'name'},
+			    {name : 'showName',mapping : 'showName'},
+			    {name : 'isImplant',mapping : 'isImplant'}
+			])
+		});
+	}
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
@@ -111,7 +169,7 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-		height : 140,
+		height : 180,
 		items : [{
 			layout : 'column',
 			height : 40,
@@ -296,7 +354,7 @@
 					anchor : '100%'
 				}]
 			},{
-				columnWidth : .25,
+				columnWidth : .18,
 				layout : 'form',
 				labelWidth : 120,
 				items : [{
@@ -315,9 +373,86 @@
 					editable : false,
 					mode : 'local',
 					triggerAction : 'all',
-					anchor : '95%'
+					anchor : '85%'
 				}]
+			},{
+				columnWidth : .18,
+				layout : 'form',
+				labelWidth : 120,
+				items : [{
+					xtype : 'combo',
+					fieldLabel : '显示未发货物品',
+					id : 'showNoInvoie',
+					name : 'showNoInvoie',
+					valueField : 'value',
+					displayField : 'value',
+					store : new Ext.data.SimpleStore( {
+						fields : ['value'],
+						data : [ ['是'],['否'] ]
+					}),
+					forceSelection : true,
+					value:'是',
+					editable : false,
+					mode : 'local',
+					triggerAction : 'all',
+					anchor : '85%'
+				}]
 			}]
+		},{
+			layout : 'column',
+			height : 40,
+			labelWidth : 120,
+			items : [{
+				columnWidth : .20,
+				layout : 'form',
+				labelWidth : 60,
+				items : [{
+					xtype : 'combo',
+					fieldLabel : '物品名称',
+					id : 'foreignTousseName',
+					name : 'foreignTousseName',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'name',
+					displayField : 'name',
+					width : 240,
+					listConfig: {width : 270},
+					matchFieldWidth: false,
+					store : foreignTousseJsonStore,
+					pageSize : 12,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : false,
+					typeAhead : false,
+					allowBlank : true,
+					queryDelay : 0,
+					forceSelection : false
+				}]
+			},{
+				columnWidth: .2,
+				layout: 'form',
+				labelWidth : 60,
+				hidden:!enableShowForeignTousseApplicationReportMaterials,
+				items: [{
+					xtype: 'combo',
+					id: 'materialSearch',
+					name: 'materialSearch',
+					queryParam: 'spell',
+					fieldLabel: '材料名称',
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					anchor: '95%',
+					store: materialStore,
+					lazyInit: false,
+					listWidth: 380,
+					triggerAction: 'all',
+					forceSelection: true,
+					hideTrigger: false,
+					typeAhead: false,
+					allowBlank: true
+				}]
+			}]
 		}],
 		buttons:[{
 			xtype : 'button',