Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35693 -r35702 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35693) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35702) @@ -5087,9 +5087,6 @@ if(!containsCharge){ containsCharge = true; } - if(i == columnName.size() - 1){ - totalIndex = i; - } totalIndex = i; } } @@ -5105,18 +5102,6 @@ if(!containsCharge){ containsCharge = true; } - if(i == totalIndex){ - JSONObject totalChildren = new JSONObject(); - if(columnTitle.contains("数")){ - totalChildren.put("name", "一次性物品数量"); - totalChildren.put("displayName", "一次性物品数量_总数"); - }else{ - totalChildren.put("name", "一次性物品总价"); - totalChildren.put("displayName", "一次性物品总价_总价"); - } - totalChildren.put("colspan", chargeCount + 1); - childrens.add(totalChildren); - } }else{ if(hasWhetherToCharge){ children.put("rowspan", 3); @@ -5125,6 +5110,18 @@ } children.put("displayName", itemColumnName); childrens.add(children); + if(i == totalIndex){ + JSONObject totalChildren = new JSONObject(); + if(columnTitle.contains("数")){ + totalChildren.put("name", "一次性物品数量"); + totalChildren.put("displayName", "一次性物品数量_总数"); + }else{ + totalChildren.put("name", "一次性物品总价"); + totalChildren.put("displayName", "一次性物品总价_总价"); + } + totalChildren.put("colspan", chargeCount + 1); + childrens.add(totalChildren); + } } if(containsCharge){ titleObj.put("colspan", columnName.size() + 1);