Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp =================================================================== diff -u -r27366 -r27389 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp (.../summaryUseRecordForGoodsAndDepartView.jsp) (revision 27366) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp (.../summaryUseRecordForGoodsAndDepartView.jsp) (revision 27389) @@ -21,7 +21,7 @@ } %> -使用记录物品分类汇总表 +使用记录物品分类汇总表(病人所在科室) Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r27388 -r27389 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27388) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27389) @@ -597,8 +597,8 @@ {hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表 -病人所在科室",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true}, - {hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品分类汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :!sstsConfig.enableUseRecordByPatientDept,text:"使用记录物品汇总表(病人所在科室)",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r27366 -r27389 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27366) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27389) @@ -2209,14 +2209,14 @@ } else if (reportName.equals("summaryUseRecordForGoods")) { String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); - String title = "使用记录物品分类汇总表 (" + startDay + " ~ " + endDay + ")"; + String title = "使用记录物品分类汇总表(病人所在科室)(" + startDay + " ~ " + endDay + ")"; String departColumnName = StrutsParamUtils.getPraramValue("departColumnName", "病区"); map.put("departColumnName", departColumnName); map.put("title", title); }else if("summaryUseRecord".equals(reportName)){ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); String endDay = StrutsParamUtils.getPraramValue("endDay", ""); - String title = "使用记录物品汇总表 (" + startDay + " ~ " + endDay + ")"; + String title = "使用记录物品汇总表(病人所在科室)(" + startDay + " ~ " + endDay + ")"; map.put("title", title); }else if (reportName.equals("QualityMonitoringInspectMonthReport")) { String year = StrutsParamUtils.getPraramValue("queryYear", null); Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.js =================================================================== diff -u -r27382 -r27389 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.js (.../summaryUseRecordView.js) (revision 27382) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.js (.../summaryUseRecordView.js) (revision 27389) @@ -1,4 +1,4 @@ -var entityName = "使用记录物品汇总表"; +var entityName = "使用记录物品汇总表(病人所在科室)"; var form; var myMask; function reloadReport(){ Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.jsp =================================================================== diff -u -r27366 -r27389 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.jsp (.../summaryUseRecordView.jsp) (revision 27366) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordView.jsp (.../summaryUseRecordView.jsp) (revision 27389) @@ -21,7 +21,7 @@ } %> -使用记录物品分类汇总表 +使用记录物品汇总表(病人所在科室) Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.js =================================================================== diff -u -r27382 -r27389 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.js (.../summaryUseRecordForGoodsAndDepartView.js) (revision 27382) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/summaryUseRecordForGoodsAndDepartView.js (.../summaryUseRecordForGoodsAndDepartView.js) (revision 27389) @@ -1,4 +1,4 @@ -var entityName = "使用记录物品分类汇总表-病人所在科室"; +var entityName = "使用记录物品分类汇总表(病人所在科室)"; var form; var myMask; function reloadReport(){