Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r39371 -r39503
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39371)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39503)
@@ -192,6 +192,8 @@
       <operation operationId="SSTS_UseRecord_OperationRoomAllowBlank" operationName="�Ǽ�ʹ�ü�¼������д������" mappingConfigPropertyName="enableUseRecordMustFilledInTheOperationRoomFunction"></operation>
       <operation operationId="SSTS_ScheduleExpeditedOfUseRecord_Manager" operationName="ԤԼ�Ӽ�����" mappingConfigPropertyName="enableScheduleExpeditedOfUseRecord"></operation>
       <operation operationId="SSTS_ScheduleExpeditedOfUseRecord_List" operationName="ԤԼ�Ӽ��鿴" mappingConfigPropertyName="enableScheduleExpeditedOfUseRecord"></operation>
+      <operation operationId="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager" operationName="ԤԼ�Ӽ����ù���" mappingConfigPropertyName="enableScheduleExpeditedOfUseRecord"></operation>
+      <operation operationId="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list" operationName="ԤԼ�Ӽ����ò鿴" mappingConfigPropertyName="enableScheduleExpeditedOfUseRecord"></operation>
     </modelName>
     
     <modelName mappingConfigPropertyName="enableDepartmentUseRecord" modleName="����ʹ�ü�¼ģ��">
Index: ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.js	(revision 39503)
@@ -0,0 +1,97 @@
+var listStore;
+var departGroupGrid;
+//修改预约加急分组
+function modify(v, data) {
+	editConfig(data);
+}
+
+Ext4.onReady(function () {
+	Ext4.QuickTips.init();
+	var columns = [
+		{ header: "id", dataIndex: 'id', hidden: true },
+		{ header: "名称", dataIndex: 'name', width: 150, renderer: modifyRecord, hidden: SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager },
+		{ header: "名称", dataIndex: 'name', width: 150, hidden: !SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager },
+		{ header: "器械包名称", dataIndex: 'tousseDeinfinitionNames', width: document.body.clientWidth - 200, sortable: false }
+	];
+	var tbar;
+
+	if (!SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager) {
+		tbar = [{
+			text: '添加',
+			iconCls: 'btn_ext_application_add',
+			handler: function () {
+				showAddOrEditWindow();
+			}
+		}, '-', {
+			text: '修改',
+			iconCls: 'btn_ext_application_edit',
+			handler: function () {
+				var selectedRecords = departGroupGrid.getSelectionModel().getSelection();
+				var selectedCount = departGroupGrid.getSelectionModel().getCount();
+				var ids = [];
+				if (selectedCount < 1) {
+					showResult("请选择要修改的数据");
+				} else if (selectedCount > 1) {
+					showResult("只能选择一条数据");
+				} else {
+					editConfig(selectedRecords[0].data);
+				}
+			}
+		}, '-', {
+			text: '删除',
+			iconCls: 'btn_ext_application_del',
+			handler: function () {
+				deleteConfig(departGroupGrid);
+			}
+		}];
+	}
+
+	listStore = new Ext4.data.JsonStore({
+		pageSize: 20,
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/useRecord/urgentReservationGroupController/loadUrgentReservationGroup.mhtml',
+			reader: {
+				root: 'data.list',
+				totalProperty: 'data.count'
+			}
+		},
+		fields: [
+			{ name: 'id' },
+			{ name: 'name' },
+			{ name: 'tousseDeinfinitionNames' },
+			{ name: 'tousseDeinfinitionIds' }
+		]
+	});
+
+	listStore.loadPage(1);
+
+	departGroupGrid = new Ext4.grid.GridPanel({
+		title: '预约加急分组设置',
+		columns: columns,
+		frame: false,
+		autoScroll: false,
+		store: listStore,
+		tbar: tbar,
+		dockedItems: [{
+			xtype: 'pagingtoolbar',
+			store: listStore,   // same store GridPanel is using  
+			dock: 'bottom',
+			displayInfo: true
+		}],
+		viewConfig: {
+			autoFill: true
+		},
+		selModel: new Ext4.selection.CheckboxModel()
+	});
+
+	new Ext4.container.Viewport({
+		layout: 'border',
+		items: [{
+			region: 'center',
+			layout: 'fit',
+			items: [departGroupGrid]
+		}]
+	});
+
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/ext/fontSize12/styles/common.css
===================================================================
diff -u -r39487 -r39503
--- ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 39487)
+++ ssts-web/src/main/webapp/ext/fontSize12/styles/common.css	(.../common.css)	(revision 39503)
@@ -623,4 +623,16 @@
 #monthlyPeopleCountForm-body .x4-panel-body-default {
     background: none !important;
     border: none;
+}
+
+/* GDSRMYY-623：预约加急分组*/
+.tousseInfoButton {
+    border: 0 !important;
+}
+.tousseInfoButton .x4-btn-default-small {
+    background: none !important;
+    border: 0 !important;
+}
+.tousseInfoButton .x4-btn-default-small .x4-btn-inner {
+    color: #367f21 !important;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js
===================================================================
diff -u -r39069 -r39503
--- ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js	(.../scheduleExpeditedOfUseRecordForm.js)	(revision 39069)
+++ ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordForm.js	(.../scheduleExpeditedOfUseRecordForm.js)	(revision 39503)
@@ -33,6 +33,84 @@
 	]
 })
 
