Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r40884 -r40926
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40884)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 40926)
@@ -292,7 +292,7 @@
   //禁用基数限制
   disableCardinalNumLimit:true,
   //是否启用扫描灭菌监测包
-//  enableScanSterilizationMonitoringPackage:true,
+ enableScanSterilizationMonitoringPackage:true,
    //装配时选择物品后是否自动设置灭菌程序,默认为是
   packingPageAutoSetSterilizationProgramAfterSelectTousse:true,
   //针对本定制报表
@@ -332,7 +332,7 @@
 	//外来器械包申请单扩展列
   extendedColumnConfigOfForeignTousseApplicationForm:["packingState", "sterilizationState"],
 	  //启用外来器械包发货后可直接二次回收的功能
-//  enableSecondRecyclingAfterInvoiceFunction:true,
+  enableSecondRecyclingAfterInvoiceFunction:true,
   enableUserAccountDeactivationFunction:true,
   //外来器械包申请扩展查询项
   expandQueryFieldsConfigOfForeignTousseApplication:[
@@ -344,16 +344,6 @@
     {"fieldName":"queryTousseBarcode","queryName":"器械包条码"},
     {"fieldName":"queryBasketBarcode","queryName":"篮筐条码"}
   ],
-  //外来器械包申请扩展查询项
-  expandQueryFieldsConfigOfForeignTousseApplication:[
-    {"fieldName":"applicationStartTime","queryName":"申请开始时间"},
-    {"fieldName":"applicationEndTime","queryName":"申请结束时间"},
-    {"fieldName":"queryRecyclingStatus","queryName":"回收状态"},
-    {"fieldName":"queryPatient","queryName":"病人姓名"},
-    {"fieldName":"queryTousseName","queryName":"外来器械包名称"},
-    {"fieldName":"queryTousseBarcode","queryName":"器械包条码"},
-    {"fieldName":"queryBasketBarcode","queryName":"篮筐条码"}
-  ],
 	  //启用外来器械厂家归还人。
   enableReturneeOfForeignTousseSupplier:true,
 	  //配置外来器械申请单统计报表的扩展列
@@ -369,7 +359,7 @@
 	  //启用外来器械包定义的批量修改功能
   enableBulkModificationOfForeignTousseDefinitionFunction:true,
 	  //手术预约单的显示不需要校验手术间是否存在
-doNotNeedValidateOperationRoomToShowInOperationReservationList:true,
+doNotNeedValidateOperationRoomToShowInOperationReservationList:false,
    //启用灭菌交接单转换代理灭菌单的功能
   enableSterilizationTransitionFormToProxyDisinfection:true,
    //灭菌交接单转换代理灭菌单的指定科室
@@ -399,7 +389,7 @@
 //设置密码的复杂度参数
 needBeStrongPwdWhenModifyPwd :
 {"minPwdLength":8,
-"containLetter":true,
+"containLetter":false,
 "containUppercaseLetter":false,
 "containLowerCaseLetter":false,
 "containSpecialChar":false,
@@ -445,9 +435,15 @@
 //启用第三方部门编码的功能
 enableThirdPartyDepartmentCoding:true,
 //启用密码二次验证功能
-enableTwoFactorAuthentication:1,
+enableTwoFactorAuthentication:0,
 //启用第三方账号ID
-enableThirdAccountId:true
+enableThirdAccountId:true,
+enableEarlyReturnPreservesCompletedStatus:true,
+//启用终止联动废弃外来器械包功能
+enableTerminationLinkageToDecommissionForeignTousses:true,
+enableTwoFactorAuthentication:1
+//	启用忘记密码功能
+//enableForgotPasswordFunction:true
 
 
 }
\ No newline at end of file