Index: ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/spring/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/spring/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/spring/timer.xml	(revision 41146)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+	<!-- 定时处理使用记录转申请单(每15分钟检查一次)-->
+	<bean id="timingProcessUseRecordConvertJob"
+		class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="useRecordManager" />
+		</property>
+		<property name="targetMethod">
+			<value>timingConvertRecyclingApplication</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingProcessUseRecordConvertJobTrigger" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingProcessUseRecordConvertJob" />
+		</property>
+		<property name="cronExpression">
+			<value>0 */15 * * * ?</value>
+		</property>
+	</bean>
+
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+                <ref bean="timingProcessUseRecordConvertJobTrigger"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/img/logo_qysfybjy.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/menu/menuconfigure.js
===================================================================
diff -u -r40678 -r41146
--- ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 40678)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 41146)
@@ -917,7 +917,6 @@
             {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=washMethod',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Tousse_Update,text:"器械包重量设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=tousseWeight&optionName=器械包重量设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_DiposableGoodsType_manager,text:"一次性物品类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=diposableGoodsType',hrefTarget:linkTarget,leaf:true},
-
             {hidden :SSTS_ExpensiveGoods_Hidden_Menu,text:"高值耗材类型设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=expensiveGoodsType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Container,text:"容器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/container/containerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Supplier,text:"供应商管理",href:WWWROOT+'/disinfectsystem/basedatamanager/supplier/supplierView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
@@ -926,7 +925,7 @@
             {hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/config.js
===================================================================
diff -u -r33153 -r41146
--- ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/config.js	(.../config.js)	(revision 33153)
+++ ssts-web/src/main/webapp/disinfectsystem/config/qysfybjy/config.js	(.../config.js)	(revision 41146)
@@ -48,7 +48,7 @@
   //自定义装配后是否保留灭菌日期
   disinfectionDateProcessTypeInDirectPackingView : true,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
-  useRecordAuditMode : 1,
+  useRecordAuditMode : 2,
   hideApplyDepartColumn : false, // 隐藏申请科室
   hideSettleDepartColumn : true,// 隐藏结算科室
   //回收界面回收人是否强制不能为空
@@ -155,6 +155,19 @@
   showSignedItems : true,
   //加急功能
   enableUrgentFunction:true,
+  //发货计划待发货物品变色规则:启用已灭菌（含已消毒）物品变色功能
+  colorChangeRuleOfInvoicPlanToSendGoodsList:2,
   //申领界面不显示整包申请的消毒物品的材料明细,值为true ： 申领界面不显示整包申请的消毒物品的材料明细；值为false或者没有配置 ： 申领界面显示出整包申请的消毒物品的材料明细
-  hideMaterialsListOfDisinfectionGoodsApplyEntire:true
+  hideMaterialsListOfDisinfectionGoodsApplyEntire:true,
+  //开启器械包进度条
+  enableTousseStatusProgressBar:true,
+  //是否启用扫描灭菌监测包
+  enableScanSterilizationMonitoringPackage:true,
+  //启用使用记录转换配置功能
+  enableUseRecordConvertConfig:true,
+  //开启急用物品处理周期统计报表
+  enableUrgentNeedGoodsProcessingCycleReport:true,
+  //器械包信息新增加急筛选以及显示加急等级列
+  "expandColoumnsConfigOfTousseInfoList": [{"fieldName":"urgentLevel","coloumnName":"加急级别"}],
+  "expandQueryFieldsConfigOfTousseInfoQuery": [{"fieldName":"urgentLevel","QueryName":"加急级别"}]
 }
\ No newline at end of file