+var urgentReservationGroupStore = new Ext4.data.Store({
+	pageSize: 100,
+	proxy: {
+		type: 'ajax',
+		url: WWWROOT + '/disinfectSystem/baseData/useRecord/urgentReservationGroupController/loadUrgentReservationGroup.mhtml',
+		reader: {
+			root: 'data.list',
+			totalProperty: 'data.count'
+		}
+	},
+	fields: [
+		{ name: 'id' },
+		{ name: 'name' },
+		{ name: 'tousseDeinfinitionNames' },
+		{ name: 'tousseDeinfinitionIds' }
+	]
+})
+
+//查看分组详细物品
+function loadUrgentReservationGroupTousseInfo(id, name) {
+	Ext4.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/useRecord/urgentReservationGroupController/loadUrgentReservationGroupTousseInfo.mhtml',
+		method: 'POST',
+		params: {
+			urgentReservationGroupId: id
+		},
+		success: function (response, options) {
+			var result = Ext4.decode(response.responseText);
+			if (result.success) {
+				var tousseListStore = new top.Ext4.data.Store({
+					fields: [
+						{ name: 'tousseName', mapping: 'tousseName' }
+					]
+				});
+				for (var i = 0; i < result.data.length; i++) {
+					var record = {
+						tousseName: result.data[i].tousseName
+					};
+					tousseListStore.add(record)
+				}
+				var grid = new top.Ext4.grid.GridPanel({
+					title: '',
+					columns: [{
+						header: "物品名称",
+						dataIndex: 'tousseName',
+						width: 240
+					}],
+					frame: false,
+					width: 270,
+					height: 200,
+					store: tousseListStore,
+					viewConfig: {
+						autoFill: true
+					}
+				});
+				var configWin = new top.Ext4.window.Window({
+					layout: 'border',
+					title: '【' + name + '】物品列表',
+					width: 300,
+					height: 200,
+					border: false,
+					plain: true,
+					modal: true,
+					items: [{
+						region: 'center',
+						width: 300,
+						layout: 'fit',
+						items: [grid]
+					}]
+				});
+				configWin.show();
+			} else {
+				showResult(result.message)
+			}
+		}
+	});
+}
+
 //添加或者修改预约加急物品
 function showSaveUrgentReservationTousseWin(useRecordUrgentReservationId, objInfo) {
 	var formPanel = new top.Ext4.form.Panel({
@@ -70,15 +148,90 @@
 					value: 0
 				}, {
 					layout: 'form',
-					columnWidth: 0.9,
+					columnWidth: 0.25,
 					border: false,
 					items: [{
+						xtype: 'combo',
+						labelWidth: 0,
+						id: 'urgentType_0',
+						name: 'urgentType_0',
+						valueField: 'urgentType',
+						displayField: 'urgentType',
+						store: new top.Ext4.data.SimpleStore({
+							fields: ['urgentType'],
+							data: [['按物品加急'], ['按分组加急']]
+						}),
+						forceSelection: true,
+						editable: false,
+						mode: 'local',
+						triggerAction: 'all',
+						anchor: '98%',
+						value: '按分组加急',
+						listeners: {
+							select: function (combo, record, index) {
+								if (record[0].data.urgentType == '按物品加急') {
+									top.Ext4.getCmp('urgentReservationGroupBox_0').hide();
+									top.Ext4.getCmp('urgentReservationGroupHiddenBox_0').hide();
+									top.Ext4.getCmp('urgentReservationGroupInfoBox_0').hide();
+									top.Ext4.getCmp('tousseDefinitionBox_0').show();
+								} else {
+									top.Ext4.getCmp('tousseDefinitionBox_0').hide();
+									top.Ext4.getCmp('urgentReservationGroupBox_0').show();
+									top.Ext4.getCmp('urgentReservationGroupHiddenBox_0').show();
+									top.Ext4.getCmp('urgentReservationGroupInfoBox_0').show();
+								}
+							}
+						}
+					}]
+				}, {
+					layout: 'form',
+					columnWidth: 0.65,
+					border: false,
+					id: 'urgentReservationGroupBox_0',
+					items: [{
 						xtype: 'hidden',
+						id: 'urgentReservationGroupId_0',
+						name: 'urgentReservationGroupId_0'
+					}, {
+						fieldLabel: '　',
+						xtype: 'combo',
+						labelWidth: 10,
+						labelSeparator: '',
+						id: 'urgentReservationGroupName_0',
+						name: 'urgentReservationGroupName_0',
+						queryParam: 'spell',
+						minChars: 0,
+						valueField: 'id',
+						displayField: 'name',
+						listWidth: 300,
+						store: urgentReservationGroupStore,
+						pageSize: 25,
+						listConfig: { width: 300 },
+						lazyInit: true,
+						triggerAction: 'all',
+						hideTrigger: true,
+						typeAhead: false,
+						anchor: '95%',
+						listeners: {
+							select: function (combo, record, index) {
+								top.Ext4.getCmp('urgentReservationGroupId_0').setValue(record[0].data.id);
+							}
+						}
+					}]
+				}, {
+					layout: 'form',
+					columnWidth: 0.65,
+					border: false,
+					id: 'tousseDefinitionBox_0',
+					items: [{
+						xtype: 'hidden',
 						id: 'tousseDefinitionId_0',
 						name: 'tousseDefinitionId_0'
 					}, {
-						fieldLabel: '物品名称',
+						fieldLabel: '　',
 						xtype: 'combo',
+						labelWidth: 10,
+						labelSeparator: '',
 						id: 'tousseDefinitionName_0',
 						name: 'tousseDefinitionName_0',
 						queryParam: 'spell',
@@ -116,6 +269,36 @@
 							addTousseBox(parseInt(hiddenTousseCount) + 1);
 						}
 					}]
+				}, {
+					layout: 'column',
+					border: false,
+					columnWidth: 0.25,
+					height: 20,
+					id: 'urgentReservationGroupHiddenBox_0',
+					items: [{
+						xtype: 'hidden'
+					}]
+				}, {
+					layout: 'column',
+					border: false,
+					columnWidth: 0.65,
+					height: 20,
+					margin: "5px 14px",
+					cls: 'tousseInfoButton',
+					id: 'urgentReservationGroupInfoBox_0',
+					items: [{
+						xtype: 'button',
+						text: '查看分组详细物品',
+						handler: function () {
+							var urgentReservationGroupId = top.Ext4.getCmp('urgentReservationGroupId_0').getValue();
+							var urgentReservationGroupName = top.Ext4.getCmp('urgentReservationGroupName_0').getRawValue();
+							if (urgentReservationGroupName == '' || urgentReservationGroupId == '') {
+								showResult('请先选择分组后再查看。');
+							} else {
+								loadUrgentReservationGroupTousseInfo(urgentReservationGroupId, urgentReservationGroupName);
+							}
+						}
+					}]
 				}]
 			}, {
 				layout: 'column',
@@ -184,14 +367,6 @@
 						}
 					}]
 				}]
