Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp
===================================================================
diff -u -r29513 -r30299
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.jsp	(.../qualityMonitoringView.jsp)	(revision 30299)
@@ -1,4 +1,6 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
 <%@ include file="/common/taglibs.jsp"%>
 <html>
 <head>
@@ -12,9 +14,24 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDatePicker.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/qualityMonitoringView.js?version=${svnRevision}"></script>
-
+<%
+	SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+	String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+	String orgUnitName = AcegiHelper.getLoginUser().getOrgUnitNameCodingFromSupplyRoomConfig();
+	int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
+	//是否高值耗材处理科室
+	if(supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser()){
+		supplyRoomType = SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY;
+	}
+	request.setAttribute("orgUnitName",orgUnitName);
+	request.setAttribute("orgUnitCoding",orgUnitCoding);
+	request.setAttribute("supplyRoomType",supplyRoomType);
+ %>
 <script type="text/javascript">
-
+ var supplyRoomTypeFirstSupplyRoom = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_FIRST_SUPPLYROOM %>';
+var supplyRoomTypeSecondSupplyRoom = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM %>';
+var supplyRoomTypeExpensiveGoods = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY %>';
+var supplyRoomType = '${supplyRoomType}';
 var SSTS_WashRecord_Create = true;
 <operation:authorize ifAnyGranted="SSTS_WashRecord_Create">
 SSTS_WashRecord_Create = false;
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js
===================================================================
diff -u -r30243 -r30299
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 30243)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringView.js	(.../qualityMonitoringView.js)	(revision 30299)
@@ -82,9 +82,6 @@
 						}
 					}
 				}
-				if(supplyRoomStore.getCount() > 1){
-					supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL}));
-				}
 				//最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
 				if(currentOrgUnitIsSupplyRoom){
 					Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
@@ -208,13 +205,10 @@
 		});
 		formDefinitionStore.on("beforeload", function(thiz, options) {
 			thiz.baseParams["formType"] = Ext.getCmp('monitoringType').getValue();
-			if(Ext.getCmp('querySupplyRoom').getRawValue() == '全部'){
+			if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom){
 				thiz.baseParams["showAll "] = true;
-				thiz.baseParams["querySupplyRoom"] = '';
-			}else {
-				thiz.baseParams["showAll "] = false;
-				thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
 			}
+			thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
 		});
 		
 		var materialDefinitionStore = new Ext.data.Store({
