Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r26429 -r26440
--- ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26429)
+++ ssts-web/src/main/webapp/homepage/portalPage.js	(.../portalPage.js)	(revision 26440)
@@ -1400,16 +1400,16 @@
 	                       })
 	                   }),
 	                   columns: [
-	                       {header: "告警类型", width: 200, dataIndex: 'warningItemType'},
+	                       {header: "告警类型", width: 300, dataIndex: 'warningItemType'},
 	                       {header: "告警数量", width: 60,dataIndex: 'warningAmount'},
 	                       {header: "操作", width: 70,dataIndex: 'warningItemType',renderer : hrefPage}
 	                   ],
 	                   stripeRows: true,
 	                   viewConfig: {
 	                       forceFit:true
 	                   },
-	                   height:140,
-	                   width:400
+	                   height:200,
+	                   width:600
 	               });
 	    		//根据配置项判断告警类型的信息是否需要提示(中大五院期望不要提示“已过期的器械包物品”)
 	    		var needLoadingWarnningData = [];
@@ -1428,7 +1428,7 @@
                warningWindow = new Ext.Window({
                    autoHeight:true,
                    title : '系统告警',
-                   width:415,
+                   width:615,
                    draggable:true,
                    modal:true,
                    closeAction:'close',
@@ -1481,7 +1481,7 @@
 	initTipPosition();//注意顺序
 }
 
-function gopage(v,remark){
+function gopage(v){
 	if(v == recall){//召回页面
 		addTab('recallRecord','器械包召回',WWWROOT + '/disinfectsystem/recallRecord/recallRecordViewForDepart.jsp');
 	}else if(v ==disabledGoods || v == diposableGoods){
@@ -1501,16 +1501,15 @@
 	}else if(v == warningContract){
 		addTab('warningInfo','告警管理',WWWROOT + '/disinfectsystem/assestManagement/contract/contractWarningView.jsp');
 	}
-	if(v == NOTDOBIOLOGICALMONITORING){
-		Ext4.MessageBox.alert("提示",remark);
-	}else{
-		warningWindow.close();
-	}
+	warningWindow.close();
 }
 
 function hrefPage(v, p, record){
 	var mess = "查看详细";
-	return "<a href=\"#\" onclick=\"gopage('"+v + "','"+ record.json.remark +"');return false;\">"+mess+"</a>";
+	if(v != null && v.indexOf("生物监测") != -1){
+		mess = "&nbsp;";
+	}
+	return "<a href=\"#\" onclick=\"gopage('"+v+"');return false;\">"+mess+"</a>";
 }
 
 /**
Index: ssts-web/src/main/webapp/homepage/portalPage.jsp
===================================================================
diff -u -r26429 -r26440
--- ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 26429)
+++ ssts-web/src/main/webapp/homepage/portalPage.jsp	(.../portalPage.jsp)	(revision 26440)
@@ -191,7 +191,6 @@
 var BASICSATISFACTION = "<%=Satisfaction.BASICSATISFACTION%>";		//基本满意 
 var NOTVERYSATISFACTION = "<%=Satisfaction.NOTVERYSATISFACTION%>";	//不太满意
 var NOSATISFACTION = "<%=Satisfaction.NOSATISFACTION%>";			//不满意
-var NOTDOBIOLOGICALMONITORING = "<%=SystemWarningItemVO.WARNING_TYPE_NOTDOBIOLOGICALMONITORING%>";
 var globalIsSupplyRoomUser = '<%=supplyRoomConfigManager.isSupplyRoomUser(userData)%>';	//判断登录用户是否为供应室（包括一级供应室和二级供应室）
 var openFlag = '<%=openSelectOrgUnitWindow%>';  //决定要不要显示切换科室的窗口
 var WWWROOT = '${ctx}';
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r26429 -r26440
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 26429)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 26440)
@@ -503,19 +503,12 @@
 				&& warningTypeList.contains(SystemWarningItemVO.WARNING_TYPE_NOTDOBIOLOGICALMONITORING))){
 			List<String> names = getWarningOfBiologicalMonitoring(numberOfwarningDays);
 			if(names.size() > 0){
-				SystemWarningItemVO vo = new SystemWarningItemVO();
-				vo.setWarningItemType(SystemWarningItemVO.WARNING_TYPE_NOTDOBIOLOGICALMONITORING);
-				vo.setWarningAmount(names.size());
-				String remark = "";
 				for (int i = 0; i < names.size(); i++) {
-					if(i == 0){
-						remark = names.get(i);
-					}else{
-						remark += "," + names.get(i);
-					}
+					SystemWarningItemVO vo = new SystemWarningItemVO();
+					vo.setWarningItemType(names.get(i) + "已经6天内没有做生物监测，请今天必须做生物监测");
+					vo.setWarningAmount(1);
+					warningList.add(vo);
 				}
-				vo.setRemark(remark + numberOfwarningDays + "天内未做生物监测,请尽快进行生物监测!");
-				warningList.add(vo);
 			}
 		}
 		//供应商证件管理中，有过期或者预警的证件的供应商