-			},{
-				layout: 'column',
-				border: false,
-				columnWidth: 0.95,
-				height:20,
-				items: [{
-					xtype: 'hidden'
-				}]
 			}]
 		}],
 		buttonAlign: 'center',
@@ -224,9 +399,19 @@
 		urgentLevelStore.load();
 		top.Ext4.getCmp('hiddenUrgentLevelCount_0').setValue(objInfo.data.children.length);
 		top.Ext4.getCmp('id').setValue(objInfo.data.id);
-		top.Ext4.getCmp('tousseDefinitionId_0').setValue(objInfo.data.tousseDefinitionId);
-		top.Ext4.getCmp('tousseDefinitionName_0').setRawValue(objInfo.data.tousseName);
-		top.Ext4.getCmp('tousseDefinitionName_0').disable();
+		top.Ext4.getCmp('urgentType_0').setValue(objInfo.data.urgentType);
+		if (objInfo.data.urgentType == '按分组加急') {
+			top.Ext4.getCmp('urgentReservationGroupId_0').setValue(objInfo.data.urgentReservationGroupId);
+			top.Ext4.getCmp('urgentReservationGroupName_0').setRawValue(objInfo.data.tousseName);
+			top.Ext4.getCmp('urgentReservationGroupName_0').disable();
+			top.Ext4.getCmp('tousseDefinitionBox_0').hide();
+		} else {
+			top.Ext4.getCmp('tousseDefinitionId_0').setValue(objInfo.data.tousseDefinitionId);
+			top.Ext4.getCmp('tousseDefinitionName_0').setRawValue(objInfo.data.tousseName);
+			top.Ext4.getCmp('tousseDefinitionName_0').disable();
+			top.Ext4.getCmp('urgentReservationGroupBox_0').hide();
+		}
+		top.Ext4.getCmp('urgentType_0').disable();
 		if (objInfo.data.children.length > 0) {
 			top.Ext4.getCmp('urgentInfoId_0_0').setValue(objInfo.data.children[0].urgentInfoId);
 			top.Ext4.getCmp('reservationUrgentAmount_0_0').setValue(objInfo.data.children[0].reservationUrgentAmount);
@@ -245,6 +430,8 @@
 				}
 			}
 		}
+	} else {
+		top.Ext4.getCmp('tousseDefinitionBox_0').hide();
 	}
 }
 
