Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/menu/menuconfigure.js
===================================================================
diff -u -r40696 -r41170
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 40696)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 41170)
@@ -1058,10 +1058,9 @@
             {hidden :SSTS_ProjectName_manager,text:"设备维护项目名称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=projectName',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_PackType_manager,text:"包装类型设置",href:WWWROOT+'/systemmanage/httpOptionByValue.mhtml?listId=packType',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_equipment_manager,text:"设备设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=equipment',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=washMethod',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_equipment_manager,text:"清洗方式设置",href:WWWROOT+'/disinfectsystem/basedatamanager/washMethod/washMethodView.jsp',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_DiposableGoodsSummary_manager,text:"一次性物品汇总打印设置",href:WWWROOT+'/disinfectsystem/basedatamanager/diposableGoodsSummary/diposableGoodsSummaryView.jsp',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},
@@ -1074,7 +1073,7 @@
             {hidden :SSTS_RinserGroup_manager,text:"清洗机分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/rinserGroup/rinserGroupView.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_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/disinfectsystem/basedatamanager/httpOption/httpOptionView.jsp?optionListId=sterilizationPurpose?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizationPurpose/sterilizationPurposeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilisation,text:"灭菌程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilisation/sterilisationView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Bioreader,text:"生物阅读器管理",href:WWWROOT+'/disinfectsystem/basedatamanager/bioreader/bioreaderView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js
===================================================================
diff -u -r37996 -r41170
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js	(.../config.js)	(revision 37996)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/config.js	(.../config.js)	(revision 41170)
@@ -26,9 +26,9 @@
   // 是否支持部分终止申请单中的物品
   enableTerminatePartOfApplication : true,
   //是否启用聚合包功能
-  enableComboTousse : true,
+  enableComboTousse : false,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
-  useRecordAuditMode : 1,
+  useRecordAuditMode : 2,
   hideApplyDepartColumn : false, // 隐藏申请科室
   hideSettleDepartColumn : true, // 隐藏结算科室
   companyName : "dingxiang",
@@ -184,7 +184,7 @@
   //启动培训管理功能
   hideTrainingManage:false,
   //启用扫码登录
-  enableScanBarcodeLogin:false,
+  enableScanBarcodeLogin:true,
   //是否启用加强版的“消毒供应中心员工工作量统计报表”
   strengthenStatisticalWorkload:true,
   //PDA端召回信息功能
@@ -208,7 +208,23 @@
   //聚合包按大包发货。
   comboTousseSendByWrapperTousse:2,
   //各环节的器械包内物品件数统计是否包含一次性物品
-  statisticTousseWorkLoadIncludeDisposableGoodsAmount:{"装配":false}
+  statisticTousseWorkLoadIncludeDisposableGoodsAmount:{"装配":false},
+  //启用包定义批量修改
+  tousseDefinitionCanBatchEdit:true,
+  //启用打印标签输出打印机设置功能	
+  enablePrintLabelsOutputPrinterSettingsFunction:true,
+  //控制PDA的回收清点模块的功能是预回收还是器械交接
+  prepareRecycleVersion:1,
+  //开启部分回收功能
+  enablePartRecycle:true,
+  //在PDA预回收界面显示手术间和病人信息	
+  displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA:true,
+  //明细核算月报是否显示材料数量列
+  showMaterialsAmountColumnOfDetailMonthReport:true,
+  //启用器械包状态进度条
+  enableTousseStatusProgressBar:true,
+  //器械包状态进度条配置。
+  tousseStatusProgressBarConfig:{"hidingNodes" :["配送中"],"showPersonAndDateTime":true,"colorOfPassedNode":"#f00000","colorOfUnpassedNode":"#367f21"}
    // 登录成功后如果检查密码到不符合复杂度要求，则强制用户修改密码
 	//forceUserChangePwdWhenNotMeetPwdComplexityReq: true,
 	// 密码策略：长度8位，必须包含字母，数字、字母、特殊字符中的两种
@@ -223,4 +239,5 @@
 	  //'passwordComplexityReq1': true,
 	  //'windowsPasswordComplexityReq': false
 	//}
+ 
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r38060 -r41170
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 38060)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgzxyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 41170)
@@ -13,6 +13,7 @@
 	po.ascriptionDepartment,
 	po.surgeryName operation,
 	po.operationRoom opRoomId,
+	po.ascriptionDepartment,
 	po.doctorName 
 	from PatientAdmissionInfo po where hospitalNumber = #{hospitalNum} order by id desc
 	]]>