Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r31182 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 31182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 33584)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -7,14 +7,14 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT  coding,name,parentCoding FROM CSSD_Department where coding != '0'
+	SELECT coding,name,parentCoding FROM CSSD_Department where coding != '0'
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT CODING,REGEXP_REPLACE(ORGUNITCODING, '[^0-9]'),NAME FROM CSSD_User where coding != '0'
+	SELECT CODING,ORGUNITCODING,NAME FROM CSSD_User where coding != '0'
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r31182 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 31182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 33584)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -7,21 +7,25 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  clinicNumber as patientNumber,
-        	patientName,
-	        patientAge,
-	        patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		ROOMNUMBER,
-	        patientArea,
-			ascriptionDepartment,
-	        REMARK
-	FROM CSSD_ClinicNumber
-	WHERE clinicNumber = #{treatmentNum}
+	SELECT  clinicNumber，
+serialNumber，
+patientName，
+patientAge，
+case  patientSex when '0' then '男' when '1' then '女' end as patientSex，
+patientIDCard，
+doctorName，
+operation，
+operationTime，
+b.name as patientArea,
+c.name as roomNumber，
+bedNumber，
+remark
+from CSSD_ClinicNumber INNER JOIN CSSD_Department  b
+on CSSD_ClinicNumber.patientArea = b.coding
+INNER JOIN CSSD_Department c
+on CSSD_ClinicNumber.roomNumber =c.coding 
+where 
+ clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/config.js
===================================================================
diff -u -r33152 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/config.js	(.../config.js)	(revision 33152)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/config.js	(.../config.js)	(revision 33584)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 回收时科室显示结算科室
   showSettleAccountsDepartInRecycling : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -48,11 +48,11 @@
   // 自定义装配后是否保留灭菌日期
   disinfectionDateProcessTypeInDirectPackingView : true,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
-  useRecordAuditMode : 1,
+  useRecordAuditMode : 2,
   hideApplyDepartColumn : false, // 隐藏申请科室
   hideSettleDepartColumn : true,// 隐藏结算科室
   // 回收界面回收人是否强制不能为空
-  recyclePageRecyclingUserNotNull : true,
+  recyclePageRecyclingUserNotNull : false,
   // 回收一键入筐
   recycleAllTousseIntoBasket : true,
   // 退出回收模块后不记住回收界面的过滤条件
@@ -91,7 +91,7 @@
   showDepartOfTousseInstanceSterile : true,
   // 对申请单的物品申请数量是否启用干预功能
   enableInterfereApplyAmount : true,
-  // 是否是加强版的“消毒供应中心员工工作量统计报表表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是
+  // 是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是
   strengthenStatisticalWorkload : true,
   // 是否禁用整筐发货
   disableScanBasketInvoice : false,
@@ -135,6 +135,8 @@
   enableClassifyBasketSequence:true,
   // 禁用外来器械
   disableForeignTousse:false,
+ //是否启用“外来器械申请”的桌面图标
+  desktopShortcutIconsConfig:["外来器械申请"],
   // 禁用一次性物品
   disableDisposableGoods:true,
   // 禁用自定义表单
@@ -146,5 +148,20 @@
   // 是否允许部分回收
   enablePartRecycle:true,
   //是否启用清洗交接记录视图列表
-  enableWashTransitionRecordView:true
+  enableWashTransitionRecordView:true,
+  //一个申请单申请多个外来器械
+  allowApplyMultipleForeignTousse:true,
+  //打印后修改
+  allowEditApplyFormAfterPrint:true,
+  //多个外来器械在一个篮筐
+  multiForeignTousseIntoSameBasket:true,
+  //篮筐名称的右侧是否显示放大镜图标
+  showBasketLoadMaterialAmount:true,
+  //回收时自动加载清洗装载状态的篮筐
+  loadWashLoadingStatusBasketsWhenRecycling:true,
+  //审核首尾
+  reviewPageScanMode:"area",
+  //发货首尾
+  invoicePageScanMode:"area"
+
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r31182 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 31182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 33584)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -7,45 +7,48 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  hospitalNumber as patientNumber,
-        	patientName,
-	       	patientAge,
-	        patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		operationRoom,
-	   		ROOMNUMBER,
-	        patientArea,
-			ascriptionDepartment,
-	        REMARK
- 	FROM CSSD_HospitalNumber
-	WHERE hospitalNumber = #{hospitalNum}
-	order by operationTime desc
+		SELECT  substr(hospitalNumber,1,10) as hospitalNumber,
+case  patientSex when '0' then '男' when '1' then '女' end as patientSex，
+patientName，
+searialNumber，
+patientAge，
+patientIDCard，
+doctorName，
+operation，
+operationTime，
+name as patientArea，
+roomNumber，
+bedNumber，
+remark
+from CSSD_HospitalNumber INNER JOIN CSSD_Department on
+CSSD_HospitalNumber.patientArea = CSSD_Department.coding
+where
+substr(hospitalNumber,1,10) = #{hospitalNum} 
+	order by substr(hospitalNumber,1,10) desc,operationTime desc
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  hospitalNumber as patientNumber,
-        	patientName,
-	       	patientAge,
-	        patientSex,
-	        patientIDCard,
-	        doctorName,
-	        operation,
-	        operationTime,
-	   		bedNumber,
-	   		ROOMNUMBER,
-	        patientArea,
-			ascriptionDepartment,
-	        REMARK
- 	FROM CSSD_HospitalNumber
-	WHERE hospitalNumber = #{hospitalNum}
-	order by operationTime desc
+		SELECT  substr(hospitalNumber,1,10) as hospitalNumber,
+case  patientSex when '0' then '男' when '1' then '女' end as patientSex，
+patientName，
+searialNumber，
+patientAge，
+patientIDCard，
+doctorName，
+operation，
+operationTime，
+name as patientArea，
+roomNumber，
+bedNumber，
+remark
+from CSSD_HospitalNumber INNER JOIN CSSD_Department on
+CSSD_HospitalNumber.patientArea = CSSD_Department.coding
+where
+substr(hospitalNumber,1,10) = #{hospitalNum}                                   
+	order by substr(hospitalNumber,1,10) desc
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/spring/HIS.xml
===================================================================
diff -u -r31182 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/spring/HIS.xml	(.../HIS.xml)	(revision 31182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/spring/HIS.xml	(.../HIS.xml)	(revision 33584)
@@ -34,16 +34,26 @@
     <bean id="dataSynchronizationTableManager"
         class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
     </bean>
+
+    <context:component-scan base-package="com.forgon.disinfectsystem.inventorymanagement.service.*" />
+
+    <bean id="inventoryManagerTarget"
+        class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
+    </bean>
     
-    
+    <bean id="inventoryManager"
+    	parent="txProxyTemplate">
+    	<property name="target">
+   		<ref bean="inventoryManagerTarget" />
+  	</property>
+    </bean>
+
     <!-- 定义数据源。根据开发和生产环境需要，设置所用数据源的Bean id 为 hisDataSource -->
-    <bean id="hisDataSource"
-        class="com.mchange.v2.c3p0.ComboPooledDataSource"
-        destroy-method="close">
-        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
-        <property name="jdbcUrl" value="jdbc:sqlserver://192.168.2.21:1433;databaseName=hbsxkyy" />
-        <property name="user" value="sa" />  
-        <property name="password" value="p2ssword" />
+<bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+     <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.10.25:1521/his" />
+        <property name="user" value="CSSD" />  
+        <property name="password" value="Cssd#0769" />
     </bean>
 
     <!-- 由MyBatis实现访问HIS数据的Dao接口-->
@@ -70,6 +80,20 @@
             </bean>
        </property>
     </bean>
+	
+	<bean id="inventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean">
+	<property name="mapperInterface"
+	value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" />
+	<property name="sqlSessionFactory">
+	<bean class="org.mybatis.spring.SqlSessionFactoryBean">
+	<property name="dataSource" ref="hisDataSource" />
+	<property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/dgsrkyy/interfaces/mybatis/syncFromHERP_Mapper.xml" />
+	<property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
+	</bean>
+	</property>
+	</bean>
+
+
     
     <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">
        <property name="mapperInterface"  
@@ -83,4 +107,6 @@
        </property>
     </bean>
 
-</beans>
\ No newline at end of file
+</beans>
+
+ 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/dataSyncConfig.json
===================================================================
diff -u -r31182 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 31182)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 33584)
@@ -1,4 +1,4 @@
-{
+{
 	"同步组织机构":{
 		"默认父节点的编码" : "0",
 		"更新交集数据" : true,
@@ -9,7 +9,7 @@
 		"更新交集数据" : true,
 		"移除差集数据" : false,
 		"默认角色ID":[
-			"ROLE_1_0"
+			"ROLE_00001_0"
 		]
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/menu/menuconfigure.js
===================================================================
diff -u -r33176 -r33584
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 33176)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsrkyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 33584)
@@ -1,4 +1,4 @@
-var linkTarget = 'mainFrame';
+var linkTarget = 'mainFrame';
 var singleClickExpandTree=true;
 //是否禁用虚拟篮筐(未启用disableLoadToVirtualBasket配置项目或该配置项的值为true时,则禁用,否则启用虚拟篮筐)
 var disableLoadToVirtualBasket = true;
@@ -141,8 +141,7 @@
 	children:[
         {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 };
 DisinfectsystemTreeData[11] = {
@@ -338,7 +337,7 @@
 	hidden:SSTS_DisposableGoods_Manager,
 	children:[
         {hidden :SSTS_DisposableGoods_Menu,text:"一次性物品管理",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable=是',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_DisposableGoods_Menu,text:"停用一次性物品",href:WWWROOT+'/disinfectsystem/assestManagement/diposableGoods/diposableGoodsView.jsp?isDisable='+encodeURI('是'),hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoods_Menu || !sstsConfig.enableExpensiveDisposableGoods,text:"高值耗材使用记录",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/expensiveDisposableGoodsUseRecordView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsStock_Manager,text:"一次性物品库存",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/disposableGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DisposableGoodsStock_Manager || !sstsConfig.enableBatchStockCompare,text:"库存对比",href:WWWROOT+'/disinfectsystem/assestManagement/disposableGoods/batchStockCompare.jsp',hrefTarget:linkTarget,leaf:true},
@@ -430,7 +429,7 @@
         {hidden :SSTS_TousseMaintain_Manager,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_DepartMentTousseManager,text:"基数管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+inventoryTypeCodeBaseAmount,hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_BaseAmountinventoryCheck_Manager,text:"基数盘点历史记录",href:WWWROOT+'/disinfectsystem/stocktakerecordmanager/inventoryrecordView.jsp?type='+encodeURI(inventoryTypeCodeBaseAmount),hrefTarget:linkTarget,leaf:true}
     ]
 },{
 	text:"手术仪器管理",
@@ -499,14 +498,6 @@
 	          {hidden :SSTS_MESSAGE_Menu,text:"消息发布管理",href:WWWROOT+'/disinfectsystem/message/message.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}
 	          ]
 },{
-	text:"科室问题反馈",
-	singleClickExpand:singleClickExpandTree,
-	hidden:SSTS_ProblemReport_Menu,
-	children:[
-		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈",href:WWWROOT+'/disinfectsystem/problemReport/problemReport.jsp',hrefTarget:linkTarget,leaf:true},
-		{hidden :SSTS_ProblemReport_Menu,text:"科室问题反馈类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=question_feedback',hrefTarget:linkTarget,leaf:true}
-	]
-},{
 	text:"系统告警",
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_SystemWarning_Menu,
@@ -583,9 +574,9 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_WorkLoad_Menu,
 	children:[
-	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
-	    {hidden :SSTS_YearWorkload,text:"消毒供应中心年度工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
-//	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心员工绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心员工工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
+//	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -734,7 +725,7 @@
             {hidden :SSTS_application_end_cause_manager,text:"器械包废弃原因设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousse_discard_cause',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_foreignProxyGroup_manager,text:"外部代理灭菌分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignProxyGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_foreignTousseProcessType_manager,text:"外来器械处理方式",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=foreignTousseProcessType',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_Material,text:"材料类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialType',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_Material,text:"材料清洗分类设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=materialWashClasify',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_TaskGroup,text:"任务组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/taskGroup/taskGroupView.jsp',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Damage,text:"丢失报损类型设置",href:WWWROOT+'/disinfectsystem/basedatamanager/damageErrorMaterialType/damageErrorMaterialTypeView.jsp',hrefTarget:linkTarget,leaf:true},