Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java
===================================================================
diff -u -r17114 -r17768
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 17114)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/dwr/table/SterilizationRecordTableManager.java	(.../SterilizationRecordTableManager.java)	(revision 17768)
@@ -42,6 +42,7 @@
 import com.forgon.tools.StrutsParamUtils;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
+import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.ForgonDateUtils;
 
 /**
@@ -150,12 +151,6 @@
 			Map<String, List<String>> parameterMap) {
 		Map<String, String> sqlWhereParamMap = gridManager
 				.getParamFromView(parameterMap);
-		/*
-		 * String sterilizerNameSearch = sqlWhereParamMap
-		 * .get("sterilizerNameSearch"); String dateSearch =
-		 * sqlWhereParamMap.get("dateSearch"); String sterilizationUserSearch =
-		 * sqlWhereParamMap .get("sterilizationUserSearch");
-		 */
 		String sql = "where 1=1 ";
 		if (StringUtils.isNotBlank(sqlWhereParamMap.get("queryType"))) {// 当天灭菌记录也包括历史灭菌中记录
 			Date out_beginTime = new Date();
@@ -164,12 +159,19 @@
 			
 			String needFinishConfirm = sqlWhereParamMap.get("needFinishConfirm");
 			String comfirmSql = "";
-			if(StringUtils.isNotBlank(needFinishConfirm)){
-//				comfirmSql = " or (po.isSituationComfirm = 0 or po.isSituationComfirm is null)";
-				
+			if(StringUtils.isNotBlank(needFinishConfirm)){  //针对“完成灭菌后需要确认”的医院，则需要显示出已经完成灭菌但是还未确认的灭菌记录
 				comfirmSql = " or ((po.isSituationComfirm = 0 or po.isSituationComfirm is null) and po.status = '"
 						+ SterilizationRecord.STERILIZATION_STATUS_END + "')";
 			}
+			
+			String requestTimeQuantum = sqlWhereParamMap.get("requestTimeQuantum");
+			if (StringTools.isNotBlank(requestTimeQuantum)) {
+				String[]  timeArr = requestTimeQuantum.split(";");
+				if (timeArr.length == 2) {
+					out_beginTime = ForgonDateUtils.safelyParseDate(timeArr[0]);
+					out_endTime = ForgonDateUtils.safelyParseDate(timeArr[1]);
+				}
+			}
 			sql += " and ((po.startDate between "
 					+ dateQueryAdapter.dateAdapter(out_beginTime) + " and "
 					+ dateQueryAdapter.dateAdapter(out_endTime)
@@ -179,15 +181,6 @@
 					+ ")";
 		}
 
-		/*
-		 * if (StringUtils.isNotBlank(sterilizerNameSearch)) { sql = sql +
-		 * " and po.sterilizer.name = '" + sterilizerNameSearch + "'"; } if
-		 * (StringUtils.isNotBlank(dateSearch)) { sql = sql +
-		 * " and po.startDate between '" + dateSearch + " 00:00:00' and '" +
-		 * dateSearch + " 23:59:59'"; } if
-		 * (StringUtils.isNotBlank(sterilizationUserSearch)) { sql = sql +
-		 * " and po.sterilizationUser = '" + sterilizationUserSearch + "'"; }
-		 */
 		sql += " and po.orgUnitCoding = '"
 				+ AcegiHelper.getLoginUser()
 						.getOrgUnitCodingFromSupplyRoomConfig() + "'";
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp
===================================================================
diff -u -r16715 -r17768
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 16715)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.jsp	(.../sterilizationRecordView.jsp)	(revision 17768)
@@ -48,7 +48,8 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/ContainerTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/UserTableManager.js"></script>
-
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
+<script type="text/javascript" src="${ctx}/js/dateHelper.js"></script>
 <style type="text/css">
 	.x-fieldset2{border:12px solid #B5B8C8;padding:10px;margin-bottom:10px;display:block;border-bottom-color:Red; border-left-color:Green; border-right-color:Blue; border-top-color:Purple; text-decoration:underline;}
 </style>
@@ -113,6 +114,7 @@
 	<input type="hidden" id="" name="parm_s_ownGroup" value="${param.ownGroup }"></input>
 	<input type="hidden" id="parm_s_type" name="parm_s_type" value="质量监测">
 	<input type="hidden" id="parm_s_needFinishConfirm" name="parm_s_needFinishConfirm" value="">
+	<input type="hidden" id="parm_s_requestTimeQuantum" name="parm_s_requestTimeQuantum" value="">
 </form>
 
 <table height="100%;" width="100%" border="0" align="center"
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js
===================================================================
diff -u -r17196 -r17768
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 17196)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordView.js	(.../sterilizationRecordView.js)	(revision 17768)
@@ -628,6 +628,24 @@
 		return v;
 	}
 }