@@ -349,18 +536,93 @@
 				value: 0
 			}, {
 				layout: 'form',
-				columnWidth: 0.9,
+				columnWidth: 0.25,
 				border: false,
 				items: [{
+					xtype: 'combo',
+					labelWidth: 0,
+					id: 'urgentType_' + tousseIndex,
+					name: 'urgentType_' + tousseIndex,
+					valueField: 'urgentType',
+					displayField: 'urgentType',
+					store: new top.Ext4.data.SimpleStore({
+						fields: ['urgentType'],
+						data: [['按物品加急'], ['按分组加急']]
+					}),
+					forceSelection: true,
+					editable: false,
+					mode: 'local',
+					triggerAction: 'all',
+					anchor: '98%',
+					value: '按分组加急',
+					listeners: {
+						select: function (combo, record, index) {
+							if (record[0].data.urgentType == '按物品加急') {
+								top.Ext4.getCmp('urgentReservationGroupBox_' + tousseIndex).hide();
+								top.Ext4.getCmp('urgentReservationGroupHiddenBox_' + tousseIndex).hide();
+								top.Ext4.getCmp('urgentReservationGroupInfoBox_' + tousseIndex).hide();
+								top.Ext4.getCmp('tousseDefinitionBox_' + tousseIndex).show();
+							} else {
+								top.Ext4.getCmp('tousseDefinitionBox_' + tousseIndex).hide();
+								top.Ext4.getCmp('urgentReservationGroupHiddenBox_' + tousseIndex).show();
+								top.Ext4.getCmp('urgentReservationGroupInfoBox_' + tousseIndex).show();
+								top.Ext4.getCmp('urgentReservationGroupBox_' + tousseIndex).show();
+							}
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: 0.65,
+				border: false,
+				id: 'urgentReservationGroupBox_' + tousseIndex,
+				items: [{
 					xtype: 'hidden',
+					id: 'urgentReservationGroupId_' + tousseIndex,
+					name: 'urgentReservationGroupId_' + tousseIndex
+				}, {
+					fieldLabel: '　',
+					xtype: 'combo',
+					labelWidth: 10,
+					labelSeparator: '',
+					id: 'urgentReservationGroupName_' + tousseIndex,
+					name: 'urgentReservationGroupName_' + tousseIndex,
+					queryParam: 'spell',
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					listWidth: 300,
+					store: urgentReservationGroupStore,
+					pageSize: 25,
+					listConfig: { width: 300 },
+					lazyInit: true,
+					triggerAction: 'all',
+					hideTrigger: true,
+					typeAhead: false,
+					anchor: '95%',
+					listeners: {
+						select: function (combo, record, index) {
+							top.Ext4.getCmp('urgentReservationGroupId_' + tousseIndex).setValue(record[0].data.id);
+						}
+					}
+				}]
+			}, {
+				layout: 'form',
+				columnWidth: 0.65,
+				border: false,
+				id: 'tousseDefinitionBox_' + tousseIndex,
+				items: [{
+					xtype: 'hidden',
 					id: 'tousseDefinitionId_' + tousseIndex,
 					name: 'tousseDefinitionId_' + tousseIndex
 				}, {
-					fieldLabel: '物品名称',
 					xtype: 'combo',
+					fieldLabel: '　',
 					id: 'tousseDefinitionName_' + tousseIndex,
 					name: 'tousseDefinitionName_' + tousseIndex,
 					queryParam: 'spell',
+					labelWidth: 10,
+					labelSeparator: '',
 					minChars: 0,
 					valueField: 'id',
 					displayField: 'displayName',
@@ -394,6 +656,38 @@
 						deleteTousseBox(that.tousseIndex);
 					}
 				}]
+			}, {
+				layout: 'column',
+				border: false,
+				columnWidth: 0.25,
+				height: 20,
+				id: 'urgentReservationGroupHiddenBox_' + tousseIndex,
+				items: [{
+					xtype: 'hidden'
+				}]
+			}, {
+				layout: 'column',
+				border: false,
+				columnWidth: 0.65,
+				height: 20,
+				margin: "5px 14px",
+				cls: 'tousseInfoButton',
+				id: 'urgentReservationGroupInfoBox_' + tousseIndex,
+				items: [{
+					xtype: 'button',
+					text: '查看分组详细物品',
+					tousseIndex: tousseIndex,
+					handler: function (that) {
+						var tousseIndex = that.tousseIndex;
+						var urgentReservationGroupId = top.Ext4.getCmp('urgentReservationGroupId_' + tousseIndex).getValue();
+						var urgentReservationGroupName = top.Ext4.getCmp('urgentReservationGroupName_' + tousseIndex).getRawValue();
+						if (urgentReservationGroupName == '' || urgentReservationGroupId == '') {
+							showResult('请先选择分组后再查看。');
+						} else {
+							loadUrgentReservationGroupTousseInfo(urgentReservationGroupId, urgentReservationGroupName);
+						}
+					}
+				}]
 			}]
 		}, {
 			layout: 'column',
@@ -463,17 +757,10 @@
 					}
 				}]
 			}]
-		},{
-			layout: 'column',
-			border: false,
-			columnWidth: 0.95,
-			height:20,
-			items: [{
-				xtype: 'hidden'
-			}]
 		}]
 	});
 
+	top.Ext4.getCmp('tousseDefinitionBox_' + tousseIndex).hide();
 	top.Ext4.getCmp('hiddenTousseCount').setValue(tousseIndex)
 	top.Ext4.getCmp('formPanel').doLayout();
 }
@@ -494,9 +781,18 @@
 		if (top.Ext4.getCmp('hiddenUrgentLevelCount_' + k)) {
 			var hiddenUrgentLevelCount = top.Ext4.getCmp('hiddenUrgentLevelCount_' + k).getValue();
 			var tousseDefinitionId = top.Ext4.getCmp('tousseDefinitionId_' + k).getValue();
-			if (!tousseDefinitionId) {
-				msg = '物品不能为空！';
-				break;
+			var urgentReservationGroupId = top.Ext4.getCmp('urgentReservationGroupId_' + k).getValue();
+			var urgentType = top.Ext4.getCmp('urgentType_' + k).getValue();
+			if (urgentType == '按物品加急') {
+				if (!tousseDefinitionId) {
+					msg = '物品不能为空！';
+					break;
+				}
+			} else {
+				if (!urgentReservationGroupId) {
+					msg = '分组不能为空！';
+					break;
+				}
 			}
 			var children = [];
 			var z = 0;
@@ -522,12 +818,23 @@
 					z++
 				}
 			}
