Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r30142 -r30143 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30142) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 30143) @@ -4909,8 +4909,12 @@ bean.setColumnName(columnName); bean.setMoney(money); bean.setHospitalDistrict(hospitalDistrict); - if(StringUtils.isNotBlank(hospitalDistrict) && enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ - newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, money, list, hospitalDistrict, false); + if(enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ + if(StringUtils.isBlank(hospitalDistrict)){ + newMonthReport(null, "合计_", columnNum, columnTitle, columnName, money, list, hospitalDistrict, false); + }else{ + newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, money, list, hospitalDistrict, false); + } } list.add(bean); } @@ -4935,8 +4939,12 @@ bean.setColumnName(columnName); bean.setAmount(amount); bean.setHospitalDistrict(hospitalDistrict); - if(StringUtils.isNotBlank(hospitalDistrict) && enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ - newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, amount, list, hospitalDistrict, false); + if(enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ + if(StringUtils.isBlank(hospitalDistrict)){ + newMonthReport(null, "合计_", columnNum, columnTitle, columnName, amount, list, hospitalDistrict, false); + }else{ + newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, amount, list, hospitalDistrict, false); + } } list.add(bean); } @@ -4955,8 +4963,12 @@ bean.setIntegral(integral); } bean.setHospitalDistrict(hospitalDistrict); - if(StringUtils.isNotBlank(hospitalDistrict) && enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ - newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, amount, list, integral, hospitalDistrict, false); + if(enableMultipleBranchesOfHospital != null && enableMultipleBranchesOfHospital){ + if(StringUtils.isBlank(hospitalDistrict)){ + newMonthReport(null, "合计_", columnNum, columnTitle, columnName, amount, list, integral, hospitalDistrict, false); + }else{ + newMonthReport(null, "合计_"+ hospitalDistrict, columnNum, columnTitle, columnName, amount, list, integral, hospitalDistrict, false); + } } list.add(bean); }