Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp
===================================================================
diff -u -r29513 -r30306
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp	(.../qualityMonitoringMonthView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.jsp	(.../qualityMonitoringMonthView.jsp)	(revision 30306)
@@ -1,5 +1,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition"%>
+<%@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>
@@ -15,9 +17,24 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/qualityMonitoringMonthView.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthPickerPlugin.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 moduleNameArr = new Array("<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_RECYCLING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_WASH%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_PACKING%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_REVIEW%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_STERILIZATION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INVOICE%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_USERECORD%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_ROXYDISINFECTION%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_INFECTIONPART%>","<%=QualityMonitoringDefinition.QUALITYMONITORING_MODULE_NAME_OTHERPART%>");
 
 var SSTS_WashRecord_Create = true;
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js
===================================================================
diff -u -r30247 -r30306
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 30247)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/qualityMonitoringMonthView.js	(.../qualityMonitoringMonthView.js)	(revision 30306)
@@ -81,9 +81,6 @@
 						}
 					}
 				}
-				if(supplyRoomStore.getCount() > 1){
-					supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL}));
-				}
 				//最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
 				if(currentOrgUnitIsSupplyRoom){
 					Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
@@ -200,13 +197,10 @@
 		});
 		formDefinitionStore.on("beforeload", function(thiz, options) {
 			thiz.baseParams["formType"] = Ext.getCmp('monitoringType').getValue();
-			if(Ext.getCmp('querySupplyRoom').getRawValue() == '全部'){
-				thiz.baseParams["showAll "] = true;
-				thiz.baseParams["querySupplyRoom"] = '';
-			}else {
-				thiz.baseParams["showAll "] = false;
-				thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
-			}
+			if(supplyRoomType == supplyRoomTypeFirstSupplyRoom || supplyRoomType == supplyRoomTypeSecondSupplyRoom){
+				thiz.baseParams["showAll"] = true;
+			} 
+			thiz.baseParams["querySupplyRoom"] = Ext.getCmp('querySupplyRoom').getRawValue();
 		});
 		
 		var formDefinitionDeatilStore = new Ext.data.Store({
@@ -364,31 +358,7 @@
 							anchor : '95%',
 							listeners: {
 								select: function (combo, record, index) {
-									//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
-									if (record.get('departCode') == ALL) {
-										if (record.get('checked')) {
-											combo.selectAll();
-										} else {
-											combo.deselectAll();
-										}
-									}
 									
-									//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
-									var selectAll = true;
-									combo.store.each(function(record) {
-										if (record.get('departCode') != ALL && !record.get(this.checkField)) {
-											selectAll = false;
-											return;
-										}
-									}, combo);
-									
-									var all = combo.store.getAt(0);
-									if (selectAll) {
-										all.set(combo.checkField, true);
-									} else {
-										all.set(combo.checkField, false);
-									}
-									combo.setValue(combo.getCheckedValue());
 									formDefinitionStore.load();
 								}
 							}
