Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp
===================================================================
diff -u -r29513 -r36250
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp	(.../problemReport.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReport.jsp	(.../problemReport.jsp)	(revision 36250)
@@ -11,6 +11,7 @@
     request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getCurrentOrgUnitCode());
     SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
     request.setAttribute("today", dateFormat.format(new Date()));
+    request.setAttribute("firstSupplyRoomUser",AcegiHelper.getLoginUser().getFirstSupplyRoomUser());
 %>
 
 <%
@@ -29,6 +30,8 @@
 <script type="text/javascript">
     var fontSize = '${fontSize}';
     var causeList = '${causeList}';
+    var newId = '${param.id}';
+    var firstSupplyRoomUser = '${firstSupplyRoomUser}';
     var list = [];
     if(causeList.length > 2){
         causeList = causeList.substr(1,(causeList.length-2)).replace(/\s/g,"");
@@ -45,13 +48,18 @@
 <script type="text/javascript" src="${ctx }/dwr/util.js?version=${svnRevision}"></script>
 <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/common/selectUserExt4.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="problemReportView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="problemReportForm.js?version=${svnRevision}"></script>
 
 <!-- 日期控件引入 -->
 <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}/ext/js/multiSelectComboTop.js?version=${svnRevision}"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
+
 <script type="text/javascript">
 var SSTS_ProblemReport_Delete = true;
 <operation:authorize ifAnyGranted="SSTS_ProblemReport_Delete">
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r36247 -r36250
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 36247)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 36250)
@@ -235,6 +235,7 @@
       <operation operationId="SSTS_ProblemReport_Delete" operationName="���ⱨ��ɾ��"></operation>
       <operation operationId="SSTS_ProblemReport_Answer" operationName="���ⱨ��ظ�"></operation>
       <operation operationId="SSTS_ProblemReport_Export" operationName="���ⱨ�浼��"></operation>
+      <operation operationId="SSTS_ProblemReport_Notify" operationName="���ⷴ��֪ͨ"></operation>
     </modelName>
     <modelName modleName="��Ϣ����ģ��">
       <operation operationId="SSTS_MESSAGE_Create" operationName="��Ϣ���"></operation>
Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js
===================================================================
diff -u -r30577 -r36250
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js	(.../problemReportView.js)	(revision 30577)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportView.js	(.../problemReportView.js)	(revision 36250)
@@ -358,4 +358,8 @@
 			items : grid
 		}]
 	});
+
+	if(newId){
+		loadAndEditProblemData(newId,'待回复',"info");
+	}
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js
===================================================================
diff -u -r33472 -r36250
--- ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js	(.../problemReportForm.js)	(revision 33472)
+++ ssts-web/src/main/webapp/disinfectsystem/problemReport/problemReportForm.js	(.../problemReportForm.js)	(revision 36250)
@@ -219,8 +219,43 @@
 	top.Ext.getCmp('answerArea').disable();
 	top.Ext.getCmp('answerAreaButton').disable();
 }
-
+var userStore;
 function showWindow(tempObjectID) {
+	var departJsonStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/orgUnit/searchOrgUnitByKeyWord.do?showDisableOrgUnit=false',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [{
+				name: 'id',
+				mapping: 'id'
+			},
+			{
+				name: 'name',
+				mapping: 'departmentName'
+			}
+		])
+	});
+	userStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [
+			{ name: 'id'},
+			{ name: 'name'}
+		]),
+		listeners:{
+			beforeload: function(s,options){
+				var notifyOrgUnitId = top.Ext.getCmp('notifyOrgUnitId').getValue();
+				s.baseParams.orgUnitId = notifyOrgUnitId;
+			}
+		}
+	});
 	var fileHtml = '<div class="x-form-item">';
 	fileHtml += '<label for="fileDisplay" style="width:90px;" class="x-form-item-label">附件:</label>';
 	fileHtml += '<div class="x-form-element" id="x-form-el-fileDisplay" style="padding-left:95px">';
