Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r31645 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 31645)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 31728)
@@ -112,7 +112,7 @@
   // 器械包定义可以批量修改
   tousseDefinitionCanBatchEdit:true,
   // 第一次登陆是否需要强制修改密码
-  needForceModifyPwdWhenFirstTime:true,
+  needForceModifyPwdWhenFirstTime:false,
   //‘一次性物品申领单’显示弹出框显示的数量为申领单位(true表示显示申领单位的数量,如果该一次性物品不存在申领单位,则用原来单位的数量,false或者不配置默认用原来单位的数量)
   showMiddlePackageAmount : true,
   // 开启PDA一键扫描发放一次性物品功能
@@ -217,5 +217,7 @@
   useRecordConvertRecyclingApplicationMergeRegular:"depart",
    //是否启用扫码登录
   enableScanBarcodeLogin:false,
+  //启用【器械包种类定义】功能
+  enableInstrumentSetTypeSetting:true,
   forceUserChangePwdWhenNotMeetPwdComplexityReq:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.js
===================================================================
diff -u -r26240 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.js	(.../customTousseDefinitionView.js)	(revision 26240)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.js	(.../customTousseDefinitionView.js)	(revision 31728)
@@ -13,6 +13,11 @@
     });
 }
 
+function reloadGridData(id){
+	$Id("parm_s_instrumentSetTypeId").value = id;
+	grid.dwrReload();	
+}
+
 function downLoadImageFile(id){
     location.href = WWWROOT + "/disinfectsystem/basedatamanager/tousse/downloadImage.jsp?id="+id;
 }
@@ -233,13 +238,30 @@
 		}, readerDetail, TousseDefinitionTableManager.findCustomTousseDefinitionTableList, dwrCallParams // 这个参数只是占位作用
 		);
 
+		var items = [{
+            region:'center',
+            xtype : 'panel',
+            margins : '0 0 0 0',
+            layout:'fit',
+            items:grid
+        }];
+
+		if(!SSTS_TousseInstanceType_list){
+			var treePanel = new GetInstrumentSetTypeTreePanelForExt2();
+
+			panel = treePanel.getTreePanel();
+
+			items = [panel,{
+				region:'center',
+				xtype : 'panel',
+				margins : '0 0 0 0',
+				layout:'fit',
+				items:grid
+			}];
+		}
+
 		var viewport = new Ext.Viewport( {
 			layout : 'border',
-			items : [{
-				region : 'center',
-				margins : '0 0 0 0',
-				layout : 'fit',
-				items : grid
-			} ]
+			items : items
 		});
 	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r31398 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 31398)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 31728)
@@ -52,7 +52,6 @@
 var defaultIdCardPaperType = '中标签';
 
 var isLastRow = false;//记录当前编辑的行是否是最后一行