+/**
+ *  请求服务器，生成时间筛选对应的值
+ * @returns {[*,*,*,*,*]}
+ */
+function getTimeComboData() {
+    var dateHelper = new DateHelper();
+    var applyDateDataArray = [];
+    var format = 'yyyy-MM-dd HH:mm';
+    var url = WWWROOT + '/system/serverTimeAction!getInvoicePlanComboTime.do';
+    dateHelper.getServerTimeByJQ(format, Ext, url, function (result) {
+        var time = result.time;
+        applyDateDataArray.push(['今天', time.todayTime]);
+        applyDateDataArray.push(['昨天', time.yesterdayTodayTime]);
+        applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
+        applyDateDataArray.push(['近一周', time.thisWeekTodayTime]);
+    });
+    return applyDateDataArray;
+}
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
@@ -826,6 +844,85 @@
 		$Id("parm_s_needFinishConfirm").value = "true";
 	}
 	
+	var requestTbar = new Ext.Toolbar({  
+	    height : 25,
+		items:[{
+			text : '灭菌日期:'
+		},{
+			xtype : 'combo',
+			id : 'requestTimeQuantum',
+			name : 'requestTimeQuantum',
+			valueField : 'value',
+			displayField : 'key',
+			allowBlank : true,
+			editable : false,
+			width : 120,
+			mode:'local',
+			store : new Ext.data.SimpleStore({
+				data: getTimeComboData(),
+				fields:['key','value']
+			}),
+			forceSelection : true,
+			triggerAction : 'all',
+			listeners : {
+				select : function(combo, record, index){
+					$Id("parm_s_requestTimeQuantum").value = combo.getValue();
+					grid.getStore().lastOptions.params['start'] = 0;
+					grid.dwrReload();
+				}
+			},
+			anchor : '95%'
+		},'-',{
+			text : '开始时间:'
+		},{
+			xtype : 'datefieldWithMin',
+			id : 'requestStartTime',
+			name : 'requestStartTime',
+			width : 130,
+			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			selectOnFocus :true,
+			format : 'Y-m-d H:i',
+			theHours : 0,
+			theMinutes : 0
+		},'-',{
+			text : '结束时间:'
+		},{
+			xtype : 'datefieldWithMin',
+			width : 130,
+			id : 'requestEndTime',
+			name : 'requestEndTime',
+			altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+			selectOnFocus :true,
+			format : 'Y-m-d H:i',
+			theHours : 23,
+			theMinutes : 59,
+			listeners : {
+				render : function(_this) {
+					var requestTimeQuantumCombo = Ext.getCmp('requestTimeQuantum');
+					var value = requestTimeQuantumCombo.store.data.items[0].data.value;
+					requestTimeQuantumCombo.setValue(value);
+					var timeArr = value.split(";");
+					Ext.getCmp('requestStartTime').setValue(timeArr[0]);
+					Ext.getCmp('requestEndTime').setValue(timeArr[1]);
+				}
+			}
+		},'-',{
+		 	text : '查询',
+			minWidth : 50,
+			iconCls : 'icon_search',
+			handler : function() {
+				var requestStartTime = Ext.getCmp('requestStartTime');
+				var requestEndTime = Ext.getCmp('requestEndTime');
+				if (requestStartTime.isValid() && requestEndTime.isValid()) {
+					$Id("parm_s_requestTimeQuantum").value = Ext.util.Format.date(requestStartTime.getValue(), 'Y-m-d H:i') + ';' +Ext.util.Format.date(requestEndTime.getValue(), 'Y-m-d H:i');
+					grid.getStore().lastOptions.params['start'] = 0;
+					grid.dwrReload();
+				} else {
+					showResult("请填写正确的时间格式！");
+				}
+			}
+		}]  
+	});
 	grid = new Ext.ux.ForgonPageGrid({
 		title : '灭菌列表',
 		tbar : tbar,
@@ -840,7 +937,14 @@
 		searchDisableIndexes : [ 'sterilizerRecordAmount' ],
 		autoExpandColumn : 'action',
 		renderTo : 'gridDiv',
-		frame : false
+		frame : false,
+		listeners : {
+			render : function(thisGrid) {
+				if (isQueryToday) {
+					requestTbar.render(thisGrid.tbar);
+				}
+			}
+		}
 	}, readerDetail,
 		SterilizationRecordTableManager.findSterilizationRecordTableList,
 		dwrCallParams // 这个参数只是占位作用