Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r34593 -r34594 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34593) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 34594) @@ -993,7 +993,6 @@ }else{ String title = StringTools.defaultIfBlank(CssdUtils.getSystemSetConfigByName("monthReportName"),"核算月报"); parametMap.put("title", title + "(" + startDate + " & " + endDate + ")"); - parametMap.put("printTitle", "供应室出库统计表(" + startDate + " & " + endDate + ")"); } SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd"); parametMap.put("footerInfo", "核对人: 审查人: 制单人:" + AcegiHelper.getLoginUser().getUserFullName() + " 打印时间:" + sdf.format(new Date())); @@ -2858,7 +2857,21 @@ map.put("tabulator", "制表人:" + AcegiHelper.getLoginUser().getUserFullName()); map.put("statisticsTime", "统计时间:" + startTime.substring(0, 10) + "~" + endTime.substring(0, 10)); map.put("amountFormat", moneyDigitCount == 2?"###0.00":"###0.0000"); - }else{ + }else if("dgshlyyMode".equals(patternOfReport)){ + String tousseType = StrutsParamUtils.getPraramValue("tousseType",null); + String disposableGoodsType = StrutsParamUtils.getPraramValue("disposableGoodsType", "");; + if(!"一次性物品".equals(tousseType) && StringUtils.isNotBlank(tousseType) && !tousseType.contains(",")){ + map.put("title", "核算月报("+ tousseType +")(" + startTime + " & " + endTime + ")"); + }else if("一次性物品".equals(tousseType)){ + if(StringUtils.isBlank(disposableGoodsType)){ + map.put("title", "核算月报(一次性物品)(" + startTime + " & " + endTime + ")"); + }else{ + map.put("title", "核算月报("+ disposableGoodsType +")(" + startTime + " & " + endTime + ")"); + } + }else{ + map.put("title", "供应室出库统计表(" + startTime + " & " + endTime + ")"); + } + } else{ title = "明细核算月报(" + startTime +" & " + endTime +")"; map.put("amountFormat", moneyDigitCount == 2?"###0.00;-###0.00":"###0.0000;-###0.0000"); }