Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r15388 -r15400 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 15388) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 15400) @@ -2073,6 +2073,24 @@ } } } + if("质量监测".equals(monitoringType) && (answers == null || answers.size() <= 0)){ + MonitoringItemBean bean = new MonitoringItemBean(); + bean.setAmount(qualityMonitoring.getAmount()); + bean.setDateTime(dateStr); + // 数量默认是材料的 + String goodsName = qualityMonitoring + .getMaterial(); + if (StringUtils.isBlank(goodsName)) { + goodsName = qualityMonitoring.getTousseName(); + } + bean.setGoodsName(goodsName + "%&" + qualityMonitoring.getId()); + bean.setPositionMsg(qualityMonitoring.getPositionMsg()); + bean.setOrderNumber(1); + bean.setOption("-");// 表头第三列 + bean.setQuestionName("-");// 表头第二列 + bean.setAnswer(""); + list.add(bean); + } // if ("定期监测".equals(monitoringType)) { MonitoringItemBean bean = new MonitoringItemBean(); @@ -2154,7 +2172,11 @@ bean2.setOption(_option); bean2.setQuestionName(_questionName); bean2.setAmount(totalAmount); - bean2.setAnswer(anwserInt+""); + if(key.equals("1_-_-")){ + bean2.setAnswer(""); + }else{ + bean2.setAnswer(anwserInt+""); + } bean2.setPositionMsg(""); list.add(bean2); } @@ -2295,6 +2317,17 @@ map2.put(key, value); } } + }else if(key.equals("1_-_-")){ + // 统计项没有结果,只有材料(器械包)和数量的数据 + Integer amount = mt.getAmount(); + if(amount != null && amount > 0){ + if( !map2.containsKey(key) ){ + map2.put(key, amount); + }else{ + int value = map2.get(key) + amount; + map2.put(key, value); + } + } } } listMap.add(map);