-
 function sortFun_sequence_asc(r1,r2){
 	var sequence1Str = r1.get('sequence');
 	var sequence2Str = r2.get('sequence');
@@ -2542,31 +2541,58 @@
 			    		  anchor : '100%'
 			    	  }]
 			      }, {
-		    	  columnWidth : 1,
-		    	  layout : 'form',
+		    	  	columnWidth : 1,
+		    	  	layout : 'form',
 				    labelWidth : fontSize == 12 ? 90 : 100,
-						labelAlign:"right",
-						hidden : !sstsConfig.enableTousseDefinitionBelongDepart,
-		    	  items:[{
-							//用于保存时：传递所属科室编码
-							xtype : 'hidden',
-							id : 'belongDepartCodes',
-							name : 'belongDepartCodes'
-						},{
-							xtype : 'trigger',
-		    		  fieldLabel : "所属科室",
-		    		  allowBlank : true,
-		    		  name : "belongDepartNames",
-							id : "belongDepartNames",
-							msgTarget:'side',
-							readOnly:true,
-							onTriggerClick : function(){
-								setDepartOrgUnit('belongDepartCodes' , 'belongDepartNames' , top.Ext.getCmp('belongDepartCodes').getValue(),belongOrgUnit);
-							},
-			        triggerClass : 'x-form-search-trigger',
-		    		  anchor : '100%'
-		    	  }]
-		      },{
+					labelAlign:"right",
+					hidden : !sstsConfig.enableTousseDefinitionBelongDepart,
+					items:[{
+						//用于保存时：传递所属科室编码
+						xtype : 'hidden',
+						id : 'belongDepartCodes',
+						name : 'belongDepartCodes'
+					},{
+						xtype : 'trigger',
+						fieldLabel : "所属科室",
+						allowBlank : true,
+						name : "belongDepartNames",
+						id : "belongDepartNames",
+						msgTarget:'side',
+						readOnly:true,
+						onTriggerClick : function(){
+							setDepartOrgUnit('belongDepartCodes' , 'belongDepartNames' , top.Ext.getCmp('belongDepartCodes').getValue(),belongOrgUnit);
+						},
+						triggerClass : 'x-form-search-trigger',
+						anchor : '100%'
+					}]
+		      	}, {
+					columnWidth : 1,
+					layout : 'form',
+					labelWidth : fontSize == 12 ? 90 : 100,
+					labelAlign:"right",
+					hidden : SSTS_TousseInstanceType_list,
+					items:[{
+						//用于保存时：传递所属种类id
+						xtype : 'hidden',
+						id : 'instrumentSetType',
+						name : 'instrumentSetType'
+					},{
+						xtype : 'trigger',
+						fieldLabel : "所属种类",
+						allowBlank : true,
+						name : "instrumentSetTypeName",
+						id : "instrumentSetTypeName",
+						msgTarget:'side',
+						readOnly:true,
+						onTriggerClick : function(){
+							var ids = top.Ext.getCmp('instrumentSetType').getValue();
+							var names = top.Ext.getCmp('instrumentSetTypeName').getValue();
+							setInstrumentSetType('instrumentSetType' , 'instrumentSetTypeName' , ids, names);
+						},
+						triggerClass : 'x-form-search-trigger',
+						anchor : '100%'
+					}]
+				},{
 		    	   columnWidth : colWidth,
 			       layout : 'form',
                     labelAlign:"right",
@@ -3008,6 +3034,19 @@
 				if(tousseDefinition.riskLevel == 0){
 					top.Ext.getCmp("riskLevel").setValue('')
 				}
+				var ids = [];
+				var names = [];
+				if(tousseDefinition.instrumentSetTypeJSONArray.length > 0){
+					for(var i=0;i<tousseDefinition.instrumentSetTypeJSONArray.length;i++){
+						ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
+						names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
+					}
+					top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
+					top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
+				}else {
+					top.Ext.getCmp('instrumentSetType').setValue('');
+					top.Ext.getCmp('instrumentSetTypeName').setValue('');
+				}
 			}
 		});
 	} else {
@@ -3098,6 +3137,8 @@
 	var rowIndex = configGridStore.getCount();//grid的行数 
 	//所属科室编码s
 	var belongOrgUnitCodes = top.Ext.getCmp('belongDepartCodes').getValue();
+	//所属种类
+	var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue();
 	var materials = [];
 	// 设置序号
 	setMaterialSequence();
@@ -3172,6 +3213,7 @@
 					params : {
 						materialDefinitionConfigResult : JSON.stringify(materials),
 						belongOrgUnitCodes : belongOrgUnitCodes,
+						instrumentSetTypeIds:instrumentSetType,
 						belongOrgUnit : JSON.stringify(belongOrgUnit),
 						expendTousseImg:expendTousseImg,
 						expendInstructionBook:expendInstructionBook,
Index: ssts-web/src/main/webapp/js/common.js
===================================================================
diff -u -r31678 -r31728
--- ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 31678)
+++ ssts-web/src/main/webapp/js/common.js	(.../common.js)	(revision 31728)
@@ -3711,4 +3711,502 @@
     doc.contentWindow.document.getElementById('jsFileName').value = jsFileName;
     doc.contentWindow.document.getElementById('htmlTable').value = htmlTable;
     doc.contentWindow.document.getElementById('submitForm').click();
+}
+
+//GDSZYY-86：添加器械包种类的树状结构，应用于【器械包种类定义】、【器械包定义管理】、【自定义器械包管理】、【聚合包定义管理】
+function GetInstrumentSetTypeTreePanel() {
+    this.init = function () {
+        try { } catch (e) { }
+    }
+    var that = this;
+    this.search = function (searchId) {
+        if (searchId !== '') {
+            reloadGridData(searchId);
+        } else {
+            showResult('请输入器械包种类定义的名称');
+        }
+    }
+    this.getTreeStore = function (expanded) {
+        var leftStore = Ext4.create('Ext4.data.TreeStore', {
+            nodeParam: 'parentId',
+            root: {//根节点
+                id: '',
+                text: '器械包种类',
+                leaf: false,
+                expanded: expanded
+            },
+            proxy: {
+                type: 'ajax',
+                url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!treeLoad.do',
+                reader: {
+                    root: 'data'
+                }
+            }
+        })
+        return leftStore;
+    }
+    this.loadInstrumentSetTypeById = function (id, treepanel) {
+        Ext4.Ajax.request({
+            url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!loadInstrumentSetTypeById.do',
+            params: {
+                id: id
+            },
+            success: function (response) {
+                var result = Ext4.decode(response.responseText);
+
+                if (result.success) {
+                    var parentIdPath = result.data.parentIdPath;
+                    parentIdPath = parentIdPath.replace('/0', '/');
+                    treepanel.expandPath(parentIdPath)
+                }
+            }
+        });
+    }
+    this.getTreePanel = function (leftStore) {
+        var instrumentSetTypeStore = Ext4.create('Ext4.data.Store', {
+            autoLoad: true,
+            fields: [{ name: 'name' }, { name: 'id' }, { name: 'parentId' }],
+            proxy: {
+                type: 'ajax',
+                url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!getInstrumentSetTypeBySpellingAndWB.do',
+                reader: {
+                    type: 'json',
+                    root: 'data'
+                }
+            }
+        });
+        var treepanel = Ext4.create('Ext4.tree.Panel', {
+            region: 'west',
+            id: 'tousseTypeWest',
+            width: 250,
+            split: true,
+            minWidth: 200,
+            rootVisible: true,
+            useArrows: false,
+            collapsible: false,
+            store: leftStore,
+            listeners: {
+                itemclick: function (dv, record, item, index, e) {
+                    if (index == 0) {
+                        reloadGridData(0);
+                    }
+                }
+            },
+            tbar: [
+                new Ext4.Action({
+                    text: '展开',
+                    handler: function () {
+                        treepanel.expandAll();
+                    }
+                }), '-',
+                new Ext4.Action({
+                    text: '折叠',
+                    handler: function () {
+                        treepanel.collapseAll();
+                    }
+                }), '-', {
+                    xtype: 'hidden',
+                    name: 'searchID',
+                    id: 'searchID'
+                },
+                {
+                    xtype: 'combo',
+                    id: 'searchField',
+                    name: 'searchField',
+                    queryParam: 'spell',
+                    minChars: 0,
+                    emptyText: '输入器械包种类名称查询',
+                    hideLabel: true,
+                    valueField: 'id',
+                    displayField: 'name',
+                    store: instrumentSetTypeStore,
+                    forceSelection: false,
+                    lazyInit: true,
+                    width: 150,
+                    listWidth: 200,
+                    triggerAction: 'all',
+                    hideTrigger: true,
+                    typeAhead: false,
+                    allowBlank: true,
+                    anchor: '100%',
+                    listeners: {
+                        select: function (combo, record, index) {
+                            Ext4.getCmp('searchField').setValue(record[0].data.name);
+                            Ext4.getCmp('searchID').setValue(record[0].data.id);
+                            that.search(record[0].data.id);
+                            treepanel.getSelectionModel().select(record[0]);
+                            if (record[0].data.parentId !== 0) {
+                                that.loadInstrumentSetTypeById(record[0].data.id, treepanel);
+                            }
+                        }
+                    }
+                }
+            ]
+        });
+        return treepanel;
+    }
+}
+
+function GetInstrumentSetTypeTreePanelForExt2() {
+    this.init = function () {
+        try { } catch (e) { }
+    }
+    var that = this;
+    this.search = function (searchId) {
+        if (searchId !== '') {
+            var treePanel = Ext.getCmp('west-panel');
+            Ext.Ajax.request({
+                url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!loadInstrumentSetTypeById.do',
+                params: { id: searchId },
+                success: function (response, options) {
+                    var result = Ext.decode(response.responseText);
+                    if (result.success) {
+                        var parentIdPath = result.data.parentIdPath;
+                        treePanel.expandPath(parentIdPath + '/' + searchId, 'id', function (bSuccess, oLastNode) {
+                            if (bSuccess) {
+                                oLastNode.on('click', function (node, event) {
+                                    reloadGridData(node.id);
+                                });
+                                oLastNode.ensureVisible();
+                                oLastNode.select();
+                                oLastNode.fireEvent('click', oLastNode);
+                            }
+                        });
+                    }
+                }
+            });
+        } else {
+            showResult('请输入器械包种类定义的名称');
+        }
+    }
+    this.getTreePanel = function () {
+        var root = new Ext.tree.AsyncTreeNode({
+            text: '器械包种类',
+            id: '0',
+            expanded: true,
+            listeners: {
+                click: function () {
+                    reloadGridData(0);
+                }
+            }
+        });
+
+        var myLoader = new Ext.tree.TreeLoader({
+            dataUrl: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!treeLoad.do',
+            reader: {
+                root: 'data'
+            }
+        });
+
+        myLoader.on("beforeload", function (treeLoader, node) {
+            treeLoader.baseParams.parentId = node.id;
+        });
+
+        var typeJsonStore = new Ext.data.Store({
+            proxy: new Ext.data.HttpProxy({
+                url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!getInstrumentSetTypeBySpellingAndWB.do',
+                method: 'POST'
+            }),
+            baseParams: {
+                parentId: 0
+            },
+            reader: new Ext.data.JsonReader({
+                root: 'data'
+            }, [{
+                name: 'name'
+            }, {
+                name: 'id'
+            }, {
+                name: 'parentId'
+            }])
+        });
+
+        var treepanel = {  //西面的树
+            region: 'west',
+            id: 'west-panel',
+            lines: false,
+            margins: '0 0 5 5',
+            cmargins: '0 0 0 0',
+            layout: 'accordion',
+            layoutConfig: {
+                animate: true
+            },
+            collapsible: true,  //允许折叠
+            animCollapse: true,   //折叠时是否有动画效果
+            split: true,  //是否允许拖动大小，与下面的折叠形式配合
+            collapseMode: 'mini', //折叠形式
+            width: 250,
+            minSize: 100,
+            maxSize: 400,
+            xtype: 'treepanel',
+            loader: myLoader,   //数据加载
+            autoScroll: true,
+            root: root,
+            tbar: [
+                new Ext.Action({
+                    text: '展开',
+                    handler: function () {
+                        var treePanel = Ext.getCmp('west-panel');
+                        treePanel.expandAll();
+                    }
+                }), '-',
+                new Ext.Action({
+                    text: '折叠',
+                    handler: function () {
+                        var treePanel = Ext.getCmp('west-panel');
+                        treePanel.collapseAll();
+                    }
+                }), '-', {
+                    xtype: 'hidden',
+                    name: 'searchID',
+                    id: 'searchID'
+                },
+                {
+                    xtype: 'combo',
+                    id: 'searchField',
+                    name: 'searchField',
+                    queryParam: 'spell',
+                    minChars: 0,
+                    emptyText: '输入器械包种类名称查询',
+                    hideLabel: true,
+                    valueField: 'id',
+                    displayField: 'name',
+                    store: typeJsonStore,
+                    forceSelection: true,
+                    lazyInit: true,
+                    width: 150,
+                    listWidth: 200,
+                    triggerAction: 'all',
+                    hideTrigger: true,
+                    typeAhead: false,
+                    allowBlank: true,
+                    anchor: '100%',
+                    listeners: {
+                        select: function (combo, record, index) {
+                            Ext.getCmp('searchField').setValue(record.data.name);
+                            Ext.getCmp('searchID').setValue(record.data.id);
+                            that.search(record.data.id);
+                        }
+                    }
+                }
+            ]
+        };
+        return treepanel;
+    }
+}
+
+//GDSZYY-86：弹出所属种类的窗口，应用于【器械包定义管理】、【自定义器械包管理】、【聚合包定义管理】
+function removeSelect_TypeItem(index) {
+    var records = top.Ext.getCmp('select_TypeGrid').getSelectionModel().getSelections();
+    top.Ext.getCmp('select_TypeGrid').getStore().remove(records[0]);
+}
+function setInstrumentSetType(extHiddenElementId, extComboElementId, ids, names) {
+    //科室的窗口
+    var win;
+    //确定保存
+    function saveSelect(extHiddenElementId, extComboElementId) {
+        var idsArr = [];
+        var nameArr = [];
+        for (var i = 0; i < select_TypeGridStore.getCount(); i++) {
+            var record = select_TypeGridStore.getAt(i);
+            idsArr.push(record.get('id'));
+            nameArr.push(record.get('name'));
+        }
+        if (idsArr.length != 0) {
+            top.Ext.getCmp(extHiddenElementId).setValue(idsArr.join(";"));
+            top.Ext.getCmp(extComboElementId).setValue(nameArr.join(";"));
+        } else {
+            top.Ext.getCmp(extHiddenElementId).setValue("");
+            top.Ext.getCmp(extComboElementId).setValue("");
+        }
+        select_TypeGridStore.removeAll();
+        win.close();
+    }
+
+    //科室record
+    var idAndNameRecord = Ext.data.Record.create([{
+        name: 'id'
+    },
+    {
+        name: 'name'
+    }
+    ]);
+
+    /**
+     * 添加所选择的科室名称
+     */
+    function addSelect_Type() {
+        var id = top.Ext.getCmp('select_type').getValue();
+        var name = top.Ext.getCmp('select_type').getRawValue();
+        if (id) {
+            var isExist = false;
+            for (var i = 0; i < select_TypeGridStore.getCount(); i++) {
+                var record = select_TypeGridStore.getAt(i);
+                if (record.get('id') == id) {
+                    isExist = true;
+                    break;
+                }
+            }
+            if (!isExist) {
+                var record = new idAndNameRecord({
+                    id: id,
+                    name: name
+                });
+                select_TypeGridStore.add(record);
+                top.Ext.getCmp('select_type').setValue('');
+                top.Ext.getCmp('select_type').setRawValue('');
+            } else {
+                showResult("器械包种类:" + name + "已添加,请不要重复添加！");
+            }
+        } else {
+            showResult("请选择器械包种类");
+        }
+    }
+    select_TypeGridStore = new top.Ext.data.Store({
+        reader: idAndNameRecord
+    });
+    var cm = new top.Ext.grid.ColumnModel([{
+        header: "种类名称",
+        width: 140,
+        dataIndex: 'name'
+    }, {
+        header: '删除',
+        width: 40,
+        menuDisabled: true,
+        dataIndex: 'button',
+        renderer: function (v, p, record, index) {
+            return "<img src=\"" + WWWROOT + "/images/web/stop.png\" onclick=\"getCurrentTab().removeSelect_TypeItem(" + index + ");\" >";
+        }
+    }]);
+
+    //种类数据源
+    var typeJsonStore = new Ext.data.Store({
+        proxy: new Ext.data.HttpProxy({
+            url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!getInstrumentSetTypeBySpellingAndWB.do',
+            method: 'POST'
+        }),
+        reader: new Ext.data.JsonReader({
+            root: 'data'
+        }, [{
+            name: 'id',
+            mapping: 'id'
+        },
+        {
+            name: 'name',
+            mapping: 'name'
+        }
+        ])
+    });
+
+    //顶部的工具栏
+    var tbar = [{
+        text: '选择器械包种类'
+    }, {
+        xtype: 'combo',
+        id: 'select_type',
+        name: 'select_type',
+        queryParam: 'spell',
+        fieldLabel: '种类名称',
+        minChars: 0,
+        valueField: 'id',
+        displayField: 'name',
+        anchor: '100%',
+        width: 200,
+        store: typeJsonStore,
+        lazyInit: true,
+        triggerAction: 'all',
+        hideTrigger: true,
+        typeAhead: false,
+        allowBlank: true,
+        listeners: {
+            select: function (combo, record, index) {
+                var tem = record.data.id;
+                var name = record.data.name;
+                top.Ext.getCmp('select_type').setValue(tem);
+                top.Ext.getCmp('select_type').setRawValue(name);
+            }
+        }
+    }, {
+        text: '添加',
+        handler: function () {
+            addSelect_Type();
+        }
+    }];
+
+    var select_TypeGridStoreFormObj = new top.Ext.FormPanel({
+        id: 'typeForm',
+        frame: true,
+        labelAlign: 'right',
+        labelSeparator: '：',
+        bodyStyle: 'padding:5px 5px 0px 5px',
+        autoWidth: true,
+        autoHeight: true,
+        autoScroll: true,
+        items: [{
+            layout: 'column',
+            items: [{
+                columnWidth: 1,
+                layout: 'form',
+                items: [
+                    new top.Ext.grid.GridPanel({
+                        id: 'select_TypeGrid',
+                        store: select_TypeGridStore,
+                        tbar: tbar,
+                        cm: cm,
+                        width: 140,
+                        height: 240,
+                        isCheckboxSelectionModel: true,
+                        frame: false,
+                        viewConfig: {
+                            forceFit: true
+                        },
+                        bodyStyle: 'border:1px solid #afd7af',
+                        anchor: '100%',
+                        selModel: new top.Ext.grid.RowSelectionModel({
+                            singleSelect: false
+                        })
+                    })
+                ]
+            }]
+        }],
+        buttons: [{
+            id: 'saveBtn2',
+            text: '确定',
+            handler: function () {
+                saveSelect(extHiddenElementId, extComboElementId);
+            }
+        }, {
+            id: 'cancleBtn2',
+            text: '取消',
+            handler: function () {
+                select_TypeGridStore.removeAll();
+                win.close();
+            }
+        }]
+    });
+
+    win = new top.Ext.Window({
+        id: 'formWindowDepartAndTaskGroupWin',
+        layout: 'fit',
+        title: '选择器械包种类',
+        width: 650,
+        modal: true,
+        autoHeight: true,
+        border: false,
+        plain: true,
+        items: [select_TypeGridStoreFormObj]
+    });
+    win.show();
+
+    if (names !== '') {
+        var nameArr = names.split(';');
+        var idsArr = ids.split(';');
+        for (var i = 0; i < nameArr.length; i++) {
+            var record = new idAndNameRecord({
+                id: idsArr[i],
+                name: nameArr[i]
+            });
+            select_TypeGridStore.add(record);
+        }
+    };
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js
===================================================================
diff -u -r31254 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 31254)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.js	(.../tousseView.js)	(revision 31728)
@@ -1,5 +1,8 @@
 var entityName = "器械包管理";
 var grid;