-			paramsArr.push({
-				tousseDefinitionId: tousseDefinitionId,
-				useRecordUrgentReservationId: useRecordUrgentReservationId,
-				id: id || '',
-				children: children
-			})
+			if (urgentType == '按物品加急') {
+				paramsArr.push({
+					tousseDefinitionId: tousseDefinitionId,
+					useRecordUrgentReservationId: useRecordUrgentReservationId,
+					id: id || '',
+					children: children,
+					urgentType: urgentType
+				})
+			} else {
+				paramsArr.push({
+					urgentReservationGroupId: urgentReservationGroupId,
+					useRecordUrgentReservationId: useRecordUrgentReservationId,
+					id: id || '',
+					children: children,
+					urgentType: urgentType
+				})
+			}
 		}
 	}
 	if (msg !== '') {
@@ -641,7 +948,7 @@
 		width: 600,
 		height: 150,
 		columns: [{
-			text: '物品名称',
+			text: '物品/分组名称',
 			width: 160,
 			dataIndex: 'tousseName'
 		}, {
@@ -685,7 +992,8 @@
 		fields: [
 			{ name: 'tousseName', mapping: 'tousseName' },
 			{ name: 'urgentLevelName', mapping: 'urgentLevelName' },
-			{ name: 'invoicePlanSerialNumber', mapping: 'invoicePlanSerialNumber' }
+			{ name: 'invoicePlanSerialNumber', mapping: 'invoicePlanSerialNumber' },
+			{ name: 'urgentReservationGroupName', mapping: 'urgentReservationGroupName' }
 		]
 	})
 
@@ -698,12 +1006,16 @@
 			width: 180,
 			dataIndex: 'tousseName'
 		}, {
+			text: '所属分组',
+			width: 130,
+			dataIndex: 'urgentReservationGroupName'
+		}, {
 			text: '加急等级',
-			width: 150,
+			width: 130,
 			dataIndex: 'urgentLevelName'
 		}, {
 			text: '申请单流水号',
-			width: 150,
+			width: 130,
 			dataIndex: 'invoicePlanSerialNumber'
 		}]
 	})
Index: ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.js
===================================================================
diff -u -r38767 -r39503
--- ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.js	(.../scheduleExpeditedOfUseRecordView.js)	(revision 38767)
+++ ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.js	(.../scheduleExpeditedOfUseRecordView.js)	(revision 39503)
@@ -24,14 +24,16 @@
 		{ name: 'tousseDefinitionId' },
 		{ name: 'urgentInfoId' },
 		{ name: 'reservationUrgentAmount' },
