Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r13146 -r13152 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13146) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 13152) @@ -3721,7 +3721,7 @@ if("是".equals(diposable)){ columnName = "一次性物品总价"; }else{ - columnName = "器械包价格"; + columnName = "器械包总价"; } newMonthReport(code, dept,"1", "价格统计",columnName,price, list); } @@ -3740,7 +3740,7 @@ String code = materialInvoicePriceResultSet.getString(1); String dept = materialInvoicePriceResultSet.getString(2); Double price = materialInvoicePriceResultSet.getDouble(3); - String columnName = "材料价格"; + String columnName = "材料总价"; newMonthReport(code, dept,"1", "价格统计",columnName,price, list); } @@ -3832,7 +3832,7 @@ Double amount = rs3.getDouble(5); newMonthReport(code, dept,"2", "数量统计","材料数量",amount, list); - newMonthReport(code, dept,"1", "价格统计","材料价格",money, list); + newMonthReport(code, dept,"1", "价格统计","材料总价",money, list); } } }catch(Exception e){ @@ -3861,7 +3861,7 @@ Double amount = rs33.getDouble(5); newMonthReport(code, dept, "2", "数量统计", "材料数量", amount, list); - newMonthReport(code, dept, "1", "价格统计", "材料价格", money, list); + newMonthReport(code, dept, "1", "价格统计", "材料总价", money, list); } } }catch(Exception e){ @@ -3886,7 +3886,7 @@ newMonthReport(code, config.getOrgUnitName(), "1", "价格统计", "一次性物品总价", price, list); newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "一次性物品数量", amount, list); }else{ - newMonthReport(code, config.getOrgUnitName(), "1", "价格统计", "材料价格", price, list); + newMonthReport(code, config.getOrgUnitName(), "1", "价格统计", "材料总价", price, list); newMonthReport(code, config.getOrgUnitName(), "2", "数量统计", "材料数量", amount, list); } } @@ -3914,7 +3914,7 @@ newMonthReport(code, dept, "1", "价格统计", "一次性物品总价", price, list); newMonthReport(code, dept, "2", "数量统计", "一次性物品数量", amount, list); }else{ - newMonthReport(code, dept, "1", "价格统计", "器械包价格", price, list); + newMonthReport(code, dept, "1", "价格统计", "器械包总价", price, list); newMonthReport(code, dept, "2", "数量统计", "器械包数量", amount, list); } }