+var leftStore;
+var expanded = true;
+var hiddenParentId = 0;
 
 // 删除
 function deleteTousse(grid) {
@@ -44,6 +47,11 @@
 
 }
 
+function reloadGridData(id){
+	$Id("parm_s_instrumentSetTypeId").value = id;
+	grid.dwrReload();	
+}
+
 var refresh = function() {
 	grid.dwrReload();
 	grid.store.reload();
@@ -307,7 +315,7 @@
 			plugins : filters,
 			autoExpandColumn : 'wbCode',
 			searchDisableIndexes : ['isUploadImage','isUploadVideo','costPrice'],
-			renderTo : 'gridDiv',
+			//renderTo : 'gridDiv',
 			frame : false
 		}, readerDetail, TousseDefinitionTableManager.findTousseDefinitionTableList, dwrCallParams // 这个参数只是占位作用
 		);
@@ -328,13 +336,30 @@
 			});
 		};
 
+		var items = [{
+            region:'center',
+            xtype : 'panel',
+            margins : '0 0 0 0',
+            layout:'fit',
+            items:grid
+        }];
+
+		if(!SSTS_TousseInstanceType_list){
+			var treePanel = new GetInstrumentSetTypeTreePanelForExt2();
+
+			panel = treePanel.getTreePanel();
+
+			items = [panel,{
+				region:'center',
+				xtype : 'panel',
+				margins : '0 0 0 0',
+				layout:'fit',
+				items:grid
+			}];
+		}
+
 		var viewport = new Ext.Viewport( {
 			layout : 'border',
-			items : [{
-				region : 'center',
-				margins : '0 0 0 0',
-				layout : 'fit',
-				items : grid
-			} ]
+			items : items
 		});
 	});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js