+		{ name: 'urgentType' },
+		{ name: 'urgentReservationGroupId' },
 		{ name: 'urgentAmount' },
 		{ name: 'urgentLevelId' },
 		{ name: 'urgentLevelName' }
 	]
 });
 
 var columns = [{
-	header: '物品名称',
+	header: '物品/分组名称',
 	minWidth: 250,
 	sortable: true,
 	xtype: 'treecolumn',
Index: ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordForm.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordForm.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordForm.js	(revision 39503)
@@ -0,0 +1,197 @@
+var configWin;
+var formPanel;
+
+top.Ext4.define('columnTreeGrid', {
+	extend: 'Ext4.tree.Panel',
+	xtype: 'tree-grid',
+	useArrows: true,
+	rootVisible: true,
+	multiSelect: true,
+	columnLines: false,
+	rowLines: false,
+	cls: 'no-leaf-icons',
+	initComponent: function () {
+		this.superclass.initComponent.call(this);
+	}
+});
+
+function saveTousses(ids, names) {
+	top.Ext4.getCmp('tousseDeinfinitionIds').setValue(ids);
+	top.Ext4.getCmp('tousseDeinfinitionNames').setValue(names);
+}
+
+//关闭预约加急分组设置的窗口
+function cancel() {
+	configWin.close();
+}
+
+//编辑预约加急分组
+function editConfig(record) {
+	showAddOrEditWindow(record.id);
+	if (!Ext4.isEmpty(record.id)) {
+		top.Ext4.getCmp('id').setValue(record.id);
+		top.Ext4.getCmp('name').setValue(record.name);
+		top.Ext4.getCmp('tousseDeinfinitionNames').setValue(record.tousseDeinfinitionNames);
+		top.Ext4.getCmp('tousseDeinfinitionIds').setValue(record.tousseDeinfinitionIds);
+	}
+}
+
+//删除预约加急分组
+function deleteConfig(grid) {
+	var selectedRecords = grid.getSelectionModel().getSelection();
+	var selectedCount = grid.getSelectionModel().getCount();
+	var ids = [];
+	if (selectedCount < 1) {
+		showResult("请选择要删除的数据");
+	} else {
+		for (var i = 0, len = selectedRecords.length; i < len; i++) {
+			ids[i] = selectedRecords[i].data['id'];
+		}
+		Ext4.MessageBox.confirm("请确认", "确定要删除选中的信息吗？", function (button, text) {
+			if ("yes" == button) {
+				Ext4.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/baseData/useRecord/urgentReservationGroupController/batchDeleteUrgentReservationGroup.mhtml',
+					params: { ids: ids.join(';') },
+					success: function (response, options) {
+						var result = Ext4.JSON.decode(response.responseText);
+						var success = result.success;
+						if (true != success) {
+							showResult(result.message);
+						} else {
+							showResult('删除成功!');
+							listStore.load();
+						}
+					},
+					failure: function (response, options) {
+						var result = Ext.decode(response.responseText);
+						showResult(result.message);
+					}
+				});
+			}
+		});
+	}
+}
+
+//保存预约加急分组
+function saveConfig() {
+	formPanel.form.submit({
+		url: WWWROOT + '/disinfectSystem/baseData/useRecord/urgentReservationGroupController/saveUrgentReservationGroup.mhtml',
+		method: 'POST',
+		waitMsg: '正在保存数据，请稍候',
+		timeout: 600000,
+		waitTitle: '提交表单',
+		success: function (form, action) {
+			configWin.close();
+			listStore.load();
+			showResult('保存成功');
+		},
+		failure: function (form, action) {
+			if (action.result.msg) {
+				showResult(action.result.msg);
+			} else if (action.result.message) {
+				showResult(action.result.message);
+			} else {
+				showResult('保存失败');
+			}
+		}
+	});
+}
+
+//弹出预约加急分组设置的窗口
+function showAddOrEditWindow(id) {
+	formPanel = new top.Ext4.form.Panel({
+		id: 'configForm',
+		frame: true,
+		labelSeparator: ':',
+		bodyStyle: 'padding:5px 5px 0px 5px;',
+		width: 800,
+		fieldDefaults: {
+			labelAlign: 'right',
+			labelWidth: 70
+		},
+		buttonAlign: 'center',
+		items: [{
+			xtype: 'hidden',
+			id: 'tousseDeinfinitionIds',
+			name: 'tousseDeinfinitionIds'
+		}, {
+			xtype: 'hidden',
+			id: 'id',
+			name: 'id',
+			value: id
+		}, {
+			layout: 'column',
+			items: [{
+				columnWidth: .8,
+				layout: 'form',
+				items: [{
+					xtype: 'textfield',
+					fieldLabel: '名称',
+					id: 'name',
+					name: 'name',
+					allowBlank: false,
+					anchor: '98%'
+				}, {
+					xtype: 'textarea',
+					fieldLabel: '器械包',
+					id: 'tousseDeinfinitionNames',
+					name: 'tousseDeinfinitionNames',
+					height: 230,
+					allowBlank: false,
+					readOnly: true,
+					anchor: '98%'
+				}]
+			}, {
+				columnWidth: .2,
+				layout: 'form',
+				border: 0,
+				items: [{
+					xtype: 'button',
+					text: '选择器械包',
+					listeners: {
+						click: function () {
+							var tousseDeinfinitionNames = top.Ext4.getCmp('tousseDeinfinitionNames').getValue();
+							var tousseDeinfinitionIds = top.Ext4.getCmp("tousseDeinfinitionIds").getValue();
+							openSelectTousse(tousseDeinfinitionNames, tousseDeinfinitionIds, 'scheduleExpeditedGroupSettingOfUseRecordForm', false);
+						}
+					}
+				}]
+			}]
+		}],
+		buttons: [{
+			id: 'saveBtn',
+			text: '保存',
+			handler: function () {
+				if (formPanel.getForm().isValid()) {
+					saveConfig();
+				} else {
+					showResult('请填写表单！');
+					return false;
+				}
+			}
+		}, {
+			text: '取消',
+			handler: cancel
+		}]
+	});
+
+	configWin = new top.Ext4.window.Window({
+		id: 'configWin',
+		layout: 'border',
+		title: '预约加急分组设置',
+		width: 700,
+		height: 400,
+		border: false,
+		plain: true,
+		modal: true,
+		items: [{
+			region: 'center',
+			width: 400,
+			layout: 'fit',
+			items: [formPanel]
+		}]
+	});
+
+	configWin.show();
+}
+
Index: ssts-web/src/main/webapp/disinfectsystem/common/selectTousseExt4.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/common/selectTousseExt4.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/common/selectTousseExt4.js	(revision 39503)
@@ -0,0 +1,251 @@
+var tousseWin;
+var tousseListStore;
+
+//删除选择的器械包
+function removeTousseItem(id) {
+    for (var i = 0; i < tousseListStore.getCount(); i++) {
+        var item = tousseListStore.data.items[i];
+        if (item.data.id == id) {
+            tousseListStore.remove(item)
+        }
+    }
+}
+
+//检查器械包是否存在
+function isTousseRepeat(name) {
+    if (name != null && name.length > 0) {
+        for (var i = 0; i < tousseListStore.getCount(); i++) {
+            var record = tousseListStore.getAt(i);
+            var tempName = record.get('name');
+            if (name == tempName) {
+                return true;
+            }
+        }
+    }
+    return false;
+}
+
+//添加器械包
+function addTousseItem(id, name) {
+    if (name == null || name == '') {
+        showResult('请选择器械包！');
+        return false;
+    }
+    var b = isTousseRepeat(name);
+    if (b) {
+        showResult('器械包：[' + name + '] 已存在！');
+        top.Ext4.getCmp('tousseName').setValue("");
+        return false;
+    }
+    var record = {
+        id: id,
+        name: name
+    };
+    tousseListStore.add(record)
+    top.Ext4.getCmp("tousseName").setValue("");
+}
+
+//添加搜索结果的器械包
+function addTousseItems(id, name) {
+    var b = isTousseRepeat(name);
+    if (b) {
+        return;
+    }
+    var record = {
+        id: id,
+        name: name
+    };
+    tousseListStore.add(record)
+}
+
+//保存选择的器械包
+function saveTousseName() {
+    var idArr = [];
+    var nameArr = [];
+
+    for (var i = 0; i < tousseListStore.getCount(); i++) {
+        var record = tousseListStore.getAt(i);
+        idArr[i] = record.get('id');
+        nameArr[i] = record.get('name');
+    }
+
+    if (idArr.length == 0) {
+        showResult('请选择一个器械包');
+        return
+    }
+
+    var ids = idArr.join(';');
+    var names = nameArr.join(';');
+
+    saveTousses(ids, names);
+    tousseWin.close();
+}
+
+//打开选择器械包的窗口
+function openSelectTousse(names, ids) {
+    var tousseJsonStore = new top.Ext4.data.Store({
+        pageSize: 9999,
+        proxy: {
+            type: 'ajax',
+            url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchComboTousseData.do',
+            reader: {
+                type: 'json',
+                totalProperty: 'totalCount',
+                root: 'data'
+            },
+            extraParams: {
+                excludeUrgentReservationGroupTousse: true
+            }
+        },
+        fields: [
+            { name: 'id', mapping: 'id' },
+            { name: 'spelling', mapping: 'spelling' },
+            { name: 'name', mapping: 'name' },
+            { name: 'displayName', mapping: 'displayName' },
+            { name: 'amount', mapping: 'amount' }
+        ]
+    });
+
+    tousseListStore = new top.Ext4.data.Store({
+        fields: [
+            { name: 'id', mapping: 'id' },
+            { name: 'name', mapping: 'name' }
+        ]
+    });
+
+    tousseJsonStore.load();
+
+    if (((names || '') !== '') && ((ids || '') !== '')) {
+        var nameArr = names.split(';');
+        var idArr = ids.split(';');
+        for (var i = 0; i < nameArr.length; i++) {
+            var record = {
+                name: nameArr[i],
+                id: idArr[i]
+            };
+            tousseListStore.add(record)
+        }
+    }
+
+    var tbar = [{
+        text: '选择器械包:'
+    }, {
+        xtype: 'combo',
+        id: 'tousseName',
+        name: 'tousseName',
+        queryParam: 'spell',
+        fieldLabel: '',
+        minChars: 0,
+        valueField: 'id',
+        displayField: 'name',
+        width: 320,
+        store: tousseJsonStore,
+        listeners: {
+            select: function (combo, record, index) {
+                var id = record[0].data.id;
+                var name = record[0].data.name;
+                addTousseItem(id, name);
+            }
+        }
+    }, {
+        text: '添加器械包',
+        iconCls: 'btn_ext_application_add',
+        handler: function () {
+            for (var i = 0; i < tousseJsonStore.getCount(); i++) {
+                var id = tousseJsonStore.getAt(i).get('id');
+                var name = tousseJsonStore.getAt(i).get('name');
+                addTousseItems(id, name)
+            }
+            top.Ext4.getCmp("tousseName").setValue("");
+        }
+    }, {
+        text: '添加所有',
+        iconCls: 'btn_ext_application_add',
+        handler: function () {
+            tousseJsonStore.load();
+            top.Ext4.getCmp("tousseName").setValue("");
+            setTimeout(function () {
+                for (var i = 0; i < tousseJsonStore.getCount(); i++) {
+                    var id = tousseJsonStore.getAt(i).get('id');
+                    var name = tousseJsonStore.getAt(i).get('name');
+                    addTousseItems(id, name)
+                }
+            }, 200);
+        }
+    }, {
+        text: '清空所有',
+        iconCls: 'btn_ext_application_del',
+        handler: function () {
+            tousseListStore.removeAll();
+        }
+    }]
+
+    var columns = [{
+        header: "器械包名称",
+        dataIndex: 'name',
+        width: 585,
+        menuDisabled: true
+    }, {
+        id: 'deleteItem',
+        header: '操作',
+        width: 100,
+        menuDisabled: true,
+        dataIndex: 'button',
+        renderer: function (v, p, record, index) {
+            return "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"getCurrentTab().removeTousseItem(\'" + record.get('id') + "\');\" >";
+        }
+    }]
+
+    var grid = new top.Ext4.grid.GridPanel({
+        title: '',
+        id: 'girdID',
+        columns: columns,
+        frame: false,
+        width: 710,
+        height: 400,
+        store: tousseListStore,
+        tbar: tbar,
+        viewConfig: {
+            autoFill: true
+        }
+    });
+
+    tousseWin = new top.Ext4.window.Window({
+        id: 'tousseWin',
+        layout: 'border',
+        title: '添加器械包',
+        width: 760,
+        height: 500,
+        border: 0,
+        modal: true,
+        defaults: {
+            bodyStyle: "background-color: none",
+            frame: true,
+            border: false
+        },
+        style: 'padding:20px',
+        items: [{
+            region: "west",
+            width: 720,
+            border: 0,
+            title: '',
+            items: [grid]
+        }],
+        buttonAlign: 'center',
+        buttons: [{
+            id: 'confirmBtn',
+            text: '确定',
+            handler: function () {
+                saveTousseName();
+            }
+        }, {
+            text: '取消',
+            handler: function () {
+                tousseWin.close();
+            }
+        }]
+    });
+
+    tousseWin.show();
+}
+
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r39416 -r39503
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 39416)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 39503)
@@ -1190,7 +1190,7 @@
  * 《使用记录》菜单(启用科室使用记录配置项,该菜单名为病人使用记录)
  */
 var SSTS_UseRecord_Menu = true;