@@ -328,10 +363,84 @@
 				columnWidth: .5,
 				labelWidth: 90,
 				items: [{
+					xtype: 'hidden',
+					name: 'notifyOrgUnitId',
+					id: 'notifyOrgUnitId'
+				},{
+					xtype: 'combo',
+					fieldLabel: "通知科室",
+					id: 'notifyOrgUnitName',
+					name: 'notifyOrgUnitName',
+					queryParam: 'spell',
+					minChars: 0,
+					valueField: 'name',
+					displayField: 'name',
+					store: departJsonStore,
+					forceSelection: true,
+					lazyInit: true,
+					triggerAction: 'all',
+					typeAhead: false,
+					allowBlank: true,
+					disabled:(firstSupplyRoomUser == 'false'),
+					anchor: '95%',
+					listeners:{
+						select: function (combo, record, index) {
+							top.Ext.getCmp('notifyOrgUnitId').setValue(record.data.id);
+							if(record.data.id){
+								top.Ext.getCmp('notifyUserNames').enable()
+							}else {
+								top.Ext.getCmp('notifyUserNames').disable()
+							}
+							userStore.load();
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: .5,
+				labelWidth: 90,
+				items: [{
+					xtype: 'hidden',
+					name: 'notifyAllOrgUnitUser',
+					id: 'notifyAllOrgUnitUser'
+				},{
+					xtype: 'hidden',
+					name: 'notifyUserIds',
+					id: 'notifyUserIds'
+				},{
+					xtype: 'multiSelect',
+					fieldLabel: "通知用户",
+					id: 'notifyUserNames',
+					name: 'notifyUserNames',
+					valueField: 'id',
+					displayField: 'name',
+					minChars: 0,
+					editable:false,
+					queryParam: 'spell',
+					allowBlank: true,
+					store: userStore,
+					disabled:(firstSupplyRoomUser == 'true'),
+					mode: 'remote',
+					multiSelectIsClear: false,
+					triggerAction: 'all',
+					anchor: '95%',
+					separator:';',
+					listeners:{
+						select: function (combo, record, index) {
+							top.Ext.getCmp('notifyUserIds').setValue(combo.getCheckedValue())
+							top.Ext.getCmp('notifyAllOrgUnitUser').setValue('否');
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: .5,
+				labelWidth: 90,
+				items: [{
 					xtype: 'textfield',
 					name: 'orgUnitName',
 					id: 'orgUnitName',
-					fieldLabel: "科室",
+					fieldLabel: "登记科室",
 					value: $Id('orgunit').value,
 					anchor: '95%',
 					readOnly: true,
@@ -505,6 +614,29 @@
 		}
 	});
 	problemWin.show();
+	if(firstSupplyRoomUser == 'true'){
+		if(top.Ext.getCmp('notifyOrgUnitName').getValue() !== ''){
+			top.Ext.getCmp('notifyUserNames').setRawValue('全部')
+		}
+	}else {
+		Ext.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadFirstSupplyRoomOrgUnit.do',
+			success: function (response, options) {
+				var res = Ext.decode(response.responseText);
+				if(res.success && res.data.length > 0){
+					var name = res.data[0].name;
+					var id = res.data[0].id;
+					top.Ext.getCmp('notifyOrgUnitName').setValue(name);
+					top.Ext.getCmp('notifyOrgUnitId').setValue(id);
+					top.Ext.getCmp('notifyUserNames').setRawValue('全部');
+					top.Ext.getCmp('notifyUserNames').disable();
+					top.Ext.getCmp('notifyAllOrgUnitUser').setValue('是');
+					top.Ext.getCmp('notifyUserIds').setValue('');
+				}
+				
+			}
+		})
+	}
 }
 
 /***
@@ -516,6 +648,12 @@
 		showWindow();
 	}
 
+	var url = WWWROOT + '/disinfectSystem/problemAction!loadProblemData.do';
+
+	if(action == 'info'){
+		url = WWWROOT + 'disinfectSystem/problemAction!viewProblemNotifyDetail.do';
+	}
+
 	if (!Ext.isEmpty(id)) {
 		Ext.Ajax.request({
 			url: WWWROOT + '/disinfectSystem/problemAction!loadProblemData.do',
@@ -535,7 +673,7 @@
 					top.Ext.getCmp('orgUnitCoding').setValue(result.data.orgUnitCoding);
 					top.Ext.getCmp('description').setValue(result.data.description);
 
-					top.Ext.getCmp('actionType').setValue(action);
+					top.Ext.getCmp('actionType').setValue((action == 'info')?'update':action);
 					top.Ext.getCmp('status').setValue(result.data.status);
 					var answers = result.data.answers;
 					var contents = '';
@@ -555,6 +693,25 @@
 
 					top.Ext.getCmp('solveBtn').show();
 					top.Ext.getCmp('uploadButton').show();
+
+					top.Ext.getCmp('notifyOrgUnitId').setValue(result.data.notifyOrgUnitId);
+					top.Ext.getCmp('notifyOrgUnitName').setValue(result.data.notifyOrgUnitName);
+					if(result.data.notifyOrgUnitName !== ''){
+						top.Ext.getCmp('notifyUserIds').setValue(result.data.notifyUserIds);
+						top.Ext.getCmp('notifyUserNames').setRawValue(result.data.notifyUserNames);
+						top.Ext.getCmp('notifyUserNames').enable();
+						userStore.load();
+						if(firstSupplyRoomUser == 'false'){
+							top.Ext.getCmp('notifyUserNames').disable();
+						}
+						if(result.data.notifyAllOrgUnitUser == '是'){
+							top.Ext.getCmp('notifyAllOrgUnitUser').setValue(result.data.notifyAllOrgUnitUser);
+							top.Ext.getCmp('notifyUserNames').setRawValue('全部');
+						}
+					}else {
+						top.Ext.getCmp('notifyUserNames').disable();
+					}
+
 					if (status == "已完成") {
 						top.Ext.getCmp('title').addClass('fieldReadOnlyNoRemove');
 						top.Ext.getCmp('title').el.dom.readOnly = true;
Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r36169 -r36250
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36169)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 36250)
@@ -10,6 +10,7 @@
 var useRecordMenu ;
 //用来判断Ext4.onReady执行完没有(selenium自动测试需要用到这个变量,请不要删除)
 var windowOnLoaded = false;
+var problemWarningWin;
 var tabs;     //tabPanel
 //tips提示的元素,在addIconTips()方法中添加
 var tipsEle = [];
@@ -357,6 +358,9 @@
 	//维修信息提醒
 	initShowInstrumentRepairManagementWin();
 
+	//CDSLQYQYYY-117:弹窗提醒功能
+	getProblemWarningWin();
+
 	//CDSLQYQYYY-113：定期监测提醒
 	if(sstsConfig.enableThePeriodicMonitoringRemindersFunction){
 		Ext4.Ajax.request({
@@ -1828,6 +1832,70 @@
 	}
 }
 
+//CDSLQYQYYY-117:弹窗提醒功能
+function getProblemWarningWin(){
+	var problemWarningStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/system/systemWarningAction!getProblemWarning.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+			{name : 'id',mapping : 'id'},
+			{name : 'title',mapping : 'title'},
+			{name : 'orgUnitName',mapping : 'orgUnitName'},
+			{name : 'registerPerson',mapping : 'registerPerson'}
+		]),
+		listeners:{
+			load:function(store,records) {
+				if(records.length > 0){
+					problemWarningWin.show();
+				}
+			}
+		}
+	});
+	problemWarningStore.load();
+	var problemWarningGrid = new Ext.grid.GridPanel({
+		store:problemWarningStore,
+		columns: [
+			{header: "标题", width: 200, dataIndex: 'title'},
+			{header: "登记科室", width: 100,dataIndex: 'orgUnitName'},
+			{header: "登记用户", width: 60,dataIndex: 'registerPerson'},
+			{header: "操作", width: 70,dataIndex: 'id',renderer : function(v, p, record){
+				var message = "查看详细";
+				return "<a href=\"#\" onclick=\"gopageForProblemWarning('"+ v +"');return false;\">"+message+"</a>";
+			}}
+		],
+		stripeRows: true,
+		viewConfig: {
+			forceFit:true
+		},
+		bbar: new Ext.PagingToolbar({
+			pageSize: 10,
+			store: problemWarningStore,
+			displayInfo: true
+		}),
+		height:200,
+		width:600
+	});
+	problemWarningStore.load({params: {start: 0, limit: 10}});
+	problemWarningWin = new Ext.Window({
+		autoHeight:true,
+		title : '科室问题反馈提醒',
+		width:615,
+		draggable:true,
+		modal:true,
+		closeAction:'close',
+		items:[problemWarningGrid],
+		close: function() {
+			problemWarningWin.hide();
+		}
+   });
+   Ext.QuickTips.init();
+}
+
 /**
  * 显示未归还告警
  */
@@ -2209,6 +2277,11 @@
 	instrumentRepairWindow.close();
 }
 
+function gopageForProblemWarning(id){
+	addTab('problemWarning','科室问题反馈提醒',WWWROOT + '/disinfectsystem/problemReport/problemReport.jsp?id='+id);
+	problemWarningWin.close();
+}
+
 /**
  * 弹出告警提示筐
  * @param warningItemType 告警类型