===================================================================
diff -u -r29050 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js	(.../customTousseDefinitionForm.js)	(revision 29050)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionForm.js	(.../customTousseDefinitionForm.js)	(revision 31728)
@@ -714,6 +714,33 @@
 							id : "note",
 							anchor : '100%'
 						}]
+					},{
+						columnWidth : 1,
+						layout : 'form',
+						labelWidth : 120,
+						labelAlign:"right",
+						hidden : SSTS_TousseInstanceType_list,
+						items:[{
+							//用于保存时：传递所属种类id
+							xtype : 'hidden',
+							id : 'instrumentSetType',
+							name : 'instrumentSetType'
+						},{
+							xtype : 'trigger',
+							fieldLabel : "所属种类",
+							allowBlank : true,
+							name : "instrumentSetTypeName",
+							id : "instrumentSetTypeName",
+							msgTarget:'side',
+							readOnly:true,
+							onTriggerClick : function(){
+								var ids = top.Ext.getCmp('instrumentSetType').getValue();
+								var names = top.Ext.getCmp('instrumentSetTypeName').getValue();
+								setInstrumentSetType('instrumentSetType' , 'instrumentSetTypeName' , ids, names);
+							},
+							triggerClass : 'x-form-search-trigger',
+							anchor : '97%'
+						}]
 					}]
 				},{
 					columnWidth : 1,
@@ -799,6 +826,22 @@
 			method : 'GET',
 			waitMsg : '正在加载数据，请稍候',
 			success : function(form, action) {
+				if(action.result.success){
+					var data = action.result.data;
+					var ids = [];
+					var names = [];
+					if(data.instrumentSetTypeJSONArray.length > 0){
+						for(var i=0;i<data.instrumentSetTypeJSONArray.length;i++){
+							ids[i] = data.instrumentSetTypeJSONArray[i].id;
+							names[i] = data.instrumentSetTypeJSONArray[i].name;
+						}
+						top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
+						top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
+					}else {
+						top.Ext.getCmp('instrumentSetType').setValue('');
+						top.Ext.getCmp('instrumentSetTypeName').setValue('');
+					}
+				}
 			},
 			failure : function(form, action) {
 			},
@@ -831,6 +874,8 @@
 	var rowIndex = fmdStore.getCount();// grid的行数
 	var materialDefinitionConfigResult = "";
 	var jsonArray = new Array();
+	//所属种类
+	var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue();
 	for (var i = 0; i < rowIndex; i++) {
 		var record = fmdStore.getAt(i);
 		var name = record.get('name');
@@ -869,7 +914,8 @@
 					waitMsg : '正在保存数据，请稍候',
 					waitTitle : '提交表单',
 					params : {
-						materialDefinitionConfigResult : paramStr
+						materialDefinitionConfigResult : paramStr,
+						instrumentSetTypeIds:instrumentSetType
 					},
 					success : function(form, action) {
 						showResult('保存成功');
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r31491 -r31728
--- ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 31491)
+++ ssts-web/src/main/webapp/homepage/menu.jsp	(.../menu.jsp)	(revision 31728)
@@ -2225,7 +2225,12 @@
 SSTS_UrgentLevel_manager = false;
 </operation:authorize>
 
+var SSTS_TousseInstanceType_list = true;
+<operation:authorize ifAnyGranted="SSTS_TousseInstanceType_list">
+	SSTS_TousseInstanceType_list = false;
+</operation:authorize>
 
+
 /**
  * 《常用医生设置》权限
  */
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.jsp	(revision 31728)
@@ -0,0 +1,47 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" %>
+<%@ include file="/common/taglibs.jsp"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>器械包种类定义</title>
+</head>
+<body leftmargin="0" topmargin="0" >
+<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
+<style>
+    .x4-tree-node-text {
+        text-decoration: none;
+        color: black;
+        padding: 1px 3px 1px 2px;
+    }
+    .x4-grid-cell-inner a {
+        color: #367f21 !important;
+        text-decoration: none !important;
+        font-size: 12px;
+    }
+    .x4-grid-cell-inner {
+		cursor: move;
+	}
+    .x4-grid-cell-inner-treecolumn {
+        cursor: default;
+    }
+    .x4-tree-node-text {
+        cursor: pointer;
+    }
+</style>
+<script>
+    var SSTS_TousseInstanceType_add = true;
+    <operation:authorize ifAnyGranted="SSTS_TousseInstanceType_add">
+        SSTS_TousseInstanceType_add = false;
+    </operation:authorize>
+
+    var SSTS_TousseInstanceType_delete = true;
+    <operation:authorize ifAnyGranted="SSTS_TousseInstanceType_delete">
+        SSTS_TousseInstanceType_delete = false;
+    </operation:authorize>
+</script>
+<script type="text/javascript" src="${ctx }/js/common.js" ></script>
+<script type="text/javascript" src="${ctx}/js/json3.min.js?version=${svnRevision}"></script>
+<script type="text/javascript" src="tousseType.js?version=${svnRevision}"></script>
+</body>
+</html>
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r31727 -r31728
--- ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 31727)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js	(.../menuconfigure.js)	(revision 31728)
@@ -452,6 +452,7 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_TousseManagerView,
 	children:[
+		{hidden :SSTS_TousseInstanceType_list,text:"器械包种类定义",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseType.jsp',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"器械包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_Tousse,text:"停用的器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/tousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_CustomTousse,text:"自定义器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
===================================================================
diff -u -r29513 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp	(.../comboTousse.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp	(.../comboTousse.jsp)	(revision 31728)
@@ -84,7 +84,13 @@
     <c:if test="${not empty param.editMode}">
     enableSaveBtn = true;
     </c:if>
-</script>
+
+    //器械包种类查询权限
+    var SSTS_TousseInstanceType_list = true;
+    <operation:authorize ifAnyGranted="SSTS_TousseInstanceType_list">
+        SSTS_TousseInstanceType_list = false;
+    </operation:authorize>
+    </script>
 <%--<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>--%>
 <%--<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js?version=${svnRevision}"></script>--%>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
@@ -121,6 +127,7 @@
 </table>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_isComboTousseView" name="parm_s_isComboTousseView" value="true">
+    <input type="hidden" id="parm_s_instrumentSetTypeId" name="parm_s_instrumentSetTypeId" value="">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp
===================================================================
diff -u -r29513 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp	(.../customTousseDefinitionView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/customTousseDefinitionView.jsp	(.../customTousseDefinitionView.jsp)	(revision 31728)
@@ -104,6 +104,12 @@
 enableSaveBtn = true;
 </c:if>
 
+//器械包种类查询权限
+var SSTS_TousseInstanceType_list = true;
+<operation:authorize ifAnyGranted="SSTS_TousseInstanceType_list">
+    SSTS_TousseInstanceType_list = false;
+</operation:authorize>
+
 var optionType_washClassify = '<%=HttpOption.SYSTEMSETTING_MATERIAL_WASH_CLASSIFY%>';
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
@@ -129,7 +135,8 @@
     </tr>
 </table>
 <form name="parametersFrm">
-    <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="${param.onlyShowDisable}">
+	<input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="${param.onlyShowDisable}">
+	<input type="hidden" id="parm_s_instrumentSetTypeId" name="parm_s_instrumentSetTypeId" value="">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseType.js	(revision 31728)
@@ -0,0 +1,287 @@
+var grid = null;
+var leftStore = null;
+var windowObj;
+var expanded = true;
+var hiddenParentId = 0;
+var entityName = '器械包定义种类列表';
+
+//添加和修改
+function addAndEditRecord(id, name) {
+	var formObj = top.Ext4.create('top.Ext4.form.Panel', {
+		layout: 'vbox',
+		frame: true,
+		border: 0,
+		labelSeparator: ': ',
+		bodyPadding: '5 5 0',
+		autoScroll: true,
+		buttonAlign: 'center',
+		buttons: [{
+			id: 'save',
+			name: 'save',
+			text: '确认',
+			handler: function () {
+				saveRecord()
+			}
+		}, {
+			text: '取消',
+			handler: function () {
+				windowObj.close();
+			}
+		}],
+		fieldDefaults: {
+			labelAlign: 'right',
+			labelWidth: 120
+		},
+		items: [{
+			height: 40,
+			width: '100%',
+			layout: 'column',
+			bodyStyle: { background: '#EBF5EC', border: 0 },
+			items: [{
+				layout: 'form',
+				columnWidth: .9,
+				bodyStyle: { background: '#EBF5EC', border: 0 },
+				items: [{
+					xtype: 'hidden',
+					name: 'id',
+					id: 'id',
+					value: id || ''
+				}, {
+					xtype: 'textfield',
+					border: 0,
+					fieldLabel: '器械包种类名称',
+					name: "name",
+					id: "name",
+					value: name || ''
+				}]
+			}]
+		}]
+	});
+
+	windowObj = top.Ext4.create('top.Ext4.window.Window', {
+		layout: 'fit',
+		title: '器械包种类定义',
+		width: 350,
+		height: 120,
+		resizable: false,
+		modal: true,
+		border: false,
+		plain: true,
+		items: formObj
+	});
+
+	windowObj.show();
+}
+
+//重新排序
+function setGridSequence() {
+	var orderList = [];
+	grid.getStore().each(function (record, index) {
+		var id = record.data.id;
+		orderList[index] = id + '@' + index;
+	});
+	Ext4.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!orderInstrumentSetTypeList.do',
+		params: {
+			orderList: orderList.join(';'),
+			parentId: hiddenParentId
+		},
+		success: function (response, options) {
+			var result = Ext4.decode(response.responseText);
+			var success = result.success;
+			if (success) {
+				showResult('列表已重新排序');
+				grid.getStore().reload();
+				leftStore.load();
+			}
+		}
+	});
+
+}
+
+//删除
+function deleteRecord() {
+	var records = grid.getSelectionModel().selected.items;
+	if (records.length > 0) {
+		var idsArr = [];
+		for (var i = 0; i < records.length; i++) {
+			idsArr[i] = records[i].data.id;
+		}
+		Ext4.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!bathDeleteByIds.do',
+			params: {
+				ids: idsArr.join(';')
+			},
+			success: function (response) {
+				var result = Ext4.decode(response.responseText);
+				showResult(result.message);
+
+				if (result.success) {
+					grid.getStore().reload();
+					leftStore.load();
+				}
+			}
+		});
+	} else {
+		showResult("请选择要删除的记录！");
+	}
+}
+
+//保存
+function saveRecord() {
+	var name = top.Ext4.getCmp('name').getValue();
+	var id = top.Ext4.getCmp('id').getValue();
+	if (name == '') {
+		showResult('器械包种类名称不能为空');
+		return;
+	}
+
+	Ext4.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!saveInstrumentSetType.do',
+		params: {
+			name: name,
+			id: id,
+			parentId: hiddenParentId
+		},
+		success: function (response) {
+			var result = Ext4.decode(response.responseText);
+			showResult(result.message);
+
+			if (result.success) {
+				windowObj.close();
+				grid.getStore().reload();
+				leftStore.load();
+			}
+		}
+	});
+}
+
+//刷新列表
+function reloadGridData(id) {
+	hiddenParentId = id;
+	grid.getStore().reload();
+}
+
+Ext4.onReady(function () {
+	Ext4.QuickTips.init();
+
+	var treePanel = new GetInstrumentSetTypeTreePanel();
+
+	leftStore = treePanel.getTreeStore(expanded);
+
+	leftStore.on("beforeload", function (treeLoader, node) {
+		var id = (node.id == '') ? 0 : node.id;
+		treeLoader.proxy.extraParams.parentId = id;
+	});
+
+	leftStore.load();
+
+	var panel = treePanel.getTreePanel(leftStore);
+
+	var columns = [{
+		header: '种类名称', dataIndex: 'name', width: 300,
+		renderer: function (v, p, record) {
+			return "<a href=\"#\" onclick=\"addAndEditRecord('" + record.data.id + "','" + record.data.name + "');return false;\">" + v + "</a>";
+		}
+	}, {
+		header: '排序', dataIndex: 'sequenceNumber', width: 200
+	}];
+
+	var tbar = [{
+		text: '添加',
+		hidden: SSTS_TousseInstanceType_add,
+		iconCls: 'btn_add',
+		handler: function () {
+			addAndEditRecord();
+		}
+	}, '-', {
+		text: '修改',
+		hidden: SSTS_TousseInstanceType_add,
+		iconCls: 'btn_edit',
+		handler: function () {
+			var records = grid.getSelectionModel().selected.items;
+			if (records == null || records == "" || records == undefined || records.length == 0) {
+				showResult("请选择要修改的记录！");
+				return false;
+			}
+			if (records.length > 1) {
+				showResult("一次只能修改一条记录！");
+				return false;
+			}
+			var name = records[0].data['name'];
+			var id = records[0].data['id'];
+			addAndEditRecord(id, name);
+			grid.getSelectionModel().deselectAll();
+		}
+	}, '-', {
+		text: '删除',
+		hidden: SSTS_TousseInstanceType_delete,
+		iconCls: 'btn_delete',
+		handler: function () {
+			var records = grid.getSelectionModel().selected.items;
+			if (records.length > 0) {
+				top.Ext4.MessageBox.confirm("请确认", "是否删除 " + records.length + ' 条记录?', function (button, text) {
+					if ("yes" == button) {
+						deleteRecord();
+					}
+				});
+			} else {
+				showResult("请选择要删除的记录！");
+			}
+		}
+	}]
+
+	var listStore = Ext4.create('Ext4.data.Store', {
+		autoLoad: true,
+		pageSize: 20,
+		fields: [{ name: 'name' }, { name: 'id' }, { name: 'sequenceNumber' }],
+		proxy: {
+			type: 'ajax',
+			url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!findInstrumentSetTypeTableList.do',
+			reader: {
+				type: 'json',
+				root: 'rows'
+			}
+		},
+		listeners: {
+			beforeload: function (thiz, options) {
+				thiz.proxy.extraParams.parentId = hiddenParentId;
+			}
+		}
+	});
+
+	grid = new Ext4.grid.GridPanel({
+		title: '器械包种类定义列表',
+		store: listStore,
+		columns: columns,
+		enableDragDrop: true,
+		ddGroup: 'gridDD',
+		id: 'grid',
+		selModel: new Ext4.selection.CheckboxModel(),
+		sorters: { property: 'sequenceNumber', direction: 'DESC' },
+		viewConfig: {
+			plugins: {
+				ptype: 'gridviewdragdrop'
+			},
+			listeners: {
+				drop: function (node, data, dropRec, dropPosition) {
+					setGridSequence();
+				}
+			}
+		},
+		stripeRows: true,
+		autoExpandColumn: 1,
+		tbar: tbar
+	});
+
+	viewport = new Ext4.Viewport({
+		layout: 'border',
+		items: [panel, {
+			region: 'center',
+			xtype: 'panel',
+			margins: '0 0 0 0',
+			layout: 'fit',
+			items: grid
+		}]
+	});
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js
===================================================================
diff -u -r31217 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 31217)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousseForm.js	(.../comboTousseForm.js)	(revision 31728)
@@ -1065,9 +1065,35 @@
 						  value : '否',
 						  mode : 'local',
 						  triggerAction : 'all',
-						  anchor : '95%'
+						  anchor : '100%'
 					  }]
