Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35703 -r35714 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35703) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35714) @@ -489,7 +489,7 @@ * @param jasperreportName 报表模板,不同的报表模板有不同的业务(中医药附三的手工入库数量要和同步入库数量分开) * @param reportName 报表的名称,不同的报表有不同的名称,加以区分 * @param requestParameters http请求的参数 - * @param Map parametMap 报表需要的参数 + * @param parametMap 报表需要的参数 * @return * @throws SQLException * @throws ParseException @@ -737,8 +737,7 @@ if("split".equals(queryScope)){ parametMap.put("title", String.format("%s年上半年、下半年%s", queryYear,title)); }else if("compareToLastYear".equals(queryScope)){ - String lastYear = (Integer.valueOf(queryYear) - 1) + ""; - parametMap.put("title", String.format("%s年、%s年%s", lastYear,queryYear,title)); + parametMap.put("title", String.format("%s年、%s年%s", Integer.parseInt(queryYear) - 1,queryYear,title)); }else if("月".equals(queryScope)){ parametMap.put("title", String.format("%s年%s", queryYear,title)); }else if("日期范围".equals(queryScope)){ @@ -1449,7 +1448,7 @@ String showTime = item.getShowTime(); Integer sumAmount = MathTools.add(Integer.valueOf(dateAmountMap.get("数量")), amount).intValue(); Double sumPrice = MathTools.add(Double.valueOf(dateAmountMap.get("总计")), item.getSettlementPrice()).doubleValue(); - dateAmountMap.put(showTime, MathTools.add(dateAmountMap.containsKey(showTime)?Integer.valueOf(dateAmountMap.get(showTime)):0, amount).intValue() + ""); + dateAmountMap.put(showTime, MathTools.add(dateAmountMap.containsKey(showTime)? Integer.parseInt(dateAmountMap.get(showTime)):0, amount).intValue() + ""); dateAmountMap.put("数量", sumAmount + ""); double unitPrice = 0.00d; if(sumAmount != 0){ @@ -2107,18 +2106,22 @@ } } if(totalUrgentAmount > 0){ - urgentTotalMsg = " 加急物品总数量 : " + totalUrgentAmount + " , 按级别统计 : "; + StringBuffer sbf = new StringBuffer(); + sbf.append(" 加急物品总数量 : " + totalUrgentAmount + " , 按级别统计 : "); boolean isFirst = true; for (Entry entry : urgentLevelToUrgentAmountMap.entrySet()) { String urgentLevel = entry.getKey(); Integer urgentAmount = entry.getValue(); if(isFirst){ isFirst = false; }else{ - urgentTotalMsg += " , "; + sbf.append(" , "); } - urgentTotalMsg += urgentLevel + " * " + urgentAmount; + sbf.append(urgentLevel); + sbf.append(" * "); + sbf.append(urgentAmount); } + urgentTotalMsg = sbf.toString(); } } parametMap.put("urgentTotalMsg", urgentTotalMsg); @@ -2490,7 +2493,7 @@ /** * 报表无数据时 显示默认的没数据模板 * @param list 报表数据 - * @param parametMap 报表参数 + * @param requestParameters 报表参数 */ private void setNoDataReport(List list , Map requestParameters){ if(CollectionUtils.isEmpty(list)){ @@ -3030,7 +3033,7 @@ } else if (StringUtils.equals("split", type)) { title = year + "年上半年、下半年" + showReportName; } else { - title = (Integer.valueOf(year) - 1) + "年、" + year + title = (Integer.parseInt(year) - 1) + "年、" + year + "年" + showReportName; } map.put("title", title); @@ -3248,7 +3251,7 @@ map.put("title1", "上半年"); map.put("title2", "下半年"); } else if (StringUtils.equals("compareLastForm", type)) { - title = "质量监测统计项" + year + "年跟" +(Integer.valueOf(year) - 1) + "年对比报表"; + title = "质量监测统计项" + year + "年跟" +(Integer.parseInt(year) - 1) + "年对比报表"; map.put("title", title); map.put("title1", "去年"); map.put("title2", "今年"); @@ -3458,19 +3461,13 @@ + "{ \"dataIndexNameForDisplay\": \"消毒物品不合格率\", \"dataIndexSource\": \"消毒物品不合格率\" }," + "{ \"dataIndexNameForDisplay\": \"无菌物品发放错误发生数\", \"dataIndexSource\": \"物品发放错误次数\" }]}"; } - //数据源 - Set dataIndexSources = new HashSet(); JSONObject dataConfigObj = JSONObject.fromObject(dataConfigStr); String reportName = dataConfigObj.optString("reportName"); if(StringUtils.isBlank(reportName)){ reportName = "十八项指标分析报表"; } parametMap.put("title", reportName); dataIndexsArray = dataConfigObj.optJSONArray("dataIndexsArray"); - for (int i = 0; i < dataIndexsArray.size(); i++) { - JSONObject dataConfig = (JSONObject)dataIndexsArray.get(i); - dataIndexSources.add(dataConfig.optString("dataIndexSource")); - } List definitionList = null; for (int i = 0; i < dataIndexsArray.size(); i++) { JSONObject dataConfig = (JSONObject)dataIndexsArray.get(i); @@ -4743,93 +4740,95 @@ SupplyRoomConfig cssd = supplyRoomConfigManager.getFirstSupplyRoomConfig(); if(config != null){ String ids1 = config.getGoodsIds(); //各类型输液器 + StringBuffer sbf = new StringBuffer(); if(StringUtils.isNotBlank(ids1)){ - String value = ""; for (String id : ids1.split(";")) { DisposableGoods goods = diposableGoodsManager.get(id); if(goods != null){ - if(value.length() > 0){ - value += ";"; + if(sbf.length() > 0){ + sbf.append(";"); } - value += goods.getShowName(); + sbf.append(goods.getShowName()); } } GoodsOption option = new GoodsOption(); option.setModel(GoodsOption.MODEL_APPARATUS); option.setCode(cssd.getOrgUnitCoding()); - option.setValue(value); + option.setValue(sbf.toString()); goodsOptionManager.save(option); } + sbf.setLength(0); String ids2 = config.getSelectTousseIdsForReport(); //各类型输液器 if(StringUtils.isNotBlank(ids2)){ - String value = ""; for (String id : ids2.split(";")) { TousseDefinition goods = tousseDefinitionManager.get(id); if(goods != null){ - if(value.length() > 0){ - value += ";"; + if(sbf.length() > 0){ + sbf.append(";"); } - value += goods.getName(); + sbf.append(goods.getName()); } } GoodsOption option = new GoodsOption(); option.setModel(GoodsOption.MODEL_TOUSSEWORKLOAD); option.setCode(cssd.getOrgUnitCoding()); - option.setValue(value); + option.setValue(sbf.toString()); goodsOptionManager.save(option); } + sbf.setLength(0); String ids3 = config.getInvoiceTousseIdsForRepart(); //各类型输液器 if(StringUtils.isNotBlank(ids3)){ - String value = ""; for (String id : ids3.split(";")) { TousseDefinition goods = tousseDefinitionManager.get(id); if(goods != null){ - if(value.length() > 0){ - value += ";"; + if(sbf.length() > 0){ + sbf.append(";"); } - value += goods.getName(); + sbf.append(goods.getName()); } } GoodsOption option = new GoodsOption(); option.setModel(GoodsOption.MODEL_TOUSSEDELIVERDETAIL); option.setCode(cssd.getOrgUnitCoding()); - option.setValue(value); + option.setValue(sbf.toString()); goodsOptionManager.save(option); } + sbf.setLength(0); String ids4 = config.getTousseWorkLoadForRepart(); //各类型输液器 if(StringUtils.isNotBlank(ids4)){ String value = ""; for (String id : ids4.split(";")) { TousseDefinition goods = tousseDefinitionManager.get(id); if(goods != null){ - if(value.length() > 0){ - value += ";"; + if(sbf.length() > 0){ + sbf.append(";"); } - value += goods.getName(); + sbf.append(goods.getName()); } } GoodsOption option = new GoodsOption(); option.setModel(GoodsOption.MODEL_TOUSSEDELIVERDETAIL); option.setCode(cssd.getOrgUnitCoding()); - option.setValue(value); + option.setValue(sbf.toString()); goodsOptionManager.save(option); } + sbf.setLength(0); String ids5 = config.getInvoiceAmountQueryGoodsIds(); //各类型输液器 if(StringUtils.isNotBlank(ids5)){ String value = ""; for (String id : ids5.split(";")) { DisposableGoods goods = diposableGoodsManager.get(id); if(goods != null){ - if(value.length() > 0){ - value += ";"; + if(sbf.length() > 0){ + sbf.append(";"); } - value += goods.getShowName(); + sbf.append(goods.getName()); } } GoodsOption option = new GoodsOption(); option.setModel(GoodsOption.MODEL_INVOICEAMOUNTCONTRAST); option.setCode(cssd.getOrgUnitCoding()); - option.setValue(value); + option.setValue(sbf.toString()); goodsOptionManager.save(option); } }