Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35740 -r35741 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35740) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35741) @@ -8347,11 +8347,8 @@ totalPriceDiscount += dmi.getSettlementDiscountPrice(); } list.removeAll(removeItems); - Iterator itr2 = tmpMap.keySet().iterator(); - while(itr2.hasNext()){ - String key = itr2.next(); - DepartmentMonthDetailItem dmi = tmpMap.get(key); - list.add(dmi); + if(tmpMap.size() > 0){ + list.addAll(tmpMap.values()); } DepartmentMonthDetail detail = new DepartmentMonthDetail(); detail.setDepart(depart); @@ -9509,15 +9506,15 @@ String key = entry2.getKey(); Map map = entry2.getValue(); if(map.containsKey(month)){ - if(adverseEventRecordAmountMap.keySet().size() > 1){ + if(adverseEventRecordAmountMap.size() > 1){ sumAmount = MathTools.add(sumAmount, map.get(month)).intValue(); } amountTotalMap.put(dataIndexNameForDisplay, MathTools.add(map.get(month) , amountTotalMap.get(dataIndexNameForDisplay)).intValue()); } addYearWorkLoadBean(i, month, map, num, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUT + "_" + key, list, yearMonth); } - if(adverseEventRecordAmountMap.keySet().size() > 1){ + if(adverseEventRecordAmountMap.size() > 1){ YearWorkloadBean beanSum = new YearWorkloadBean(i, yearMonth, num, AdverseEventRecord.EVENTNAME_FOREIGNTOUSSESENDTIMEOUT + "_合计", sumAmount); list.add(beanSum); } @@ -9710,7 +9707,7 @@ } String[] childrens = null; String[] sumAmounts = null; - if(adverseEventRecordAmountMap.keySet().size() > 1){ + if(adverseEventRecordAmountMap.size() > 1){ childrens = new String[adverseEventRecordAmountMap.keySet().size() + 1]; sumAmounts = new String[adverseEventRecordAmountMap.keySet().size() + 1]; }else{ @@ -9725,9 +9722,9 @@ childrens[k] = key; k++; } - if(adverseEventRecordAmountMap.keySet().size() > 1){ - childrens[adverseEventRecordAmountMap.keySet().size()] = "合计"; - sumAmounts[adverseEventRecordAmountMap.keySet().size()] = sumAmount + ""; + if(adverseEventRecordAmountMap.size() > 1){ + childrens[adverseEventRecordAmountMap.size()] = "合计"; + sumAmounts[adverseEventRecordAmountMap.size()] = sumAmount + ""; } JSONObject obj = new JSONObject(); obj.put("children", childrens); @@ -15520,9 +15517,6 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - - - Set sterilingTypes = map.keySet(); for(Entry> entry : map.entrySet()){ String sterilingType = entry.getKey(); ArrayList tousseNameAndBarcodes = entry.getValue(); @@ -15675,7 +15669,6 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - Iterator itr = map.keySet().iterator(); for(Entry entry : map.entrySet()){ String key = entry.getKey(); String rowName = key; @@ -18368,7 +18361,6 @@ /** * 4、把departmentToPatientArea和patientAreaToGoods存储的信息转成javaBean供报表展现 */ - Set departmentCodes = departmentToPatientArea.keySet(); for(Entry> entry : departmentToPatientArea.entrySet()){ String departmentCode = entry.getKey(); Set patientAreaVOs = entry.getValue(); @@ -19067,14 +19059,15 @@ */ private void addQualifiedAmountInfo(Map isQualifiedAmount,Map isQualifiedMaterialAmount, List list, Integer orderNumber, String option, String questionName){ - for (String key : isQualifiedAmount.keySet()) { + for(Entry entry : isQualifiedAmount.entrySet()){ + String key = entry.getKey(); MonitoringItemBean mib = new MonitoringItemBean(); mib.setGoodsName(""); mib.setDateTime(key); mib.setOrderNumber(orderNumber); mib.setOption(option); mib.setQuestionName(questionName); - mib.setAmount(isQualifiedAmount.get(key)); + mib.setAmount(entry.getValue()); mib.setRegisterMaterialAmount(isQualifiedMaterialAmount.get(key)); mib.setPositionMsg(""); list.add(mib); @@ -19251,13 +19244,14 @@ if(!supplyRoomConfigManager.isFirstOrSecondSupplyRoomOrgUnit(currentOrgUnitCode)){ fiOrgUnitCodingSql = SqlUtils.get_InSql_Extra("fi.orgUnitCoding", currentOrgUnitCode); } - for (String key : startAndEndDays.keySet()) { + for(Entry> entry : startAndEndDays.entrySet()){ + String key = entry.getKey(); String startDay = null; String endDay = null; - Map innerMap = startAndEndDays.get(key); - for (String keyOfInnerMap : innerMap.keySet()) { - startDay = keyOfInnerMap; - endDay = innerMap.get(keyOfInnerMap); + Map innerMap = entry.getValue(); + for(Entry entry2 : innerMap.entrySet()){ + startDay = entry2.getKey(); + endDay = entry2.getValue(); } List resultNameList = new ArrayList(); String sql = ""; @@ -20957,9 +20951,8 @@ objectDao.saveOrUpdate(config); map.remove(name); } - for (String key : map.keySet()) { - WorkScoreConfig config = map.get(key); - objectDao.delete(config); + for(Entry entry : map.entrySet()){ + objectDao.delete(entry.getValue()); } } } @@ -23249,14 +23242,14 @@ DatabaseUtil.closeResultSetAndStatement(result); } if(map.size() > 0){ - for(String keyName : map.keySet()){ + for(Entry> entry : map.entrySet()){ MaterialMissBean bean = new MaterialMissBean(); - bean.setKeyName(keyName); - bean.setItems(map.get(keyName)); - Integer sumAmount = getMissMaerialAmount(map.get(keyName)); - String rate = MathTools.divideStr(sumAmount, totalAmount, 2); + bean.setKeyName(entry.getKey()); + List materialMissItemBeans = entry.getValue(); + bean.setItems(materialMissItemBeans); + Integer sumAmount = getMissMaerialAmount(materialMissItemBeans); bean.setAmount(sumAmount); - bean.setRate(rate); + bean.setRate(MathTools.divideStr(sumAmount, totalAmount, 2)); list.add(bean); } } @@ -24126,8 +24119,8 @@ } Set keySet = map.keySet(); - for (String key : keySet) { - ArrayList items = map.get(key); + for(Entry> entry : map.entrySet()){ + ArrayList items = entry.getValue(); TousseApplyDepartment tousseApplyDepartment = new TousseApplyDepartment(); tousseApplyDepartment.setDepartmentCode(items.get(0).getDepartmentCode()); tousseApplyDepartment.setDepartmentName(items.get(0).getDepartmentName()); @@ -24772,8 +24765,7 @@ rsMap1.put(specifyKey + SupplyRoomQualityQuota.RATIO, result); } } else { - Set keySet = rsMap2.keySet(); - for (String key : keySet) { + for (String key : rsMap2.keySet()) { Integer value1 = MapUtils.getIntValue(rsMap1, key, 0); Integer value2 = MapUtils.getIntValue(rsMap2, key, 0); String result = "0%"; @@ -24812,9 +24804,9 @@ private Map getQualifiedAmountMap(Map sumAmountMap, Map unqualifiedAmountMap) { Map map = new HashMap(); if (MapUtils.isNotEmpty(sumAmountMap)) { - Set keySet = sumAmountMap.keySet(); - for (String date : keySet) { - Integer sumAmount = MapUtils.getIntValue(sumAmountMap, date, 0); + for(Entry entry : sumAmountMap.entrySet()){ + String date = entry.getKey(); + Integer sumAmount = MathTools.parseInt(entry.getValue()); Integer unqualifiedAmount = MapUtils.getIntValue(unqualifiedAmountMap, date, 0); map.put(date, sumAmount - unqualifiedAmount); } @@ -24981,8 +24973,8 @@ } } } else if("yyyy".equals(format)){ - for (String key : packAmountMap.keySet()) { - map.put(key, packAmountMap.get(key)); + for(Entry entry : packAmountMap.entrySet()){ + map.put(entry.getKey(), entry.getValue()); } } else{ for (int i = 1; i <= size; i++) { @@ -25330,14 +25322,15 @@ private Map replaceKey(Map map, String queryScope, String thisYear){ if(SupplyRoomQualityQuota.YEAR.equals(queryScope) && MapUtils.isNotEmpty(map)){ Map newMap = new HashMap(); - for (String key : map.keySet()) { + for(Entry entry : map.entrySet()){ + String key = entry.getKey(); if(SupplyRoomQualityQuota.TOTAL.equals(key)){ continue; } if(thisYear.equals(key)){ - newMap.put("今年", map.get(key)); + newMap.put("今年", entry.getValue()); }else{ - newMap.put("去年", map.get(key)); + newMap.put("去年", entry.getValue()); } } return newMap; @@ -26140,10 +26133,10 @@ departMap.put(orgUnitName, list); } if(departMap.size() > 0){ - for (String depart : departMap.keySet()) { + for(Entry> entry : departMap.entrySet()){ TousseReturnDisinfectionForDepartment vo = new TousseReturnDisinfectionForDepartment(); - vo.setDepart(depart); - vo.setChildren(departMap.get(depart)); + vo.setDepart(entry.getKey()); + vo.setChildren(entry.getValue()); result.add(vo); } } @@ -26220,10 +26213,10 @@ departMap.put(orgUnitName, list); } if(departMap.size() > 0){ - for (String depart : departMap.keySet()) { + for(Entry> entry : departMap.entrySet()){ TousseReturnDisinfectionForDepartment vo = new TousseReturnDisinfectionForDepartment(); - vo.setDepart(depart); - vo.setChildren(departMap.get(depart)); + vo.setDepart(entry.getKey()); + vo.setChildren(entry.getValue()); result.add(vo); } } @@ -28810,37 +28803,28 @@ Double notRatherSatisfyTotal = null; Double noSatisfyTotal = null; Double mylTotal = null; - for (String satisfactionMode : totalScores.keySet()) { + for(Entry entry : totalScores.entrySet()){ + String satisfactionMode = entry.getKey(); if (StringUtils.equals("absSatisfy", satisfactionMode)) { - absSatisfyTotal = totalScores - .get(satisfactionMode) - .multiply(new BigDecimal("100")) + absSatisfyTotal = entry.getValue().multiply(new BigDecimal("100")) .divide(totalScores.get("total"), 2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } else if (StringUtils .equals("ratherSatisfy", satisfactionMode)) { - ratherSatisfyTotal = totalScores - .get(satisfactionMode) - .multiply(new BigDecimal("100")) + ratherSatisfyTotal = entry.getValue().multiply(new BigDecimal("100")) .divide(totalScores.get("total"), 2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } else if (StringUtils.equals("basicSatisfy", satisfactionMode)) { - basicSatisfyTotal = totalScores - .get(satisfactionMode) - .multiply(new BigDecimal("100")) + basicSatisfyTotal = entry.getValue().multiply(new BigDecimal("100")) .divide(totalScores.get("total"), 2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } else if (StringUtils.equals("notRatherSatisfy", satisfactionMode)) { - notRatherSatisfyTotal = totalScores - .get(satisfactionMode) - .multiply(new BigDecimal("100")) + notRatherSatisfyTotal = entry.getValue().multiply(new BigDecimal("100")) .divide(totalScores.get("total"), 2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); } else if (StringUtils.equals("noSatisfy", satisfactionMode)) { - noSatisfyTotal = totalScores - .get(satisfactionMode) - .multiply(new BigDecimal("100")) + noSatisfyTotal = entry.getValue().multiply(new BigDecimal("100")) .divide(totalScores.get("total"), 2, BigDecimal.ROUND_HALF_EVEN).doubleValue(); mylTotal = totalScores @@ -28967,151 +28951,126 @@ Map> itemMap = extractSatisfactionSurveySourceMap( info, tables, satisfactionSurveyTemplateIds); List items = new ArrayList(); - for (String content : itemMap.keySet()) { + for(Entry> entry : itemMap.entrySet()){ SatisfyItem satisfyItem = new SatisfyItem(); - satisfyItem.setContent(content); - Map scoreMap = itemMap.get(content); + satisfyItem.setContent(entry.getKey()); + Map scoreMap = entry.getValue(); BigDecimal scoreOfTheContent = new BigDecimal("0"); BigDecimal totalScore = null; - for (String satisfactionMode : scoreMap.keySet()) { + for(Entry entry2 : scoreMap.entrySet()){ + String satisfactionMode = entry2.getKey(); + String score = entry2.getValue(); + String[] scoreArr = score.split(";"); if (StringUtils.equals(satisfactionMode, "absSatisfy")) { satisfyItem.setAbsSatisfy_percent(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])) - .divide(BigDecimal.valueOf(Long.valueOf(scoreMap - .get(satisfactionMode).split(";")[1])), 2, + Long.valueOf(scoreArr[0])) + .divide(BigDecimal.valueOf(Long.valueOf(scoreArr[1])), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).doubleValue()); scoreOfTheContent = scoreOfTheContent.add(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])).multiply( + Long.valueOf(scoreArr[0])).multiply( new BigDecimal("5"))); totalScore = BigDecimal.valueOf( - Long.valueOf(scoreMap.get(satisfactionMode).split( - ";")[1])).multiply(new BigDecimal("5")); + Long.valueOf(scoreArr[1])).multiply(new BigDecimal("5")); BigDecimal absSatisfyTotal = null; if (totalScores.get("absSatisfy") != null) { absSatisfyTotal = totalScores.get("absSatisfy").add( - new BigDecimal(scoreMap.get(satisfactionMode) - .split(";")[0])); + new BigDecimal(scoreArr[0])); } else { - absSatisfyTotal = new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0]); + absSatisfyTotal = new BigDecimal(scoreArr[0]); } totalScores.put("absSatisfy", absSatisfyTotal); BigDecimal total = null; if (totalScores.get("total") != null) { total = totalScores.get("total").add( - new BigDecimal(scoreMap.get(satisfactionMode) - .split(";")[1])); + new BigDecimal(scoreArr[1])); } else { - total = new BigDecimal(scoreMap.get(satisfactionMode) - .split(";")[1]); + total = new BigDecimal(scoreArr[1]); } totalScores.put("total", total); } else if (StringUtils .equals(satisfactionMode, "ratherSatisfy")) { satisfyItem.setRatherSatisfy_percent(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])) - .divide(BigDecimal.valueOf(Long.valueOf(scoreMap - .get(satisfactionMode).split(";")[1])), 2, + Long.valueOf(scoreArr[0])) + .divide(BigDecimal.valueOf(Long.valueOf(scoreArr[1])), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).doubleValue()); scoreOfTheContent = scoreOfTheContent.add(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])).multiply( + Long.valueOf(scoreArr[0])).multiply( new BigDecimal("4"))); BigDecimal ratherSatisfyTotal = null; if (totalScores.get("ratherSatisfy") != null) { ratherSatisfyTotal = totalScores.get("ratherSatisfy") - .add(new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0])); + .add(new BigDecimal(scoreArr[0])); } else { - ratherSatisfyTotal = new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0]); + ratherSatisfyTotal = new BigDecimal(scoreArr[0]); } totalScores.put("ratherSatisfy", ratherSatisfyTotal); } else if (StringUtils.equals(satisfactionMode, "basicSatisfy")) { satisfyItem.setBasicSatisfy_percent(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])) - .divide(BigDecimal.valueOf(Long.valueOf(scoreMap - .get(satisfactionMode).split(";")[1])), 2, + Long.valueOf(scoreArr[0])) + .divide(BigDecimal.valueOf(Long.valueOf(scoreArr[1])), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).doubleValue()); scoreOfTheContent = scoreOfTheContent.add(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])).multiply( + Long.valueOf(scoreArr[0])).multiply( new BigDecimal("3"))); BigDecimal basicSatisfyTotal = null; if (totalScores.get("basicSatisfy") != null) { basicSatisfyTotal = totalScores.get("basicSatisfy") - .add(new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0])); + .add(new BigDecimal(scoreArr[0])); } else { - basicSatisfyTotal = new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0]); + basicSatisfyTotal = new BigDecimal(scoreArr[0]); } totalScores.put("basicSatisfy", basicSatisfyTotal); } else if (StringUtils.equals(satisfactionMode, "notRatherSatisfy")) { satisfyItem.setNotRatherSatisfy_percent(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])) - .divide(BigDecimal.valueOf(Long.valueOf(scoreMap - .get(satisfactionMode).split(";")[1])), 2, + Long.valueOf(scoreArr[0])) + .divide(BigDecimal.valueOf(Long.valueOf(scoreArr[1])), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).doubleValue()); scoreOfTheContent = scoreOfTheContent.add(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])).multiply( + Long.valueOf(scoreArr[0])).multiply( new BigDecimal("2"))); BigDecimal notRatherSatisfyTotal = null; if (totalScores.get("notRatherSatisfy") != null) { notRatherSatisfyTotal = totalScores.get( "notRatherSatisfy").add( - new BigDecimal(scoreMap.get(satisfactionMode) - .split(";")[0])); + new BigDecimal(scoreArr[0])); } else { - notRatherSatisfyTotal = new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0]); + notRatherSatisfyTotal = new BigDecimal(scoreArr[0]); } totalScores.put("notRatherSatisfy", notRatherSatisfyTotal); } else if (StringUtils.equals(satisfactionMode, "noSatisfy")) { satisfyItem.setNoSatisfy_percent(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])) - .divide(BigDecimal.valueOf(Long.valueOf(scoreMap - .get(satisfactionMode).split(";")[1])), 2, + Long.valueOf(scoreArr[0])) + .divide(BigDecimal.valueOf(Long.valueOf(scoreArr[1])), 2, RoundingMode.HALF_UP) .multiply(BigDecimal.valueOf(100)).doubleValue()); scoreOfTheContent = scoreOfTheContent.add(BigDecimal .valueOf( - Long.valueOf(scoreMap.get(satisfactionMode) - .split(";")[0])).multiply( + Long.valueOf(scoreArr[0])).multiply( new BigDecimal("1"))); BigDecimal noSatisfyTotal = null; if (totalScores.get("noSatisfy") != null) { noSatisfyTotal = totalScores.get("noSatisfy").add( - new BigDecimal(scoreMap.get(satisfactionMode) - .split(";")[0])); + new BigDecimal(scoreArr[0])); } else { - noSatisfyTotal = new BigDecimal(scoreMap.get( - satisfactionMode).split(";")[0]); + noSatisfyTotal = new BigDecimal(scoreArr[0]); } totalScores.put("noSatisfy", noSatisfyTotal); }