Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r20070 -r20092 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 20070) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 20092) @@ -182,6 +182,8 @@ enableClassifyBasketSequence:true, //对申请单的物品申请数量是否启用干预功能(true为启用,false或者不配置都不启用) enableInterfereApplyAmount:true, + //科室申领那里的申请单列表是否隐藏手术预约申请单(true为隐藏,false或者不配置都会显示) + hideReservationList:true, //同步入库单失效时期默认值,添加3年 defaultExpDate:3, //是否启用快速回收一键入筐功能 Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r20058 -r20092 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 20058) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 20092) @@ -203,21 +203,14 @@ ReAppTableSqlHandler reAppTableSqlHandler = ReAppTableSqlHandler.getInstance(dateQueryAdapter); List excludeTypelist = new ArrayList(); excludeTypelist.add(InvoicePlan.TYPE_PROXYDISINFECTION); -// excludeTypelist.add(InvoicePlan.TYPE_FOREIGNPROXYDISINFECTION); -// excludeTypelist.add(InvoicePlan.TYPE_SECOND_SUPPLY_ROOM); excludeTypelist.add(InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM); excludeTypelist.add(InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION); -// //是否显示外来器械包申请单 -// boolean showForeignTousseApplication = showForeignTousseApplication(); -// if(!showForeignTousseApplication){ -// excludeTypelist.add(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION); -// } + if (CssdUtils.getSystemSetConfigByNameBool("hideReservationList", false)) { + excludeTypelist.add(InvoicePlan.TYPE_OPERATION_RESERVATION_APPLICATION); + } StringBuilder sqlBuilder = new StringBuilder(); - // sqlBuilder.append(" WHERE " - // + SqlBuilder.build_IN_Statement("po.type", SqlBuilder.NOT_IN, - // excludeTypelist)); Map sqlWhereParamMap = gridManager.getParamFromView(parameterMap); sqlBuilder.append(" WHERE (" + SqlBuilder.build_IN_Statement("po.type", SqlBuilder.NOT_IN, excludeTypelist));