-				  }]
+				  },{
+                    columnWidth: .75,
+                    layout: 'form',
+                    labelWidth: fontSize == 12 ? 90 : 100,
+                    labelAlign: "right",
+                    items: [{
+						//用于保存时：传递所属种类id
+						xtype : 'hidden',
+						id : 'instrumentSetType',
+						name : 'instrumentSetType'
+					},{
+                        xtype : 'trigger',
+                        fieldLabel : "所属种类",
+                        allowBlank : true,
+                        name : "instrumentSetTypeName",
+                        id : "instrumentSetTypeName",
+                        msgTarget:'side',
+                        readOnly:true,
+                        onTriggerClick : function(){
+                            var ids = top.Ext.getCmp('instrumentSetType').getValue();
+                            var names = top.Ext.getCmp('instrumentSetTypeName').getValue();
+                            setInstrumentSetType('instrumentSetType' , 'instrumentSetTypeName' , ids, names);
+                        },
+                        triggerClass : 'x-form-search-trigger',
+                        anchor : '100%'
+                    }]
+                  }]
             }, {
                 columnWidth: 0.5,
                 layout: 'form',
@@ -1192,6 +1218,19 @@
                 loadTaskGroupAndHandleDepart(id, taskGroupJsonStore);
                 //读取聚合包下的所属科室
                 loadComboTousseUnit(id);
+                var ids = [];
+                var names = [];
+                if(tousseDefinition.instrumentSetTypeJSONArray.length > 0){
+                    for(var i=0;i<tousseDefinition.instrumentSetTypeJSONArray.length;i++){
+                        ids[i] = tousseDefinition.instrumentSetTypeJSONArray[i].id;
+                        names[i] = tousseDefinition.instrumentSetTypeJSONArray[i].name;
+                    }
+                    top.Ext.getCmp('instrumentSetType').setValue(ids.join(';'));
+                	top.Ext.getCmp('instrumentSetTypeName').setValue(names.join(';'));
+                }else {
+                	top.Ext.getCmp('instrumentSetType').setValue('');
+                	top.Ext.getCmp('instrumentSetTypeName').setValue('');
+                }
             },
             failure: function (form, action) {
             }
