Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js
===================================================================
diff -u -r30854 -r34966
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js	(.../urgentNeedGoodsProcessingCycleView.js)	(revision 30854)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.js	(.../urgentNeedGoodsProcessingCycleView.js)	(revision 34966)
@@ -16,6 +16,13 @@
 		showResult("请选择供应室。");
 		return false;
 	}
+	var tousseTypes = Ext.getCmp('tousseTypes').getValue();
+	if(tousseTypes !== ''){
+		var arr = tousseTypes.split(',');
+		if(arr[0] == 'all'){
+			tousseTypes = '';
+		}
+	}
 	var startTime = $Id('startTime').value;
 	var endTime = $Id('endTime').value;
 	var tousseId = Ext.getCmp('tousse').getValue();
@@ -26,14 +33,14 @@
 		removeMask: true
 	});
 	myMask.show();
-
 	var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do';
 	var params = {
 		jasperreportName : 'urgentNeedGoodsProcessingCycle.jasper',
 		startTime : startTime,
 		endTime : endTime,
 		tousseName : tousseName,
 		departCoding : departCoding,
+		tousseTypes : tousseTypes,
 		reportName:'urgentNeedGoodsProcessingCycle'
 	}
 
@@ -132,7 +139,7 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-		height : 105,
+		height : 120,
 		items : [{
 			layout : 'column',
 			height : 40,
@@ -166,6 +173,7 @@
 			},{
 				width : 280,
 				layout : 'form',
+				labelWidth : 100,
 				labelSeparator : '选择器械包:',
 				items : [{
 					xtype : 'combo',
@@ -183,7 +191,7 @@
 			},{
 				width : 250,
 				layout : 'form',
-				labelWidth : 80,
+				labelWidth : 100,
 				labelSeparator : '选择供应室:',
 				items : [{
 					xtype : 'multiSelect',
@@ -230,9 +238,61 @@
 							combo.setValue(combo.getCheckedValue());
 						}
 					}
-				
-		
 				}]
+			},{
+				width : 400,
+				layout : 'form',
+				labelWidth : 100,
+				labelSeparator : '器械包类型:',
+				items : [{
+					xtype : 'multiSelect',
+					id : 'tousseTypes',
+					name : 'tousseTypes',
+					valueField : 'value',
+					displayField : 'text',
+					minChars : 0,
+					allowBlank : true,
+					editable : false,
+					store: new Ext.data.SimpleStore({
+						fields: ['text','value'],
+						data: tousseTypeDataArray
+					}),
+					forceSelection : false,
+					mode : 'local',
+					triggerAction : 'all',
+					lazyInit : true,
+					typeAhead : false,
+					anchor : '95%',
+					listeners: {
+						select: function (combo, record, index) {
+							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+							if (record.get('departCode') == ALL) {
+								if (record.get('checked')) {
+									combo.selectAll();
+								} else {
+									combo.deselectAll();
+								}
+							}
+							
+							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+							var selectAll = true;
+							combo.store.each(function(record) {
+								if (record.get('departCode') != ALL && !record.get(this.checkField)) {
+									selectAll = false;
+									return;
+								}
+							}, combo);
+							
+							var all = combo.store.getAt(0);
+							if (selectAll) {
+								all.set(combo.checkField, true);
+							} else {
+								all.set(combo.checkField, false);
+							}
+							combo.setValue(combo.getCheckedValue());
+						}
+					}
+				}]
 			}]
 		}],
 		buttons:[{
@@ -249,8 +309,10 @@
 			minWidth : 70,
 			iconCls : 'icon_set',
 			handler : function() {
-				$Id('startTime').value = "";
-				$Id('endTime').value = "";
+				Ext.getCmp('startTime').setValue(new Date(startDayofMonth))
+				Ext.getCmp('endTime').setValue(dt);
+				Ext.getCmp('tousse').setValue('');
+				Ext.getCmp('tousseTypes').setValue('');
 			}
 		}]
 	});
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp
===================================================================
diff -u -r29513 -r34966
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp	(.../urgentNeedGoodsProcessingCycleView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/urgentNeedGoodsProcessingCycleView.jsp	(.../urgentNeedGoodsProcessingCycleView.jsp)	(revision 34966)
@@ -1,5 +1,6 @@
 <%@page contentType="text/html; charset=UTF-8"%>
 <%@include file="/common/taglibs.jsp"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
 <%@include file="/common/includeExtJsAndCss.jsp"%>
 
 <html>
@@ -27,6 +28,16 @@
 <link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript">
 	var ALL = '全部';
+	var tousseTypeDataArray = [
+        ['全部','all'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>','<%=TousseDefinition.PACKAGE_TYPE_INSIDE %>'],
+		['<%=TousseDefinition.PACKAGE_TYPE_DRESSING %>','<%=TousseDefinition.PACKAGE_TYPE_DRESSING %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>','<%=TousseDefinition.PACKAGE_TYPE_DISINFECTION %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_FOREIGN %>','<%=TousseDefinition.PACKAGE_TYPE_FOREIGN %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_SPLIT %>','<%=TousseDefinition.PACKAGE_TYPE_SPLIT %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_CUSTOM %>','<%=TousseDefinition.PACKAGE_TYPE_CUSTOM %>'],
+        ['<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY %>','<%=TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY %>']
+    ];
 	//当前用户所在的当前科室
 	var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
 	//查看所有供应室报表的权限