Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.js
===================================================================
diff -u -r31974 -r35809
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.js	(.../washDataChartOfXinHuaOfZJJSRM.js)	(revision 31974)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washDataChart/washDataChartOfXinHuaOfZJJSRM.js	(.../washDataChartOfXinHuaOfZJJSRM.js)	(revision 35809)
@@ -17,6 +17,9 @@
         success: function (response) {
             if (response.success) {
                 var data = response.data;
+                if(!data){
+                    return;
+                }
                 renderWashData(data);
                 var lineChartInfo = data.washDataItemLineChart;
                 if(data['deviceModel'] == '负压清洗机（PC-L）'){
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js
===================================================================
diff -u -r33648 -r35809
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 33648)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.js	(.../interfereWashAndDisinfectRecordView.js)	(revision 35809)
@@ -301,6 +301,33 @@
 		id: 'washSaveConfirm',
 		xtype: 'hidden',
 		value: "0"
+	}, {
+		text: '清洗日期:'
+	}, {
+		xtype: 'combo',
+		id: 'applyDate',
+		name: 'applyDate',
+		valueField: 'value',
+		displayField: 'key',
+		allowBlank: true,
+		editable: false,
+		width: 120,
+		emptyText: '请选择清洗消毒日期',
+		mode: 'local',
+		store: new Ext.data.SimpleStore({
+			data: applyDateDataArray,
+			fields: ['key', 'value']
+		}),
+		forceSelection: true,
+		triggerAction: 'all',
+		listeners: {
+			select: function (combo, record, index) {
+				var value = combo.value;
+				$Id('parm_s_queryCurDay').value = value;
+				grid.dwrReload();
+			}
+		},
+		anchor: '95%'
 	}];
 	var dwrCallParams = null;
 	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () {
@@ -342,4 +369,8 @@
 			items: grid
 		}]
 	});
+
+	if (sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday) {
+		Ext.getCmp('applyDate').setValue('today')
+	}
 });
Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp
===================================================================
diff -u -r35231 -r35809
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 35231)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interfereWashAndDisinfectRecordView.jsp	(.../interfereWashAndDisinfectRecordView.jsp)	(revision 35809)
@@ -88,6 +88,7 @@
 </table>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_barcodeSearch" name="parm_s_barcodeSearch">
+	<input type="hidden" id="parm_s_queryCurDay" name="parm_s_queryCurDay">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r34308 -r35809
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 34308)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 35809)
@@ -323,10 +323,7 @@
 		url: WWWROOT
 			+ '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArr.do'
 	});
-	// 清洗列表默认是否显示当天的
-	if (sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday) {
-		$Id('parm_s_queryCurDay').value = "today";
-	}
+
 	washingMachineStore.load();
 
 	var filters = new Ext.grid.GridFilters({
@@ -502,6 +499,10 @@
 		data: [[washMachine], [washManual]]
 	});
 
+	// 清洗列表默认是否显示当天的
+	if (sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday) {
+		$Id('parm_s_queryCurDay').value = "today";
+	}
 
 	grid = new Ext.ux.ForgonPageGrid({
 		title: '清洗消毒记录',
@@ -665,6 +666,10 @@
 		setTimeOut(seconds * 1000);
 	}
 
+	if (sstsConfig.hasOwnProperty('washAndDisinfectRecordListDefaultToday') && sstsConfig.washAndDisinfectRecordListDefaultToday) {
+		Ext.getCmp('applyDate').setValue('today')
+	}
+
 	//SZYK-34:针对设备运行结束后提醒功能的改进
 	showPromptUploadDeviceParameterPicture('washAndDisinfect');
 });
\ No newline at end of file