Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js
===================================================================
diff -u -r22812 -r22876
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js	(.../recyclingDetailPrintConfig.js)	(revision 22812)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/recyclingDetailPrintConfig.js	(.../recyclingDetailPrintConfig.js)	(revision 22876)
@@ -74,7 +74,7 @@
 		 },{
 				columnName : '弯剪',
 				includeTousse : [
-				   {id : 29,tousseName : '包装弯剪'}
+				   {id : 51,tousseName : '包装弯剪'}
 				]
 		 },{
 		columnName : '包装直剪',
Index: ssts-web/src/main/resources/config/gzszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r20381 -r22876
--- ssts-web/src/main/resources/config/gzszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 20381)
+++ ssts-web/src/main/resources/config/gzszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22876)
@@ -8,14 +8,14 @@
  <!-- 按住院号查找病人信息 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
         <![CDATA[    
-		 select * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+		select *  from cssd_hospitalnumber where ( SEARIALNUMBER = #{hospitalNum} or HOSPITALNUMBER = #{hospitalNum} ) order by OPERATIONTIME desc
 		]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
     <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	 select * from cssd_hospitalnumber where hospitalNumber = #{hospitalNum}
+	select *  from cssd_hospitalnumber where ( SEARIALNUMBER = #{hospitalNum} or HOSPITALNUMBER = #{hospitalNum} ) order by OPERATIONTIME desc
 	]]>
   </select>
  
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r22726 -r22876
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22726)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 22876)
@@ -69,6 +69,30 @@
   reprintTodayPrintedTousseItem : true,
   //是否显示按器械包分组选择框
   isShowTousseGroup : true,
+  //装配界面,扫描清洗篮筐后是否默认自动勾选篮筐内的器械包
+  packingView_autoSelectTousseWhenScanBasket: true,
+  //外部代理灭菌装配时是否必须入篮筐
+  mustScanBasketForForeignProxy:false,
+  //是否在个人桌面显示外部代理灭菌的图标
+  showForeignProxySterilizationDesktopIcon: true,
+  //是否允许回收数量减小的部分超过待装配数量
+  allowDecreaseRecyclingAmountGreatUnPackingAmount: true,
+  //回收时，申请数量与回收数量不一致，是否要确认
+  confirmRecyclingAmount:false,
+  //回收时是否可以修改申请单备注
+  modifyRemarkInRecycling:true,
+  //申请器械包时是否自动归还待归还物品
+  autoReturnTousse:true,
+  //外来器械申请时显示原始包定义还是显示最近一次申请的包定义
+  isShowForeignTousseAncestorDefinitionForApply:true,
+  //是否启用外来器械默认申请科室配置
+  enableForeignTousseApplyDepartment:true,
+  // 外来器械拆包名字样式
+  splitForeignTousseNameStyle:1,
+  //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用
+  enableClassifyBasketSequence:true,
+  //是否隐藏灭菌管理-外部代理灭菌里的申请人
+  hideCssdForeignProxyDisinfectionApplicant:true,
   // 高值耗材自助入库验收后是否发货，默认为否
   checkedAfterSubmitInvoice : false
 }
\ No newline at end of file