Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35476 -r35483 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35476) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35483) @@ -1029,15 +1029,15 @@ .append(endYear).append("年").append(endMonth).append("月").append(endDay).append("日")); }else if("dgshlyyMode".equals(patternOfReport)){ if(!"一次性物品".equals(tousseType) && StringUtils.isNotBlank(tousseType) && !tousseType.contains(",")){ - parametMap.put("title", "核算月报("+ tousseType +")(" + startDate + " & " + endDate + ")"); + parametMap.put("title", "供应室出库汇总表("+ tousseType +")(" + startDate + " & " + endDate + ")"); }else if("一次性物品".equals(tousseType)){ if(StringUtils.isBlank(disposableGoodsType)){ - parametMap.put("title", "核算月报(一次性物品)(" + startDate + " & " + endDate + ")"); + parametMap.put("title", "供应室出库汇总表(一次性物品)(" + startDate + " & " + endDate + ")"); }else{ - parametMap.put("title", "核算月报("+ disposableGoodsType +")(" + startDate + " & " + endDate + ")"); + parametMap.put("title", "供应室出库汇总表("+ disposableGoodsType +")(" + startDate + " & " + endDate + ")"); } }else{ - String title = StringTools.defaultIfBlank(CssdUtils.getSystemSetConfigByName("monthReportName"),"核算月报"); + String title = StringTools.defaultIfBlank(CssdUtils.getSystemSetConfigByName("monthReportName"),"供应室出库汇总表"); parametMap.put("title", title + "(" + startDate + " & " + endDate + ")"); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd");