Index: ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js =================================================================== diff -u -r23505 -r23693 --- ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23505) +++ ssts-web/src/main/webapp/disinfectsystem/config/kpszxyy/config.js (.../config.js) (revision 23693) @@ -79,5 +79,7 @@ isShowTousseGroup:true, -showRememberRecycleUserButton:true +showRememberRecycleUserButton:true, +//是否显示代理灭菌单isShowPROXYDISINFECTION +isShowProxyDisinfection:true } \ No newline at end of file Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java =================================================================== diff -u -r23688 -r23693 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23688) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java (.../RecyclingApplicationTableManager.java) (revision 23693) @@ -215,7 +215,10 @@ //2、不包含的申请单类型 List excludeTypelist = new ArrayList(); -// excludeTypelist.add(InvoicePlan.TYPE_PROXYDISINFECTION); + //判断是否需要显示“代理灭菌单” + if(!CssdUtils.getSystemSetConfigByNameBool("isShowProxyDisinfection", false)){ + excludeTypelist.add(InvoicePlan.TYPE_PROXYDISINFECTION); + } excludeTypelist.add(InvoicePlan.TYPE_APPLYING_FOR_RETURN_FORM); excludeTypelist.add(InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION); if (CssdUtils.getSystemSetConfigByNameBool("hideReservationList", false)) { //手术预约申请单