Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r41497 -r41513
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 41497)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 41513)
@@ -1140,7 +1140,7 @@
             {hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_ExpensiveGoodsSupplier_Hidden_Menu,text:"高值耗材供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/expensiveGoodsSupplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"条码信息",href:WWWROOT+'/disinfectsystem/basedatamanager/barcodeInformation/barcodeInformation.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :!(sstsConfig.haveRinserPosition || sstsConfig.haveSterilizerPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_RinserGroup_manager,text:"清洗机分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/rinserGroup/rinserGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js
===================================================================
diff -u -r41296 -r41513
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41296)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringForm.js	(.../routineMonitoringForm.js)	(revision 41513)
@@ -795,6 +795,23 @@
 	var actualWidth = document.body.clientWidth;
 	var actualHeight = document.body.clientHeight;
 	var columnWidth = actualWidth > 500 ? 0.5 : 1;
+	//位置管理
+	var positionsStore = new Ext.data.Store({
+		pageSize: 100,
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/positionAction!loadPositions.do',
+			method: 'POST'
+		}),
+		baseParams: {
+			positionType: '灭菌炉'
+		},
+		reader: new Ext.data.JsonReader({
+			totalProperty: 'totalCount'
+		}, [{
+			name: 'id', mapping: 'id'
+		}, { name: 'positionName', mapping: 'positionName' }
+		])
+	});
 
 	formPanel = new Ext.FormPanel({
 		id: 'addRoutineMonitoringForm',
@@ -1121,6 +1138,33 @@
 				}]
 			}, {
 				layout: 'form',
+				columnWidth: columnWidth,
+				labelWidth: 90,
+				hidden: !(sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition),
+				items: [{
+					xtype: 'hidden',
+					id: 'samplingPositionId',
+					name: 'samplingPositionId'
+				}, {
+					xtype: 'combo',
+					fieldLabel: "抽检位置",
+					valueField: 'positionName',
+					displayField: 'positionName',
+					store: positionsStore,
+					allowBlank: true,
+					editable: false,
+					triggerAction: 'all',
+					name: "samplingPositionName",
+					id: "samplingPositionName",
+					anchor: '95%',
+					listeners: {
+						select: function (combo, record, index) {
+							Ext.getCmp('samplingPositionId').setValue(record.data.id);
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
 				columnWidth: 1,
 				labelWidth: 90,
 				items: [{
@@ -1399,6 +1443,11 @@
 					if (SSTS_RoutineMonitoring_CustomEdit && qualityMonitoringUpdateMode == '仅登记人可以修改' && result.data.createUserName !== userName) {
 						Ext.getCmp('saveBtn11').hide();
 					}
+					//ZSYKEQ-54：抽检位置
+					if (sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition) {
+						Ext.getCmp('samplingPositionId').setValue(result.data.samplingPositionId);
+						Ext.getCmp('samplingPositionName').setValue(result.data.samplingPositionName);
+					}
 				} else {
 					showResultQM("找不到该条码所对应的器械包实例");
 				}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js
===================================================================
diff -u -r41497 -r41513
--- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 41497)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js	(.../config.js)	(revision 41513)
@@ -270,6 +270,12 @@
   enbaleThirdPartyIdCard:true,
   //灭菌耗材数量消耗方式
   sterilizationConsumablesQuantityConsumptionMethod:1,
+  //启用定期监测登记位置功能
+  enablePeriodicMonitoringRegisteredLocation:true,
+  // 灭菌炉是否有位置
+  haveSterilizerPosition : true,
+  // 启用指定库房签收入库功能
+  enableDesignatedWarehouseReceiving:true,
   // 是否启用未录入使用记录器械包报表 ZSYKEQ-26
   enableUnusedTousseInstanceReport: true,
   //启用器械包需求量分析报表
Index: ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js
===================================================================
diff -u -r41289 -r41513
--- ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 41289)
+++ ssts-web/src/main/webapp/disinfectsystem/routineMonitoring/routineMonitoringView.js	(.../routineMonitoringView.js)	(revision 41513)
@@ -169,6 +169,7 @@
 		{ header: "灭菌炉", width: 120, dataIndex: 'sterilizerName' },
 		{ header: "灭菌炉次", width: 60, dataIndex: 'sterilizerFrequency' },
 		{ header: "审核人", width: 60, dataIndex: 'reviewer', hidden: sstsConfig.disableThePeriodicMonitoringRecordAuditFunction },
+		{ header: "抽检位置", width: 90, dataIndex: 'samplingPositionName', hidden: !(sstsConfig.enablePeriodicMonitoringRegisteredLocation && sstsConfig.haveSterilizerPosition) },
 		{ header: "审核时间", width: 120, dataIndex: 'reviewTime', renderer: myDateFormatByMinute, hidden: sstsConfig.disableThePeriodicMonitoringRecordAuditFunction },
 		{ header: "状态", width: 60, dataIndex: 'status', hidden: sstsConfig.disableThePeriodicMonitoringRecordAuditFunction },
 		{ header: "监测结果", width: 60, dataIndex: 'result' },
@@ -219,6 +220,7 @@
 		{ name: 'dateTime' },
 		{ name: 'remark' },
 		{ name: 'tousseName' },
+		{ name: 'samplingPositionName' },
 		{ name: 'createUserName' },
 		{ name: 'reviewer' },
 		{ name: 'reviewTime' },