Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js
===================================================================
diff -u -r37061 -r37709
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 37061)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.js	(.../departmentMonthlyView.js)	(revision 37709)
@@ -715,6 +715,12 @@
 				return false;
 			}
 		}
+		//STDXYXYFSZ-37：查询范围
+		var inquiryScope = "当前供应室";
+		var enableExtendedQueryItemsOfdepartmentMonthlyView = sstsConfig.enableExtendedQueryItemsOfdepartmentMonthlyView || [];
+		if(enableExtendedQueryItemsOfdepartmentMonthlyView.length > 0 && enableExtendedQueryItemsOfdepartmentMonthlyView.indexOf('inquiryScope') >= 0){
+			inquiryScope = Ext.getCmp('inquiryScope').getValue();
+		}
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -738,6 +744,7 @@
 			showAmountColumn: showAmountColumn,
 			showApplicationDepart: showApplicationDepart,
 			reportName: 'monthReport',
+			inquiryScope:inquiryScope,
 			hidePrintBtn: hidePrintBtn
 		}
 
@@ -1189,6 +1196,28 @@
 					}
 
 				}]
+			}, {
+				columnWidth: 0.2,
+				layout: 'form',
+				id: 'inquiryScopeBox',
+				items: [{
+					xtype: 'combo',
+					fieldLabel: '查询范围',
+					id: 'inquiryScope',
+					name: 'inquiryScope',
+					valueField: 'value',
+					displayField: 'value',
+					store: new Ext.data.SimpleStore({
+						fields: ['value'],
+						data: [['当前供应室'], ['全部供应室'], ['一级供应室'], ['二级供应室']]
+					}),
+					forceSelection: true,
+					value: '当前供应室',
+					editable: false,
+					mode: 'local',
+					triggerAction: 'all',
+					anchor: '95%'
+				}]
 			}]
 		}],
 		buttons: [{
@@ -1280,4 +1309,10 @@
 	} else {
 		Ext.getCmp('invoicePlanDepartSearch').setValue(orgUnitCoding);
 	}
+
+	//STDXYXYFSZ-37：查询范围
+	var enableExtendedQueryItemsOfdepartmentMonthlyView = sstsConfig.enableExtendedQueryItemsOfdepartmentMonthlyView || [];
+	if(enableExtendedQueryItemsOfdepartmentMonthlyView.length == 0 || enableExtendedQueryItemsOfdepartmentMonthlyView.indexOf('inquiryScope') == -1 || isSupplyRoomUser == 'false'){
+		Ext.getCmp('inquiryScopeBox').hide();
+	}
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp
===================================================================
diff -u -r36219 -r37709
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 36219)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyView.jsp	(.../departmentMonthlyView.jsp)	(revision 37709)
@@ -19,8 +19,9 @@
 <%
 
     SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
-    String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
-    String orgUnitName = AcegiHelper.getLoginUser().getOrgUnitNameCodingFromSupplyRoomConfig();
+    LoginUserData loginUser = AcegiHelper.getLoginUser();
+    String orgUnitCoding = loginUser.getOrgUnitCodingFromSupplyRoomConfig();
+    String orgUnitName = loginUser.getOrgUnitNameCodingFromSupplyRoomConfig();
     int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
     //是否高值耗材处理科室
     if(supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser()){
@@ -34,6 +35,16 @@
 	}
     request.setAttribute("supplyRoomType",supplyRoomType);
     request.setAttribute("orgUnitCoding",orgUnitCoding);
+
+    String currentOrgUnitCode = loginUser.getCurrentOrgUnitCode();
+    if(currentOrgUnitCode!=null){
+        //判断是否供应室用户
+        if(supplyRoomConfigManager.isSupplyRoomUser(loginUser)){
+            request.setAttribute("isSupplyRoomUser", true);
+        }else{
+            request.setAttribute("isSupplyRoomUser", false);
+        }
+    }
  %>
  <script type="text/javascript">
     var orgUnitName = '${orgUnitName}';
@@ -42,6 +53,7 @@
     var supplyRoomTypeSecondSupplyRoom = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_SECOND_SUPPLYROOM %>';
     var supplyRoomTypeExpensiveGoods = '<%=SupplyRoomConfig.SUPPLYROOM_TYPE_EXPENSIVEGOODS_APPLY %>';
     var supplyRoomType = '${supplyRoomType}';
+    var isSupplyRoomUser = '${isSupplyRoomUser}';
 </script>
 <!--[if !IE]><!--> 
 <script src="${ctx}/disinfectsystem/reportforms/js/sheetjs/xlsx.core.min.js"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js
===================================================================
diff -u -r29457 -r37709
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js	(.../config.js)	(revision 29457)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js	(.../config.js)	(revision 37709)
@@ -103,6 +103,8 @@
           mergePrintInvoiceGoods:true,
 			   //启用PDA扫描一次物品固定条码
 oneKeyScanDisposableGoodsForPDA:true,
+		//核算月报表增加可扩展查询项
+		enableExtendedQueryItemsOfdepartmentMonthlyView:['inquiryScope'],
           //打印发货单，发货单合并方式
 		  batchPrintInvoiceMergeType:"科室"
 		}
\ No newline at end of file