Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js
===================================================================
diff -u -r15523 -r28127
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js	(.../problemReportForm.js)	(revision 15523)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js	(.../problemReportForm.js)	(revision 28127)
@@ -3,12 +3,35 @@
 function cancel() {
 	problemWin.close();
 }
+var httpOptionTextAndValueStore= new Ext.data.Store({
+	proxy : new Ext.data.HttpProxy({
+		url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionTextAndValueById.do?optionId=question_feedback',
+		method : 'POST'
+	}),
+	reader : new Ext.data.JsonReader({
+	}, [
+	  {name : 'id',mapping : 'id'},
+	  {name : 'name',mapping : 'name'}
+	])
+});
+//时间戳转日期
+function timestampToTime(timestamp) {
+	var date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
+	Y = date.getFullYear();
+	M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1);
+	D = (date.getDate()<10)?'0'+(date.getDate()):date.getDate();
+	h = (date.getHours()<10)?'0'+(date.getHours()):date.getHours();
+	m = (date.getMinutes()<10)?'0'+(date.getMinutes()):date.getMinutes();
+	s = (date.getSeconds()<10)?'0'+(date.getSeconds()):date.getSeconds();
+	return Y + '-' + M + '-' + D +' '+ h + ':' + m;
+}
 /**
  * 增加问题
  */
 function addProblemReport(){
 	showWindow();
 	top.Ext.getCmp('answerArea').disable();
+	top.Ext.getCmp('answerAreaButton').disable();
 }
 function showWindow(){
 	formPanel = new top.Ext.FormPanel({
@@ -32,14 +55,15 @@
 				id : 'id'
 			},{
 				xtype : 'hidden',
+				name : 'actionType',
+				id : 'actionType',
+				value:'new'
+			},{
+				xtype : 'hidden',
 				name : 'orgUnitCoding',
 				id : 'orgUnitCoding',
 				value : $Id('orgUnitCoding').value
 			},{
-				xtype : 'hidden',
-				name : 'actionType',
-				id : 'actionType'
-			},{
 				layout : 'form',
 				columnWidth : .5,
 				labelWidth : 90,
@@ -51,6 +75,23 @@
 					anchor : '95%',
 					allowBlank : false
 				}]
+			},{
+				layout : 'form',
+				columnWidth : .5,
+				labelWidth : 90,
+				items : [{
+					xtype : 'combo',
+					id : 'type',
+					name : 'type',
+					valueField : 'name',
+                    displayField : 'name',
+					anchor : '100%',
+					fieldLabel :  '问题类型',
+					triggerAction : 'all',
+					forceSelection : true,
+					allowBlank : false,
+					store : httpOptionTextAndValueStore
+				}]
 			}, {
 				layout : 'form',
 				columnWidth : .5,
@@ -81,10 +122,6 @@
 					name : 'answer_Time',
 					id : 'answer_Time',
 					value : $Id('today').value
-				},{
-					xtype : 'hidden',
-					name : 'status',
-					id : 'status'
 				}]
 			}, {
 				layout : 'form',
@@ -116,6 +153,18 @@
 				}]
 			},{
 				layout : 'form',
+				columnWidth : .5,
+				labelWidth : 90,
+				items : [{
+					xtype : 'textfield',
+					id : 'status',
+					name : 'status',
+					fieldLabel :  '状态',
+					readOnly : true,
+					cls:'fieldReadOnlyNoRemove'
+				}]
+			},{
+				layout : 'form',
 				columnWidth : 1,
 				labelWidth : 90,
 				items : [ {
@@ -137,9 +186,11 @@
 					name : 'remark',
 					id : 'remark',
 					width : 150,
-					height : 50,
-					fieldLabel : "备注",
-					anchor : '97%'
+					height : 100,
+					fieldLabel : "沟通记录",
+					anchor : '97%',
+					readOnly : true,
+					cls:'fieldReadOnlyNoRemove'
 				}]
 			},{
 				layout : 'form',
@@ -148,13 +199,50 @@
 				id : "answerArea",
 				items : [ {
 					xtype : 'textarea',
-					name : 'answer',
-					id : 'answer',
+					name : 'answerValue',
+					id : 'answerValue',
 					width : 150,
 					height : 50,
 					fieldLabel : "回复",
 					anchor : '97%'
 				}]
+			},{
+				layout : 'form',
+				columnWidth : 1,
+				labelWidth : 90,
+				id : "answerAreaButton",
+				items : [
+					new top.Ext.Button({
+						text:'回复',
+						style:'margin: 15px 0px 10px 95px;',
+						handler: function(){
+							var answerValue = top.Ext.getCmp('answerValue').getValue() || '';
+							var id = top.Ext.getCmp('id').getValue();
+							if(answerValue == ''){
+								showResult('回复内容不能为空');
+								return;
+							}
+
+							top.Ext.Ajax.request({
+								url : WWWROOT + '/disinfectSystem/problemAction!replyProblem.do',
+								params : {
+									'id':id,
+									'content':answerValue
+								},
+								success : function(response,options){
+									var result = Ext.decode(response.responseText);
+									var status = top.Ext.getCmp('status').getValue();
+									if(result.success){
+										showResult(result.msg);
+										loadAndEditProblemData(id,status,"update",true)
+									}else {
+										showResult(result.msg);
+									}
+								}
+							})
+						}
+			  		})
+				]
 			}]
 		}],
 		buttons : [{
@@ -163,6 +251,14 @@
 			handler : function(){
 				saveProblem(this);
 			}
+		},{
+			id : 'solveBtn',
+			text : '已解决',
+			hidden:true,
+			handler : function(){
+				top.Ext.getCmp('actionType').setValue('answered');
+				saveProblem(this);
+			}
 		}, {
 			text : '取消',
 			id : 'saveAndNewBtn',
@@ -185,10 +281,11 @@
 /***
  * 加载数据
  */
-function loadAndEditProblemData(id,status,action){
-	
+function loadAndEditProblemData(id,status,action,isReload){
 	//显示窗体
-	showWindow();
+	if(!isReload){
+		showWindow();
+	}
 	
 	if(!Ext.isEmpty(id)){
 		Ext.Ajax.request({
@@ -208,12 +305,25 @@
 					top.Ext.getCmp('registerPerson').setValue(result.data.registerPerson);
 					top.Ext.getCmp('orgUnitCoding').setValue(result.data.orgUnitCoding);
 					top.Ext.getCmp('description').setValue(result.data.description);
-					top.Ext.getCmp('remark').setValue(result.data.remark);
-					top.Ext.getCmp('status').setValue(result.data.status);
-					top.Ext.getCmp('answer').setValue(result.data.answer);
+					
 					top.Ext.getCmp('actionType').setValue(action);
-					if(status == "已回复" && action !="answer"){
-//						showResult("已回复的问题不能修改");
+					top.Ext.getCmp('status').setValue(result.data.status);
+					var answers = result.data.answers;
+					var contents = '';
+					for(var i=0;i<answers.length;i++){
+						var orgUnitName = answers[i].orgUnitName || '';
+						var userName = answers[i].userName || '';
+						var replyTime = timestampToTime(answers[i].replyTime.time);
+						var content = answers[i].content || '';
+						contents += orgUnitName + ' ' + userName + ' ' + replyTime + '\n' + '    ' + content + '\n';
+					}
+					top.Ext.getCmp('remark').setValue(contents);
+					top.Ext.getCmp('answerValue').setValue(result.data.answer);
+					top.Ext.getCmp('type').setValue(result.data.type || '');
+					
+					top.Ext.getCmp('solveBtn').show();
+
+					if(status == "已完成"){
 						top.Ext.getCmp('title').addClass('fieldReadOnlyNoRemove');
 						top.Ext.getCmp('title').el.dom.readOnly = true;
 						top.Ext.getCmp('orgUnitName').el.dom.readOnly = true;
@@ -225,14 +335,14 @@
 						top.Ext.getCmp('remark').el.dom.readOnly = true;
 						top.Ext.getCmp('reportTime').addClass('fieldReadOnlyNoRemove');
 						top.Ext.getCmp('reportTime').el.dom.readOnly = true;
-                        //top.Ext.getCmp('answerArea').disable();
-                        top.Ext.getCmp('saveBtn').disable();
-					}else if(status=='待回复' && action=='update'){
-						if(SSTS_ProblemReport_Answer){
-							top.Ext.getCmp('answerArea').disable();
-						}
-					}else{//未回复
-					    top.Ext.getCmp('title').addClass('fieldReadOnlyNoRemove');
+						top.Ext.getCmp('status').disable();
+						top.Ext.getCmp('answerValue').disable();
+                        top.Ext.getCmp('answerAreaButton').disable();
+						top.Ext.getCmp('saveBtn').disable();
+						top.Ext.getCmp('solveBtn').disable();
+						top.Ext.getCmp('type').disable();
+					}else{
+						top.Ext.getCmp('title').addClass('fieldReadOnlyNoRemove');
 						top.Ext.getCmp('title').el.dom.readOnly = true;
 						top.Ext.getCmp('orgUnitName').el.dom.readOnly = true;
 						top.Ext.getCmp('registerPerson').addClass('fieldReadOnlyNoRemove');
@@ -243,12 +353,15 @@
 						top.Ext.getCmp('remark').el.dom.readOnly = true;
 						top.Ext.getCmp('reportTime').addClass('fieldReadOnlyNoRemove');
 						top.Ext.getCmp('reportTime').el.dom.readOnly = true;
+						top.Ext.getCmp('type').disable();
 						if(!SSTS_ProblemReport_Answer){
-						   top.Ext.getCmp('answerArea').enable();
-                           top.Ext.getCmp('saveBtn').enable();
+							top.Ext.getCmp('answerValue').enable();
+							top.Ext.getCmp('saveBtn').enable();
+							top.Ext.getCmp('answerAreaButton').enable();
 						}else{
-						   top.Ext.getCmp('answerArea').disable();
-                           top.Ext.getCmp('saveBtn').disable();
+							top.Ext.getCmp('answerValue').disable();
+							top.Ext.getCmp('saveBtn').disable();
+							top.Ext.getCmp('answerAreaButton').disable();
 						}
 					}
 				}else{
@@ -273,7 +386,7 @@
 		showResult("请选择要删除的行");
 	}else{
 		for ( var i = 0, len = selectedRecords.length; i < len; i++) {
-			if(selectedRecords[i].data['status'] == "已回复"){
+			if(selectedRecords[i].data['status'] == "已完成" || selectedRecords[i].data['status'] == "回复中"){
 				showResult("已回复的记录不能删除！");
 				return;
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp
===================================================================
diff -u -r12331 -r28127
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp	(.../problemReport.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp	(.../problemReport.jsp)	(revision 28127)
@@ -1,4 +1,7 @@
 <%@page import="java.util.Date"%>
+<%@page import="com.forgon.systemsetting.model.HttpOption"%>
+<%@page import="com.forgon.systemsetting.service.HttpOptionManager"%>
+<%@page import="java.util.List"%>
 <%@page import="java.text.SimpleDateFormat"%>
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
@@ -10,6 +13,12 @@
     request.setAttribute("today", dateFormat.format(new Date()));
 %>
 
+<%
+    HttpOptionManager httpOptionManager = (HttpOptionManager)SpringBeanManger.getBean("httpOptionManager");
+    List<String> causeList = httpOptionManager.getHttpOptionTextById(HttpOption.SYSTEMSETTING_QUESTION_FEEDBACK);
+    request.setAttribute("causeList",causeList);
+%>
+
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -18,6 +27,16 @@
 <body>
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <script type="text/javascript">
+    var fontSize = '${fontSize}';
+    var causeList = '${causeList}';
+    var list = [];
+    if(causeList.length > 2){
+        causeList = causeList.substr(1,(causeList.length-2)).replace(/\s/g,"");
+        causeList = causeList.split(',');
+        for(var i=0;i<causeList.length;i++){
+            list[i] = [causeList[i]]
+        }
+    }
 </script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js"></script>
@@ -28,6 +47,11 @@
 <script type="text/javascript" src="${ctx}/ext/ext_datefield/Datetime.js"></script>
 <script type="text/javascript" src="problemReportView.js"></script>
 <script type="text/javascript" src="problemReportForm.js"></script>
+
+<!-- 日期控件引入 -->
+<link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css"></link>
+<script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js"></script>
+
 <script type="text/javascript">
 var SSTS_ProblemReport_Delete = true;
 <operation:authorize ifAnyGranted="SSTS_ProblemReport_Delete">
@@ -49,6 +73,11 @@
 SSTS_ProblemReport_Answer = false;
 </operation:authorize>
 
+var SSTS_ProblemReport_Export = true;
+<operation:authorize ifAnyGranted="SSTS_ProblemReport_Export">
+SSTS_ProblemReport_Export = false;
+</operation:authorize>
+
 var enableEditBtn = false;
 var enableSaveBtn = false;
 var enableSaveAndNewBtn = false;
@@ -66,7 +95,6 @@
 <input type="hidden" id="orgUnitCoding" value="${orgUnitCoding}">
 <input type="hidden" id="today" value="${today}">
 
-
 <table height="100%;" width="100%" border="0" align="center"
     cellpadding="0" cellspacing="0">
     <tr height="100%;">
@@ -76,7 +104,11 @@
     </tr>
 </table>
  <form name="parametersFrm">
-    <input type="hidden" id="parm_s_type" name="parm_s_type" value="问题报告">
+    <input type="hidden" id="parm_s_type" name="parm_s_type">
+    <input type="hidden" id="parm_s_orgUnitCode" name="parm_s_orgUnitCode">
+    <input type="hidden" id="parm_s_status" name="parm_s_status">
+    <input type="hidden" id="parm_s_startTime" name="parm_s_startTime">
+    <input type="hidden" id="parm_s_endTime" name="parm_s_endTime">
 </form>
 
 </body>
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r28064 -r28127
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 28064)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 28127)
@@ -447,8 +447,8 @@
 		{hidden :SSTS_CustomTousse,text:"自定义器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_ForeignTousse_Manage,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_ForeignTousse_Manage,text:"停用的外来器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseMaintain_Manager,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -519,9 +519,17 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_MESSAGE_Menu,
 	children:[
-	          {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
-	          ]
+		{hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
+	]
 },{
+	text:"科室问题反馈",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_ProblemReport_Menu,
+	children:[
+		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈",href:WWWROOT+'/disinfectsystem/problemReport/problemReport.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
+	]
+},{
 	text:"系统告警",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_SystemWarning_Menu,
Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/exportProblemRecord.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/exportProblemRecord.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/exportProblemRecord.jsp	(revision 28127)
@@ -0,0 +1,20 @@
+<%@page import="com.forgon.disinfectsystem.problemreportmanager.problemreport.service.ProblemManager"%>
+<%@ page contentType="text/html; charset=UTF-8"%><%@ page
+    import="com.forgon.tools.*,org.apache.commons.lang.*,com.forgon.directory.service.*"%>
+<%
+String time = request.getParameter("time");
+if(StringUtils.isBlank(time)){
+	time = "";
+}
+String fileName="科室问题反馈" + time + ".xls";
+String ids = request.getParameter("ids");
+//String excelConfig = request.getParameter("excelConfig");
+ServletOutputStream servletOutputStream = response.getOutputStream();
+response.setContentType("application/octet-stream");
+response.addHeader("Content-Disposition","attachment;filename=" + new String(fileName.getBytes("GBK"), "ISO8859_1"));
+ProblemManager problemManager = (ProblemManager)SpringBeanManger.getBean("problemManager");
+System.out.println(problemManager);
+problemManager.exportProblemReocrds(response.getOutputStream(),ids);
+out.clear();
+out = pageContext.pushBody();
+%>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js
===================================================================
diff -u -r12331 -r28127
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js	(.../problemReportView.js)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js	(.../problemReportView.js)	(revision 28127)
@@ -1,4 +1,13 @@
 var grid;
+var labelWidth = 100;
+var datefieldWithMinWidth = ( fontSize == 12 ? 129 : 154);
+var newDate = new Date();
+var mouth = (newDate.getMonth()+1)>9?(newDate.getMonth()+1):'0'+(newDate.getMonth()+1);
+var day = newDate.getDate()>9?(newDate.getDate()):'0'+(newDate.getDate());
+var hour = newDate.getHours()>9?(newDate.getHours()):'0'+(newDate.getHours());
+var minutes = newDate.getMinutes()>9?(newDate.getMinutes()):'0'+(newDate.getMinutes());
+var startTime = newDate.getFullYear()+'-'+mouth+'-01 00:00';
+var endTime = newDate.getFullYear()+'-'+mouth+'-'+day+' '+hour+':'+minutes;
 /**
  * 修改记录
  * modifyRecord函数 触发modify函数调用，并传入当前列的值以及record.data对象
@@ -9,7 +18,7 @@
 		if(SSTS_ProblemReport_Answer){//如果没有这个权限
 			loadAndEditProblemData(data['id'],data['status'],"update");
 		}else{
-			loadAndEditProblemData(data['id'],data['status'],"answer");
+			loadAndEditProblemData(data['id'],data['status'],"new");
 		}
 	}else{
 		loadAndEditProblemData(data['id'],data['status'],"update");
@@ -18,48 +27,259 @@
 function renderStatus(v, p, record){
 	var status = record.data['status'];
 	var color = "white";//F5A7FA
-	if("待回复" == status){//待发货 黄色
+	if("待回复" == status || "回复中" == status){//待回复 黄色
 		color = "yellow";
 	}
 	return "<p style=\"background-color:"+color+"\">" + v + "</p>";
 }
 
+//初始化查询条件并加载数据
+function initQueryValueAndReload() {
+	$Id('parm_s_orgUnitCode').value = $Id('orgUnitCode').value;
+	$Id('parm_s_type').value = $Id('type').value;
+	$Id('parm_s_status').value = ($Id('status').value == '全部')?'':$Id('status').value;
+	$Id('parm_s_startTime').value = $Id('startTime').value;
+	$Id('parm_s_endTime').value = $Id('endTime').value;
+	grid.getStore().lastOptions.params['start'] = 0;
+	grid.dwrReload();
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
+	var httpOptionTextAndValueStore= new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionTextAndValueById.do?optionId=question_feedback',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+		}, [
+		  {name : 'id',mapping : 'id'},
+		  {name : 'name',mapping : 'name'}
+		])
+	});
+	var departmentComboBoxStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getApplicationDepartJson.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			root : 'data'
+		},[
+			{name : 'id',mapping : 'id'}, 
+			{name : 'departCode',mapping : 'departCode'}, 
+			{name : 'name',mapping : 'name'}
+		  ]
+		)
+	});
+	var row1Array = [{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign:"right",
+		items : {
+			fieldLabel : '开始日期',
+			name : 'startTime',
+			id : 'startTime',
+			width:100,
+			xtype : 'datefieldWithMin',
+			width : datefieldWithMinWidth,
+			readOnly  : true,
+			theHours : 0,
+			theMinutes : 0,
+			value:startTime,
+			format : 'Y-m-d H:i'
+		}
+	},{
+		xtype : 'hidden',
+		name : 'orgUnitCode',
+		id : 'orgUnitCode'
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign:"right",
+		items : {
+			fieldLabel : '结束日期',
+			name : 'endTime',
+			id : 'endTime',
+			xtype : 'datefieldWithMin',
+			width : datefieldWithMinWidth,
+			readOnly  : true,
+			theHours : 23,
+			theMinutes : 59,
+			value : new Date(),
+			format : 'Y-m-d H:i'
+		}
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign:"right",
+		items : {
+			xtype : 'combo',
+			fieldLabel : '科室',
+			id : 'departCode',
+			name : 'departCode',
+			valueField : 'departCode',
+			displayField : 'name',
+			store : departmentComboBoxStore,
+			triggerAction : 'all',
+			mode : 'remote',
+			forceSelection : true,
+			allowBlank : true,
+			editable : true,
+			queryParam : 'spell',
+			minChars : 0,
+			listWidth : 180,
+			hideTrigger : true,
+			anchor : '100%',
+			listeners : {
+				select : function(combo , record , index){
+					Ext.getCmp('orgUnitCode').setValue(record.data.departCode);
+				}
+			}
+		}
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign:"right",
+		items : {
+			xtype : 'combo',
+			id : 'type',
+			name : 'type',
+			valueField : 'id',
+			displayField : 'name',
+			anchor : '100%',
+			fieldLabel :  '问题类型',
+			readOnly : true,
+			triggerAction : 'all',
+			forceSelection : true,
+			store : httpOptionTextAndValueStore
+		}
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		labelWidth : labelWidth,
+		labelAlign:"right",
+		items : {
+			xtype : 'combo',
+			id : 'status',
+			name : 'status',
+			valueField : 'status',
+			displayField : 'status',
+			anchor : '100%',
+			fieldLabel :  '状态',
+			mode : 'local',
+			readOnly : true,
+			triggerAction : 'all',
+			forceSelection : true,
+			store : new Ext.data.SimpleStore({
+				fields : ['status'],
+				data : [['全部'],['待回复'],['回复中'],['已完成']]
+			})
+		}
+	},{
+		columnWidth : .2,
+		layout : 'form',
+		items : {
+			hideLabel  : true,
+			fieldClass : 'fieldReadOnlyNoRemoveAndTop',
+			xtype : 'field'
+		}
+	}];
+	var form = new Ext.Panel({
+		title : '',
+		layout : 'table',
+		frame : true,
+		buttonAlign : 'center',
+		region : 'north',
+        height : 100,
+        items : {
+        	layout : 'column',
+			width: 1300,
+	    	items : [{
+				columnWidth : 1,
+				xtype : 'fieldset',
+				layout : 'column',
+				frame : false,
+				border : false,
+				height:100,
+				items : row1Array
+			}]
+        },
+        buttons  : [{
+			xtype : 'button',
+			text : '查询',
+			iconCls : 'icon_search',
+			handler : function() {
+				initQueryValueAndReload()
+			}
+		},{
+			xtype : 'button',
+			text : '重置',
+			iconCls : 'icon_set',
+			handler : function() { 			
+				$Id('startTime').value = startTime;				
+				$Id('endTime').value = endTime;
+				$Id('orgUnitCode').value = '';
+				$Id('type').value = '';
+				$Id('status').value = '';
+			}
+		},{
+			xtype : 'button',
+			text : '导出',
+			iconCls : 'icon_set',
+			hidden:SSTS_ProblemReport_Export,
+			handler : function() { 			
+				var records = grid.getSelectionModel().getSelections();
+			  	if (records.length == 0) {
+			      	showResult("请选择要导出的问题反馈列表！");
+			      	return;
+			  	}
+			  	var ids = null;
+				for ( var i = 0, len = records.length; i < len; i++) {
+					if (ids == null) {
+						ids = records[i].data['id'];
+					} else {
+						ids = ids + ',' + records[i].data['id'];
+					}
+				}
+			  	location.href = WWWROOT + "/disinfectsystem/problemReport/exportProblemRecord.jsp?ids=" + ids;
+			}
+		}]
+	});
 	var columns = [
-	       	    {header : "标题",width : 80,dataIndex : 'title', renderer : modifyRecord},
-	       	    {header : "描述",width : 120,dataIndex : 'description'},
-	       	    {header : "科室名称",width : 100,dataIndex : 'orgUnitName'},
-	       	    {header : "状态",width : 100,dataIndex : 'status',renderer:renderStatus},
-	       	    {header : "科室编码",width : 120,dataIndex : 'orgUnitCoding',hidden:true},
-	       	    {header : "报告人",width : 80,dataIndex : 'registerPerson'},
-	       	    {header : "反馈时间",width : 120,dataIndex : 'reportTime',renderer : myDateFormatByMinute},
-	       	    {header : "回复时间",width : 120,dataIndex : 'answerTime',renderer : myDateFormatByMinute},
-	       	    {header : "回复内容",width : 120,dataIndex : 'answer'},
-	       	    {header : "备注",id : 'remark',width : 120,dataIndex : 'remark'}
-	       	];
+		{header : "标题",width : 150,dataIndex : 'title', renderer : modifyRecord},
+		{header : "描述",width : 150,dataIndex : 'description'},
+		{header : "科室名称",width : 150,dataIndex : 'orgUnitName'},
+		{header : "状态",width : 100,dataIndex : 'status',renderer:renderStatus},
+		{header : "问题类型",width : 120,dataIndex : 'type'},
+		{header : "科室编码",width : 120,dataIndex : 'orgUnitCoding',hidden:true},
+		{header : "报告人",width : 80,dataIndex : 'registerPerson'},
+		{header : "反馈时间",width : 150,dataIndex : 'reportTime',renderer : myDateFormatByMinute},
+		{header : "完成时间",width : 150,dataIndex : 'finishTime',id : 'finishTime'}
+	];
 	var filters = new Ext.grid.GridFilters({
 		filters : [
 			{type:'string',dataIndex:'title'},
-			{type:'date',dataIndex:'reportTime'},
+			{type:'string',dataIndex:'description'},
 			{type:'string',dataIndex:'orgUnitName'},
-			{type:'string',dataIndex:'registerPerson'},
-			{type:'string',dataIndex:'remark'}
+			{type:'string',dataIndex:'registerPerson'}
 		]
 	});
 	var readerDetail = [
-	            	    {name : 'id'}, 
-	            	    {name : 'title'},
-	            	    {name : 'description'},
-	            	    {name : 'orgUnitName'},
-	            	    {name : 'status'},
-	            	    {name : 'orgUnitCoding'},
-	            	    {name : 'registerPerson'},
-	            	    {name : 'reportTime'},
-	            	    {name : 'answerTime'},
-	            	    {name : 'answer'},
-	            	    {name : 'remark'},
-	            	];
+		{name : 'id'}, 
+		{name : 'title'},
+		{name : 'description'},
+		{name : 'orgUnitName'},
+		{name : 'status'},
+		{name : 'type'},
+		{name : 'orgUnitCoding'},
+		{name : 'registerPerson'},
+		{name : 'reportTime'},
+		{name : 'finishTime'}
+	];
 	
 	var tbar = [{
 		text : '添加',
@@ -68,24 +288,7 @@
 		handler : function() {
 			addProblemReport();
 		}
-	}/*,'-',{
-		text : '回复',
-		hidden : SSTS_ProblemReport_Answer,
-		iconCls : 'btn_ext_application_add',
-		handler : function() {
-			var records = grid.getSelectionModel().getSelections();
-			if (records.length == 0) {
-				showResult("请选择要回复的数据！");
-				return false;
-			}
-			if (records.length > 1) {
-				showResult("请选择要回复的数据！");
-				return false;
-			}
-			id = records[0].data['id'];
-			loadAndEditProblemData(id,records[0].data['status'],true,"answer");
-		}
-	}*/,'-',{
+	},'-',{
 		text : '修改',
 		hidden : SSTS_ProblemReport_Update,
 		iconCls : 'btn_ext_application_edit',
@@ -105,7 +308,7 @@
 				if(SSTS_ProblemReport_Answer){//如果没有这个权限
 					loadAndEditProblemData(id,status,"update");
 				}else{
-					loadAndEditProblemData(id,status,"answer");
+					loadAndEditProblemData(id,status,"new");
 				}
 			}else{
 				loadAndEditProblemData(id,status,"update");
@@ -133,16 +336,16 @@
 		isShowSearchField : true,
 		columns : columns,
 		plugins : filters,
-		autoExpandColumn : 'remark',
+		autoExpandColumn : 'finishTime',
 		renderTo : 'gridDiv',
 		frame : false
 	}, readerDetail,
 	ProblemTableManager.findProblemTableList,
 		dwrCallParams // 这个参数只是占位作用
-	);
-	var viewport = new Ext.Viewport( {
+	); 
+	new Ext.Viewport( {
 		layout : 'border',
-		items : [{
+		items : [form, {
 			region : 'center',
 			margins : '0 0 0 0',
 			layout : 'fit',