Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r29890 -r29894 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29890) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 29894) @@ -5698,7 +5698,7 @@ double price = item.getAmount() == 0?dmi.getPrice(): item.getSettlementPrice() / item.getAmount(); item.setPrice(price); removeItems.add(dmi); - }else if(DisposableGoods.TYPE_NAME.equals(type)){//一次性物品 + }else if(!showBatch && DisposableGoods.TYPE_NAME.equals(type)){//一次性物品 DepartmentMonthDetailItem item = null; if(disposableGoodsTempMap.containsKey(tousseName)){ item = disposableGoodsTempMap.get(tousseName); @@ -5714,10 +5714,8 @@ item.setPrice(price); removeItems.add(dmi); }else{ - if(!showBatch){ - dmi.setBatchNumber(null); - dmi.setExpDate(null); - } + dmi.setBatchNumber(null); + dmi.setExpDate(null); disposableGoodsTempMap.put(tousseName, dmi); } }