Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java =================================================================== diff -u -r36916 -r36918 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java (.../QualityMonitoringHelper.java) (revision 36916) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java (.../QualityMonitoringHelper.java) (revision 36918) @@ -655,7 +655,7 @@ List> listMap = getBeanMap(list,numNames); if( listMap != null && listMap.size() > 0){ Map beanStatisticsMap = listMap.get(0); - if(beanStatisticsMap != null){ + if(!MapUtils.isEmpty(beanStatisticsMap)){ for (Map.Entry entry : beanStatisticsMap.entrySet()){ String key = entry.getKey(); String[] arr = key.split("_"); @@ -679,6 +679,17 @@ list.add(bean1); } } + }else{ + MonitoringItemBean bean1 = new MonitoringItemBean(); + bean1.setGoodsName("合计"); + bean1.setDateTime("合计"); + bean1.setOrderNumber(0); + bean1.setOption(""); + bean1.setQuestionName(""); + bean1.setAmount(totalItem); + bean1.setAnswer(""); + bean1.setPositionMsg(""); + list.add(bean1); } } Integer tousseAmoutSum = amoutSumJson.optInt("tousseAmoutSum"); @@ -723,7 +734,7 @@ List> listMap = getBeanMapByResult(list,numNames); if( listMap != null && listMap.size() > 0){ Map beanStatisticsMap = listMap.get(0); - if(beanStatisticsMap != null){ + if(!MapUtils.isEmpty(beanStatisticsMap)){ for (Map.Entry entry : beanStatisticsMap.entrySet()){ String key = entry.getKey(); String[] arr = key.split("_"); @@ -747,6 +758,17 @@ list.add(bean1); } } + }else{ + MonitoringItemBean bean1 = new MonitoringItemBean(); + bean1.setGoodsName("合计"); + bean1.setDateTime("合计"); + bean1.setOrderNumber(0); + bean1.setOption(""); + bean1.setQuestionName(""); + bean1.setAmount(totalAmount); + bean1.setAnswer(""); + bean1.setPositionMsg(""); + list.add(bean1); } if(totalAmount != null && totalAmount > 0){ addQualifiedAmountInfo(isQualifiedAmount,isQualifiedMaterialAmount, list, orderNumber, option, questionName);