-<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager">
+<operation:authorize ifAnyGranted="SSTS_UseRecord_SeeAll,SSTS_UseRecord_SeeAllDepart,SSTS_UseRecord_Convert,SSTS_UseRecord_Review,SSTS_UseRecord_Create,SSTS_UseRecord_Update,SSTS_UseRecord_Select,SSTS_UseRecord_Delete,SSTS_ScheduleExpeditedOfUseRecord_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
 	if (!sstsConfig.disableUseRecord && !notInWhiteList(sstsConfig, 'useRecord')) {
 		SSTS_UseRecord_Menu = false;
 	}
@@ -1215,7 +1215,17 @@
 		SSTS_ScheduleExpeditedOfUseRecord_Manager = false
 	}
 </operation:authorize>
+
 /**
+ * 《GDSRMYY-623：预约加急分组设置》菜单
+ */
+var SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = true;
+<operation:authorize ifAnyGranted="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_list">
+	if(sstsConfig.enableScheduleExpeditedOfUseRecord){
+		SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = false
+	}
+</operation:authorize>
+/**
  * 《质量监测管理》总菜单
  */
 var SSTS_QualityRecord_Menu = true;
Index: ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp	(revision 39503)
@@ -0,0 +1,48 @@
+<%@page import="java.util.Date"%>
+<%@page import="java.text.SimpleDateFormat"%>
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+<%
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+    request.setAttribute("orgunit",AcegiHelper.getLoginUser().getCurrentOrgUnitName());
+    request.setAttribute("orgUnitCoding",AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig());
+    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+    request.setAttribute("today", dateFormat.format(new Date()));
+%>
+
+<html>
+<head>
+<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%@ include file="/common/includeExtJs4_2.jsp"%>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>预约加急分组设置</title>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
+</head>
+<body>
+<style>
+    #departLeft .x4-panel-body-default,#departRight .x4-panel-body-default{
+        background: none;
+    }
+    #departLeft .x4-form-item-label-left,#departRight .x4-form-item-label-left{
+        padding-left: 10px;
+    }
+    .x4-grid-cell a:visited, .x4-grid-cell a:active, .x4-grid-cell a:hover, .x4-grid-cell a:link {
+        color: #367f21 !important;
+        text-decoration: none !important;
+    }
+</style>
+<script>
+    var SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = true;
+    <operation:authorize ifAnyGranted="SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager">
+        if (sstsConfig.enableScheduleExpeditedOfUseRecord) {
+            SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager = false
+        }
+    </operation:authorize>
+</script>
+<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/selectTousseExt4.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="scheduleExpeditedGroupSettingOfUseRecordView.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="scheduleExpeditedGroupSettingOfUseRecordForm.js?version=${svnRevision}"></script>
+
+</body>
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r39371 -r39503
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 39371)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 39503)
@@ -160,7 +160,8 @@
 	children:[
         {hidden :SSTS_UseRecord_Menu,text:sstsConfig.enableDepartmentUseRecord ? "病人使用记录" : "使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DepartmentUseRecord_Menu,text:"科室使用记录",href:WWWROOT+'/disinfectsystem/useRecord/useRecordView.jsp?departmentUseRecord=true',hrefTarget:linkTarget,leaf:true},
-		{hidden :SSTS_ScheduleExpeditedOfUseRecord_Manager,text:"预约加急管理",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}
+		{hidden :SSTS_ScheduleExpeditedOfUseRecord_Manager,text:"预约加急管理",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
+		{hidden :SSTS_ScheduleExpeditedOfUseRecord_GroupSetting_Manager,text:"预约加急分组设置",href:WWWROOT+'/disinfectsystem/scheduleExpeditedOfUseRecord/scheduleExpeditedGroupSettingOfUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 });
 
Index: ssts-web/src/main/webapp/ext/fontSize15/styles/common.css
===================================================================
diff -u -r39487 -r39503
--- ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 39487)
+++ ssts-web/src/main/webapp/ext/fontSize15/styles/common.css	(.../common.css)	(revision 39503)
@@ -539,4 +539,16 @@
 #monthlyPeopleCountForm-body .x4-panel-body-default {
     background: none !important;
     border: none;
+}
+
+/* GDSRMYY-623：预约加急分组*/
+.tousseInfoButton {
+    border: 0 !important;
+}
+.tousseInfoButton .x4-btn-default-small {
+    background: none !important;
+    border: 0 !important;
+}
+.tousseInfoButton .x4-btn-default-small .x4-btn-inner {
+    color: #367f21 !important;
 }
\ No newline at end of file