@@ -1247,6 +1286,8 @@
     var validateId = (TousseName == null ? top.Ext.getCmp('id').getValue() : null);
     var validateName = (TousseName == null ? top.Ext.getCmp('name').getValue() : TousseName);
     var tousseType = top.Ext.getCmp('tousseType').getValue();
+    //所属种类
+	var instrumentSetType = top.Ext.getCmp('instrumentSetType').getValue();
     Ext.Ajax.request({
         url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!validate.do',
         params: {validateId: validateId, valifateName: validateName, tousseType: tousseType},
@@ -1262,8 +1303,7 @@
                     method: 'POST',
                     waitMsg: '正在保存数据，请稍候',
                     waitTitle: '提交表单',
-                    params: {comboTousseArray: JSON.stringify(comboTousse), motion: 'comboTousse'},
-                    // params: {materialDefinitionConfigResult: JSON.stringify(comboTousse), comboTousse: 'comboTousse'},
+                    params: {comboTousseArray: JSON.stringify(comboTousse), motion: 'comboTousse',instrumentSetTypeIds:instrumentSetType},
                     success: function (form, action) {
                         tousseWin.close();
                         showResult('保存成功');
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r29846 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 29846)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 31728)
@@ -46,7 +46,7 @@
 </object> 
 
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
-<%@ include file="/common/include_Ext42_Js.jsp"%>
+<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
 <%@ include file="/disinfectsystem/print/print.jsp"%>
 <script type="text/javascript">
 var imageTypeTousse = '<%=ImageFile.IMAGE_TYPE_TOUSSE%>';
@@ -131,6 +131,12 @@
 <c:if test="${not empty param.editMode}">
 enableSaveBtn = true;
 </c:if>
+
+//器械包种类查询权限
+var SSTS_TousseInstanceType_list = true;
+<operation:authorize ifAnyGranted="SSTS_TousseInstanceType_list">
+    SSTS_TousseInstanceType_list = false;
+</operation:authorize>
 </script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/print/print.js?version=${svnRevision}"></script>
@@ -164,19 +170,24 @@
 <!--选择科室js-->
 <script type="text/javascript" src="setDepartOrgUnitForm.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/customTousseForm.js?version=${svnRevision}"></script>
-
-<table height="100%;" width="100%" border="0" align="center"
-    cellpadding="0" cellspacing="0">
-    <tr height="100%;">
-        <td colspan="2">
-        	<div id="gridDiv" style="height: 100%;"></div>
-        </td>
-    </tr>
-</table>
+<style>
+    .x4-tree-node-text {
+        text-decoration: none;
+        color: black;
+        padding: 1px 3px 1px 2px;
+    }
+    .x4-grid-cell-inner a {
+        color: #367f21 !important;
+        text-decoration: none !important;
+        font-size: 12px;
+    }
+</style>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="">
     <!--是否需要所属科室过滤-->
     <input type="hidden" id="parm_s_enableBelongDepartFilter" name="parm_s_enableBelongDepartFilter" value="">
+    <input type="hidden" id="parm_s_instrumentSetTypeId" name="parm_s_instrumentSetTypeId" value="">
+
 </form>
 </body>
 </html>
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js
===================================================================
diff -u -r29581 -r31728
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js	(.../comboTousse.js)	(revision 29581)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.js	(.../comboTousse.js)	(revision 31728)
@@ -13,7 +13,12 @@
     });
 }
 
+function reloadGridData(id){
+	$Id("parm_s_instrumentSetTypeId").value = id;
+	grid.dwrReload();	
+}
 
+
 // 删除
 function deleteTousse(grid) {
 
@@ -250,13 +255,30 @@
         }, readerDetail, TousseDefinitionTableManager.findTousseDefinitionTableList, dwrCallParams // 这个参数只是占位作用
     );
 
-    var viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [{
-            region: 'center',
-            margins: '0 0 0 0',
-            layout: 'fit',
-            items: grid
-        }]
+    var items = [{
+        region:'center',
+        xtype : 'panel',
+        margins : '0 0 0 0',
+        layout:'fit',
+        items:grid
+    }];
+
+    if(!SSTS_TousseInstanceType_list){
+        var treePanel = new GetInstrumentSetTypeTreePanelForExt2();
+
+        panel = treePanel.getTreePanel();
+
+        items = [panel,{
+            region:'center',
+            xtype : 'panel',
+            margins : '0 0 0 0',
+            layout:'fit',
+            items:grid
+        }];
+    }
+
+    var viewport = new Ext.Viewport( {
+        layout : 'border',
+        items : items
     });
 });
\ No newline at end of file