Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35689 -r35738 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35689) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35738) @@ -10,10 +10,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Timestamp; -import java.text.Collator; -import java.text.DecimalFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; +import java.text.*; import java.util.ArrayList; import java.util.Calendar; import java.util.Collection; @@ -1682,11 +1679,12 @@ @SuppressWarnings("unchecked") List list = objectDao.findBySql( DeviceMonitoring.class.getSimpleName(), sql); - for (DeviceMonitoring deviceMonitoring : list) { + DateFormat ymd = DateTools.YMDFORMAT.get(); + DateFormat ymdhm = DateTools.YMDHMFORMAT.get(); + for (DeviceMonitoring deviceMonitoring : list) { Map resultMap = new HashMap(); Date dt = deviceMonitoring.getBreakdownTime(); - resultMap.put("故障时间", dt == null ? "" : new SimpleDateFormat( - "yyyy-MM-dd HH:mm").format(dt)); + resultMap.put("故障时间", dt == null ? "" : ymdhm.format(dt)); resultMap.put("故障情况", deviceMonitoring.getBreakdownDescribeInfo()); resultMap.put("处理", deviceMonitoring.getResult()); @@ -1695,44 +1693,38 @@ resultMap.put("录工程师签名", ""); for (DetectionItem detectionItem : deviceMonitoring .getDetectionItems()) { - Iterator iterator = sourceSortMap.keySet() - .iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - Integer sort = sourceSortMap.get(title); - DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); - Date date = deviceMonitoring.getTime(); - String dateStr = new SimpleDateFormat("yyyy-MM-dd") - .format(date); - bean.setDate(dateStr); - bean.setDeviceName(deviceMonitoring.getDeviceName()); - bean.setMaterialName(detectionItem - .getDetectionItemName()); - bean.setResult(resultMap.get(title)); - bean.setTitle(title); - bean.setTitleSort("" + sort); - returnList.add(bean); - } + for(Entry entry : sourceSortMap.entrySet()){ + String title = entry.getKey(); + Integer sort = entry.getValue(); + DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); + Date date = deviceMonitoring.getTime(); + String dateStr = ymd.format(date); + bean.setDate(dateStr); + bean.setDeviceName(deviceMonitoring.getDeviceName()); + bean.setMaterialName(detectionItem + .getDetectionItemName()); + bean.setResult(resultMap.get(title)); + bean.setTitle(title); + bean.setTitleSort("" + sort); + returnList.add(bean); + } } if (deviceMonitoring.getDetectionItems() == null || deviceMonitoring.getDetectionItems().size() <= 0) { - Iterator iterator = sourceSortMap.keySet() - .iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - Integer sort = sourceSortMap.get(title); - DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); - Date date = deviceMonitoring.getTime(); - String dateStr = new SimpleDateFormat("yyyy-MM-dd") - .format(date); - bean.setDate(dateStr); - bean.setDeviceName(deviceMonitoring.getDeviceName()); - bean.setMaterialName(""); - bean.setResult(resultMap.get(title)); - bean.setTitle(title); - bean.setTitleSort("" + sort); - returnList.add(bean); - } + for(Entry entry : sourceSortMap.entrySet()){ + String title = entry.getKey(); + Integer sort = entry.getValue(); + DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); + Date date = deviceMonitoring.getTime(); + String dateStr = ymd.format(date); + bean.setDate(dateStr); + bean.setDeviceName(deviceMonitoring.getDeviceName()); + bean.setMaterialName(""); + bean.setResult(resultMap.get(title)); + bean.setTitle(title); + bean.setTitleSort("" + sort); + returnList.add(bean); + } } } } @@ -1767,11 +1759,13 @@ @SuppressWarnings("unchecked") List list = objectDao.findBySql( DeviceMaintenance.class.getSimpleName(), sql); + DateFormat ymdhm = DateTools.YMDHMFORMAT.get(); + DateFormat ymdhms = DateTools.YMDHMSFORMAT.get(); for (DeviceMaintenance deviceMaintenance : list) { Map resultMap = new HashMap(); Date dt = deviceMaintenance.getBreakdownTime(); resultMap.put("维护/故障时间", dt == null ? "" - : new SimpleDateFormat("yyyy-MM-dd HH:mm").format(dt)); + : ymdhm.format(dt)); resultMap.put("故障情况", deviceMaintenance.getBreakdownDescribeInfo()); resultMap.put("处理", deviceMaintenance.getRemark()); @@ -1786,61 +1780,55 @@ .getConsumptiveInstances()) { ConsumptiveConfig cconfig = consumptiveInstance.getConConfig(); if( isDeviceHaveConsumptiveConfig(deviceMaintenance.getDeviceName(),cconfig) ){ - Iterator iterator = sourceSortMap.keySet() - .iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - Integer sort = sourceSortMap.get(title); - DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); - Date date = deviceMaintenance.getMaintenanceTime(); - String dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .format(date); - bean.setDate(dateStr); - bean.setDeviceName(deviceMaintenance.getDeviceName()); - bean.setTotalPrice(totalPriceStr); - if(consumptiveInstance.getConConfig() != null){ - bean.setMaterialName(consumptiveInstance.getConConfig().getMaterialName()); - } - if("价格".equals(title)){ - String priceStr = "0"; - if(consumptiveInstance.getPrice() != null){ - priceStr = consumptiveInstance.getPrice().toString(); - } - bean.setResult(priceStr); - }else if("数量".equals(title)){ - String amountStr = "0"; - if(consumptiveInstance.getAmount() != null){ - amountStr = consumptiveInstance.getAmount().toString(); - } - bean.setResult(amountStr); - }else{ - bean.setResult(resultMap.get(title)); - } - bean.setTitle(title); - bean.setTitleSort("" + sort); - returnList.add(bean); - } + for(Entry entry : sourceSortMap.entrySet()){ + String title = entry.getKey(); + Integer sort = entry.getValue(); + DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); + Date date = deviceMaintenance.getMaintenanceTime(); + String dateStr = ymdhms.format(date); + bean.setDate(dateStr); + bean.setDeviceName(deviceMaintenance.getDeviceName()); + bean.setTotalPrice(totalPriceStr); + if(consumptiveInstance.getConConfig() != null){ + bean.setMaterialName(consumptiveInstance.getConConfig().getMaterialName()); + } + if("价格".equals(title)){ + String priceStr = "0"; + if(consumptiveInstance.getPrice() != null){ + priceStr = consumptiveInstance.getPrice().toString(); + } + bean.setResult(priceStr); + }else if("数量".equals(title)){ + String amountStr = "0"; + if(consumptiveInstance.getAmount() != null){ + amountStr = consumptiveInstance.getAmount().toString(); + } + bean.setResult(amountStr); + }else{ + bean.setResult(resultMap.get(title)); + } + bean.setTitle(title); + bean.setTitleSort("" + sort); + returnList.add(bean); + } } } if (deviceMaintenance.getConsumptiveInstances() == null || deviceMaintenance.getConsumptiveInstances().size() <= 0) { - Iterator iterator = sourceSortMap.keySet() - .iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - Integer sort = sourceSortMap.get(title); - DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); - Date date = deviceMaintenance.getMaintenanceTime(); - String dateStr = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss") - .format(date); - bean.setDate(dateStr); - bean.setDeviceName(deviceMaintenance.getDeviceName()); - bean.setMaterialName(""); - bean.setResult(resultMap.get(title)); - bean.setTitle(title); - bean.setTitleSort("" + sort); - returnList.add(bean); - } + for(Entry entry : sourceSortMap.entrySet()){ + String title = entry.getKey(); + Integer sort = entry.getValue(); + DeviceMaintenanceBean bean = new DeviceMaintenanceBean(); + Date date = deviceMaintenance.getMaintenanceTime(); + String dateStr = ymdhms.format(date); + bean.setDate(dateStr); + bean.setDeviceName(deviceMaintenance.getDeviceName()); + bean.setMaterialName(""); + bean.setResult(resultMap.get(title)); + bean.setTitle(title); + bean.setTitleSort("" + sort); + returnList.add(bean); + } } } } @@ -2249,16 +2237,15 @@ Map tousseTypeMap = null; if(packingAmountMap.containsKey(thisStartDate)){ tousseTypeMap = packingAmountMap.get(thisStartDate); - Iterator iterator = tousseTypeMap.keySet().iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean(); - bean.setDate(thisStartDate); - bean.setResult(tousseTypeMap.get(title)); - bean.setTitle(title); - bean.setTitleSort(sourceSortMap.get(title)); - returnList.add(bean); - } + for(Entry entry : tousseTypeMap.entrySet()){ + String title = entry.getKey(); + PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean(); + bean.setDate(thisStartDate); + bean.setResult(entry.getValue()); + bean.setTitle(title); + bean.setTitleSort(sourceSortMap.get(title)); + returnList.add(bean); + } } PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean(); bean.setDate(thisStartDate); @@ -2270,16 +2257,17 @@ Integer unQualityTotalAmount = 0; if(unQualityAmountMap.containsKey(thisStartDate)){ Map formNameAmountMap = unQualityAmountMap.get(thisStartDate); - for (String formName : formNameAmountMap.keySet()) { - PackingFractionDefectiveBean unQualitybean = new PackingFractionDefectiveBean(); - Integer amount = formNameAmountMap.get(formName); - unQualityTotalAmount+=amount; - unQualitybean.setDate(thisStartDate); - unQualitybean.setResult(amount); - unQualitybean.setTitle(formName); - unQualitybean.setTitleSort(10); - returnList.add(unQualitybean); - } + for(Entry entry: formNameAmountMap.entrySet()){ + String formName = entry.getKey(); + PackingFractionDefectiveBean unQualitybean = new PackingFractionDefectiveBean(); + Integer amount = entry.getValue(); + unQualityTotalAmount+=amount; + unQualitybean.setDate(thisStartDate); + unQualitybean.setResult(amount); + unQualitybean.setTitle(formName); + unQualitybean.setTitleSort(10); + returnList.add(unQualitybean); + } } bean.setTotalAmount(totalAmountMap.get(thisStartDate)); @@ -2622,30 +2610,30 @@ if (amount != null && amount != 0 && unqualifiedAmount != null && unqualifiedAmount != 0) { fractionDefective = new BigDecimal(unqualifiedAmount).divide(new BigDecimal(amount),4,RoundingMode.HALF_UP).doubleValue(); } - for (String monitoringName : formNameAmountMap.keySet()) { - if("不合格总数".equals(monitoringName)){ - continue; - } - DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); - bean.setDate(thisStartDate); - bean.setResult(formNameAmountMap.get(monitoringName)); - bean.setTitle(monitoringName); - bean.setPercentage(fractionDefective); - bean.setTitleSort(15); - returnList.add(bean); - } + for(Entry entry : formNameAmountMap.entrySet()){ + String monitoringName = entry.getKey(); + if("不合格总数".equals(monitoringName)){ + continue; + } + DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); + bean.setDate(thisStartDate); + bean.setResult(entry.getValue()); + bean.setTitle(monitoringName); + bean.setPercentage(fractionDefective); + bean.setTitleSort(15); + returnList.add(bean); + } } - Iterator iterator = typeAmoutMap.keySet().iterator(); - while (iterator.hasNext()) { - String title = iterator.next(); - DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); - bean.setDate(thisStartDate); - bean.setResult(typeAmoutMap.get(title)); - bean.setTitle(title); - bean.setTitleSort(sourceSortMap.get(title)); - bean.setPercentage(fractionDefective); - returnList.add(bean); - } + for(Entry entry : typeAmoutMap.entrySet()){ + String title = entry.getKey(); + DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); + bean.setDate(thisStartDate); + bean.setResult(entry.getValue()); + bean.setTitle(title); + bean.setTitleSort(sourceSortMap.get(title)); + bean.setPercentage(fractionDefective); + returnList.add(bean); + } calendar.setTime(startDate); calendar.add(addDateType, 1); startDate = calendar.getTime(); @@ -2667,27 +2655,29 @@ } } Integer monthTotalAmount = totalRowMap.get("灭菌总数"); // 月灭菌总数 - - Iterator iterator = totalRowMap.keySet().iterator(); try { + for(Entry entry : totalRowMap.entrySet()){ + String title = entry.getKey(); + Integer result = entry.getValue(); + DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); + bean.setDate("合计"); + bean.setResult(result); + bean.setTitle(title); + Integer sort = sourceSortMap.get(title); + if (sort == null) { + sort = 15; + } + bean.setTitleSort(sort); + Double fractionDefective = 0.00; + if(monthTotalAmount > 0 && monthUnqualifiedAmount > 0){ + fractionDefective = new BigDecimal(monthUnqualifiedAmount).divide(new BigDecimal(monthTotalAmount),4,RoundingMode.HALF_UP).doubleValue(); + } + bean.setPercentage(fractionDefective); + returnList.add(bean); + } while (iterator.hasNext()) { String title = iterator.next(); - Integer result = totalRowMap.get(title); - DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); - bean.setDate("合计"); - bean.setResult(result); - bean.setTitle(title); - Integer sort = sourceSortMap.get(title); - if (sort == null) { - sort = 15; - } - bean.setTitleSort(sort); - Double fractionDefective = 0.00; - if(monthTotalAmount > 0 && monthUnqualifiedAmount > 0){ - fractionDefective = new BigDecimal(monthUnqualifiedAmount).divide(new BigDecimal(monthTotalAmount),4,RoundingMode.HALF_UP).doubleValue(); - } - bean.setPercentage(fractionDefective); - returnList.add(bean); + } } catch (Exception e) { } @@ -2963,15 +2953,15 @@ if (amount != null && amount != 0 && unqualifiedAmount != null && unqualifiedAmount != 0) { fractionDefective = new BigDecimal(unqualifiedAmount).divide(new BigDecimal(amount),4,RoundingMode.HALF_UP).doubleValue(); } - for (String monitoringName : monitoringMap.keySet()) { - DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); - bean.setDate(queryDate); - bean.setResult(monitoringMap.get(monitoringName)); - bean.setTitle(monitoringName); - bean.setPercentage(fractionDefective); - bean.setTitleSort(15); - returnList.add(bean); - } + for(Entry entry : monitoringMap.entrySet()){ + DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean(); + bean.setDate(queryDate); + bean.setResult(entry.getValue()); + bean.setTitle(entry.getKey()); + bean.setPercentage(fractionDefective); + bean.setTitleSort(15); + returnList.add(bean); + } return fractionDefective; } @@ -3298,55 +3288,55 @@ endMonthMap.put(item.getName(), item.getAmount()); } } - Iterator iterator = startMonthMap.keySet().iterator(); - while (iterator.hasNext()) { - String key = iterator.next(); - Integer startMonthAmount = startMonthMap.get(key); - Integer endMonthAmount = endMonthMap.get(key); + for(Entry entry : startMonthMap.entrySet()){ + String key = entry.getKey(); + Integer startMonthAmount = entry.getValue(); + Integer endMonthAmount = endMonthMap.get(key); - InvoiceAmountContrastBean bean = new InvoiceAmountContrastBean(); - if (key.indexOf("[") > 0) { - String specification = key.substring( - key.indexOf("[") + 1, key.length() - 1); - String name = key.substring(0, key.indexOf("[")); - bean.setGoodsName(name); - bean.setSpecification(specification); - } else { - bean.setGoodsName(key); - bean.setSpecification(""); - } - bean.setStartMonthAmount(startMonthAmount == null ? 0 - : startMonthAmount); - bean.setEndMonthAmount(endMonthAmount == null ? 0 - : endMonthAmount); - bean.setDifferentials(bean.getEndMonthAmount() - - bean.getStartMonthAmount()); - beanList.add(bean); - endMonthMap.remove(key); - } + InvoiceAmountContrastBean bean = new InvoiceAmountContrastBean(); + if (key.indexOf("[") > 0) { + String specification = key.substring( + key.indexOf("[") + 1, key.length() - 1); + String name = key.substring(0, key.indexOf("[")); + bean.setGoodsName(name); + bean.setSpecification(specification); + } else { + bean.setGoodsName(key); + bean.setSpecification(""); + } + bean.setStartMonthAmount(startMonthAmount == null ? 0 + : startMonthAmount); + bean.setEndMonthAmount(endMonthAmount == null ? 0 + : endMonthAmount); + bean.setDifferentials(bean.getEndMonthAmount() + - bean.getStartMonthAmount()); + beanList.add(bean); + endMonthMap.remove(key); + + } + if (endMonthMap.size() > 0) { - Iterator itr = endMonthMap.keySet().iterator(); - while (itr.hasNext()) { - String key = itr.next(); - Integer endMonthAmount = endMonthMap.get(key); - InvoiceAmountContrastBean bean = new InvoiceAmountContrastBean(); - if (key.indexOf("[") > 0) { - String specification = key.substring( - key.indexOf("[") + 1, key.length() - 1); - String name = key.substring(0, key.indexOf("[")); - bean.setGoodsName(name); - bean.setSpecification(specification); - } else { - bean.setGoodsName(key); - bean.setSpecification(""); - } - bean.setStartMonthAmount(0); - bean.setEndMonthAmount(endMonthAmount == null ? 0 - : endMonthAmount); - bean.setDifferentials(bean.getEndMonthAmount() - - bean.getStartMonthAmount()); - beanList.add(bean); - } + for(Entry entry : endMonthMap.entrySet()){ + String key = entry.getKey(); + Integer endMonthAmount = entry.getValue(); + InvoiceAmountContrastBean bean = new InvoiceAmountContrastBean(); + if (key.indexOf("[") > 0) { + String specification = key.substring( + key.indexOf("[") + 1, key.length() - 1); + String name = key.substring(0, key.indexOf("[")); + bean.setGoodsName(name); + bean.setSpecification(specification); + } else { + bean.setGoodsName(key); + bean.setSpecification(""); + } + bean.setStartMonthAmount(0); + bean.setEndMonthAmount(endMonthAmount == null ? 0 + : endMonthAmount); + bean.setDifferentials(bean.getEndMonthAmount() + - bean.getStartMonthAmount()); + beanList.add(bean); + } } } @@ -7452,11 +7442,9 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - - Iterator itr = detailMap.keySet().iterator(); - while(itr.hasNext()){ - String departKey = itr.next(); - List list = detailMap.get(departKey); + for(Entry> entry : detailMap.entrySet()){ + String departKey = entry.getKey(); + List list = entry.getValue(); //消毒物品,自定义器械包,外来器械包,外来器械拆分小包相同名称的合并 Map tmpMap = new HashMap(); List removeItems = new ArrayList(); @@ -7497,7 +7485,7 @@ tmpMap.put(key, item); } if(dmi.getMaterialAmount() != null){ - item.setMaterialAmount(MathTools.add(item.getMaterialAmount(), dmi.getMaterialAmount()).intValue()); + item.setMaterialAmount(MathTools.add(item.getMaterialAmount(), dmi.getMaterialAmount()).intValue()); } item.setIntegral(MathTools.add(item.getIntegral(), dmi.getIntegral()).doubleValue()); item.setAmount(item.getAmount()+dmi.getAmount()); @@ -7536,7 +7524,7 @@ dmi.setExpDate(null); dmi.setSendTime(sendTime); disposableGoodsTempMap.put(key, dmi); - } + } } totalPrice += dmi.getSettlementPrice(); totalPriceDiscount += dmi.getSettlementDiscountPrice(); @@ -8324,10 +8312,9 @@ DatabaseUtil.closeResultSetAndStatement(rs); } } - Iterator itr = detailMap.keySet().iterator(); - while(itr.hasNext()){ - String depart = itr.next(); - List list = detailMap.get(depart); + for(Entry> entry : detailMap.entrySet()){ + String depart = entry.getKey(); + List list = entry.getValue(); //消毒物品相同名称的合并 Map tmpMap = new HashMap(); List removeItems = new ArrayList(); @@ -9516,8 +9503,9 @@ for (int i = 0; i < monthArr.length; i++) { String month = monthArr[i]; String yearMonth = yearMonthMap.get(month); - for (Integer num : numAndAdverseEventRecord.keySet()) { - JSONObject dataConfig = numAndAdverseEventRecord.get(num); + for(Entry entry : numAndAdverseEventRecord.entrySet()){ + Integer num = entry.getKey(); + JSONObject dataConfig = entry.getValue(); String dataIndexSource = dataConfig.optString("dataIndexSource"); String dataIndexNameForDisplay = dataConfig.optString("dataIndexNameForDisplay"); String adverseEventName = dataConfig.optString("adverseEventName"); @@ -9526,8 +9514,9 @@ break; } int sumAmount = 0; - for (String key : adverseEventRecordAmountMap.keySet()) { - Map map = adverseEventRecordAmountMap.get(key); + for(Entry> entry2 : adverseEventRecordAmountMap.entrySet()){ + String key = entry2.getKey(); + Map map = entry2.getValue(); if(map.containsKey(month)){ if(adverseEventRecordAmountMap.keySet().size() > 1){ sumAmount = MathTools.add(sumAmount, map.get(month)).intValue(); @@ -9542,9 +9531,9 @@ list.add(beanSum); } } - - for (Integer num : numAndOrgUnitCode.keySet()) { - JSONObject dataConfig = numAndOrgUnitCode.get(num); + for(Entry entry : numAndOrgUnitCode.entrySet()){ + Integer num = entry.getKey(); + JSONObject dataConfig = entry.getValue(); String orgUnitCode = dataConfig.optString("orgUnitCode"); String dataIndexSource = dataConfig.optString("dataIndexSource"); String dataIndexNameForDisplay = dataConfig.optString("dataIndexNameForDisplay"); @@ -9562,8 +9551,9 @@ } addYearWorkLoadBeanPrice(i, month, monthReportMap, num, dataIndexNameForDisplay, list, yearMonth); } - for (Integer num : uniqueDataIndexSources.keySet()) { - JSONObject dataConfig = uniqueDataIndexSources.get(num); + for(Entry entry : uniqueDataIndexSources.entrySet()){ + Integer num = entry.getKey(); + JSONObject dataConfig = entry.getValue(); String dataIndexSource = dataConfig.optString("dataIndexSource"); String dataIndexNameForDisplay = dataConfig.optString("dataIndexNameForDisplay"); if("处理器械总件数".equals(dataIndexSource)){ @@ -10467,23 +10457,25 @@ Map foreignMaterialAmountMap = dataIndex.getAmountAndDateBySql(sql); //清洗器械总件数 = 清洗临床科室物品总件数 + 清洗手术室器械总件数 + 清洗外来手术器械总件数 Map totalWashMaterialAmountMap = new HashMap(); - for (String key : operatingRoomWashMaterialAmountMap.keySet()) { - totalWashMaterialAmountMap.put(key, operatingRoomWashMaterialAmountMap.get(key)); - } - for (String key : noOperatingRoomWashMaterialAmountMap.keySet()) { + for(Entry entry : operatingRoomWashMaterialAmountMap.entrySet()){ + totalWashMaterialAmountMap.put(entry.getKey(), entry.getValue()); + } + for(Entry entry : noOperatingRoomWashMaterialAmountMap.entrySet()){ + String key = entry.getKey(); + if(totalWashMaterialAmountMap.containsKey(key)){ + totalWashMaterialAmountMap.put(key, MathTools.add(totalWashMaterialAmountMap.get(key), entry.getValue()).intValue()); + }else{ + totalWashMaterialAmountMap.put(key, entry.getValue()); + } + } + for(Entry entry : foreignMaterialAmountMap.entrySet()){ + String key = entry.getKey(); if(totalWashMaterialAmountMap.containsKey(key)){ - totalWashMaterialAmountMap.put(key, MathTools.add(totalWashMaterialAmountMap.get(key), noOperatingRoomWashMaterialAmountMap.get(key)).intValue()); + totalWashMaterialAmountMap.put(key, MathTools.add(totalWashMaterialAmountMap.get(key), entry.getValue()).intValue()); }else{ - totalWashMaterialAmountMap.put(key, noOperatingRoomWashMaterialAmountMap.get(key)); + totalWashMaterialAmountMap.put(key, entry.getValue()); } } - for (String key : foreignMaterialAmountMap.keySet()) { - if(totalWashMaterialAmountMap.containsKey(key)){ - totalWashMaterialAmountMap.put(key, MathTools.add(totalWashMaterialAmountMap.get(key), foreignMaterialAmountMap.get(key)).intValue()); - }else{ - totalWashMaterialAmountMap.put(key, foreignMaterialAmountMap.get(key)); - } - } for (int i = 0; i < monthArr.length; i++) { String month = monthArr[i]; String yearMonth = yearMonthMap.get(month); @@ -10957,7 +10949,8 @@ } } if(MapUtils.isNotEmpty(disposableGoodsMap)){ - for (String userName : disposableGoodsMap.keySet()) { + for(Entry entry : disposableGoodsMap.entrySet()){ + String userName = entry.getKey(); if(readedNames.contains(userName)){ continue; } @@ -10966,7 +10959,7 @@ workLoadBean.setColumnName("发货数量"); workLoadBean.setAmount(0); workLoadBean.setSequence(sequenceMap.get("发货数量")); - workLoadBean.setDisposableGoodAmount(disposableGoodsMap.get(userName)); + workLoadBean.setDisposableGoodAmount(entry.getValue()); list.add(workLoadBean); } } @@ -12416,10 +12409,10 @@ } itemBeanList.add(itemBean); } - for (String depart : map.keySet()){ + for(Entry> entry : map.entrySet()){ UseRecordBean recordBean = new UseRecordBean(); - recordBean.setDepart(depart); - recordBean.setItems(map.get(depart)); + recordBean.setDepart(entry.getKey()); + recordBean.setItems(entry.getValue()); list.add(recordBean); } } catch (SQLException e) { @@ -12482,12 +12475,10 @@ } Map departsMap = getDepartFromUseRecord(departmentName); if (departsMap.size() > 0) { - Set departCodingSet = departsMap.keySet(); - Iterator it = departCodingSet.iterator(); - while (it.hasNext()) { - UseRecordBean recordBean = new UseRecordBean(); - String coding = it.next();// 部门编码 - String name = departsMap.get(coding);// 部门名称 + for(Entry entry : departsMap.entrySet()){ + UseRecordBean recordBean = new UseRecordBean(); + String coding = entry.getKey();// 部门编码 + String name = entry.getValue();// 部门名称 recordBean.setDepart(name); List itemBeans = getUserAndRecordAmount(name, operator, coding, startTime, endTime); if(itemBeans.size() != 0){ @@ -13007,16 +12998,15 @@ List list = new ArrayList(); int i = 1; YearWorkLoadReportBean lastValue = null; - for (String key : startAndEndDays.keySet()) { + for(Entry> entry : startAndEndDays.entrySet()){ YearWorkLoadReportBean bean = new YearWorkLoadReportBean(); - bean.setDateTime(key); + bean.setDateTime(entry.getKey()); String startDay = null; String endDay = null; - Map innerMap = startAndEndDays.get(key); - for (String keyOfInnerMap : innerMap.keySet()) { - startDay = dateQueryAdapter.dateAdapter(keyOfInnerMap); - endDay = dateQueryAdapter.dateAdapter(innerMap - .get(keyOfInnerMap)); + Map innerMap = entry.getValue(); + for(Entry entry2 : innerMap.entrySet()){ + startDay = dateQueryAdapter.dateAdapter(entry2.getKey()); + endDay = dateQueryAdapter.dateAdapter(entry2.getValue()); } String sql = "select * from(" @@ -13319,15 +13309,16 @@ if(MapUtils.isNotEmpty(groupAndDepartMap)){ Set allDeparts = new HashSet(); Map> groupNameMap = new HashMap>(); - for(String groupName : groupAndDepartMap.keySet()){ - List departList = groupAndDepartMap.get(groupName); - Set thisDeparts = new HashSet(); - if(CollectionUtils.isNotEmpty(departList)){ - allDeparts.addAll(departList); - thisDeparts.addAll(departList); - } - groupNameMap.put(groupName, thisDeparts); - } + for(Entry> entry : groupAndDepartMap.entrySet()){ + String groupName = entry.getKey(); + List departList = entry.getValue(); + Set thisDeparts = new HashSet(); + if(CollectionUtils.isNotEmpty(departList)){ + allDeparts.addAll(departList); + thisDeparts.addAll(departList); + } + groupNameMap.put(groupName, thisDeparts); + } if(allDeparts.size() > 0){ String departs = StringUtils.join(allDeparts,"','"); this.departGroupSql = getDepartGroupSql(departs,startDateStr,endDateStr,querySupplyRoom,dateType); @@ -13347,11 +13338,12 @@ dateAmountMapOfDepartGroup.put(queryDate, groupNameAmountMap); } //找到科室对应的部门 增加数量 不排除科室属于多部门 - for (String groupName : groupNameMap.keySet()) { - if(groupNameMap.get(groupName).contains(orgUnitName)){ - groupNameAmountMap.put(groupName, MathTools.add(groupNameAmountMap.get(groupName), amount).intValue()); - } - } + for(Entry> entry : groupNameMap.entrySet()){ + String groupName = entry.getKey(); + if(entry.getValue().contains(orgUnitName)){ + groupNameAmountMap.put(groupName, MathTools.add(groupNameAmountMap.get(groupName), amount).intValue()); + } + } } } catch (SQLException e) { e.printStackTrace(); @@ -13390,7 +13382,6 @@ sdf = sdfyyyyMMdd; } while(endDate.after(startDate)){ - WashWorkload_main main = new WashWorkload_main(); String thisStartDate = sdf.format(startDate); Map thisWashAmountMap = washDateAmountMap.containsKey(thisStartDate)?washDateAmountMap.get(thisStartDate):new HashMap(); Integer thisUnQualityAmount = unQualityAmountMap.get(thisStartDate); @@ -13434,16 +13425,17 @@ } // 对数据做合计 ctBeanList Map totalMap = getSumMap(ctBeanList); - for(String title : titleColumnNumMap.keySet()){ - Integer columnNum = titleColumnNumMap.get(title); - Integer totalCount = totalMap.get(title); - CrossTableBean sumBean = new CrossTableBean(); - sumBean.setQueryDate("合计"); - sumBean.setColummTitle(title); - sumBean.setColumnNum(columnNum); - sumBean.setValueInteger(totalCount); - ctBeanList.add(sumBean); - } + for(Entry entry : titleColumnNumMap.entrySet()){ + String title = entry.getKey(); + Integer columnNum = entry.getValue(); + Integer totalCount = totalMap.get(title); + CrossTableBean sumBean = new CrossTableBean(); + sumBean.setQueryDate("合计"); + sumBean.setColummTitle(title); + sumBean.setColumnNum(columnNum); + sumBean.setValueInteger(totalCount); + ctBeanList.add(sumBean); + } Integer totalAmount = totalMap.get("清洗总数"); Integer unQualitotalAmount = totalMap.get("不合格数"); String rate = "0.0000%"; @@ -14588,11 +14580,12 @@ List voList = new ArrayList(); int serialNum = 0; if(voMap.size() > 0){ - for (String tousseName : voMap.keySet()) { + for(Entry entry : voMap.entrySet()){ + String tousseName = entry.getKey(); serialNum++; - TousseDeliverDetailVO vo = voMap.get(tousseName); + TousseDeliverDetailVO vo = entry.getValue(); vo.setSerialNumber(serialNum); - voList.add(voMap.get(tousseName)); + voList.add(vo); } } return voList; @@ -15434,24 +15427,22 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - - - Set taskGroupNames = map.keySet(); - for (String taskGroupName : taskGroupNames) { - HashMap tousseNameToAmount = map.get(taskGroupName); - Set tousseTypeAndTousseNames = tousseNameToAmount.keySet(); - int size = tousseTypeAndTousseNames.size(); + for(Entry> entry : map.entrySet()){ + String taskGroupName = entry.getKey(); + HashMap tousseNameToAmount = entry.getValue(); + int size = tousseNameToAmount.size(); List children = new ArrayList(); if (size > 0) { children.add(new WaitPackingTaskReportBeanChild()); } Integer totalUnPackAmount = 0; - for (String tousseTypeAndTousseName : tousseTypeAndTousseNames) { + for(Entry entry2 : tousseNameToAmount.entrySet()){ + String tousseTypeAndTousseName = entry2.getKey(); WaitPackingTaskReportBeanChild child = children.get(children.size() - 1); String tousseName = tousseTypeAndTousseName.substring(tousseTypeAndTousseName.indexOf("-") + 1); - Integer unPackAmount = tousseNameToAmount.get(tousseTypeAndTousseName); + Integer unPackAmount = entry2.getValue(); totalUnPackAmount += unPackAmount; if (StringTools.isBlank(child.getTousseName1())) { @@ -15541,8 +15532,9 @@ Set sterilingTypes = map.keySet(); - for (String sterilingType : sterilingTypes) { - ArrayList tousseNameAndBarcodes = map.get(sterilingType); + for(Entry> entry : map.entrySet()){ + String sterilingType = entry.getKey(); + ArrayList tousseNameAndBarcodes = entry.getValue(); List children = new ArrayList(); if (tousseNameAndBarcodes != null && tousseNameAndBarcodes.size() > 0) { @@ -15693,8 +15685,8 @@ DatabaseUtil.closeResultSetAndStatement(rs); } Iterator itr = map.keySet().iterator(); - while(itr.hasNext()){ - String key = itr.next(); + for(Entry entry : map.entrySet()){ + String key = entry.getKey(); String rowName = key; String rowNum = null; int index = key.indexOf("#&@"); @@ -15703,9 +15695,8 @@ rowName = array[0]; rowNum = array[1]; } - Double amount = map.get(key); ApparatusInfusionisType vo = new ApparatusInfusionisType(); - vo.setAmount(amount); + vo.setAmount(entry.getValue()); vo.setColumnName("合计"); vo.setColumnNum("2"); vo.setRowName(rowName); @@ -17631,8 +17622,9 @@ if(num > 0){ materialNames.append("')"); mdsJson = materialDefinitionManager.getMaterialDefinitionListByNames(materialNames.toString()); - for (String materialName : nameAndAmount.keySet()) { - Integer washUnqualifiedAmount = nameAndAmount.get(materialName); + for(Entry entry : nameAndAmount.entrySet()){ + String materialName = entry.getKey(); + Integer washUnqualifiedAmount = entry.getValue(); JSONObject mdJson = mdsJson.get(materialName); String type = UNDEFINED_TYPE; if(mdJson != null){ @@ -18196,8 +18188,9 @@ List voList = new ArrayList(); - for (String invoicePlanID : voMap.keySet()) { - ForeignTousseAfterUseDeliveryVO vo = voMap.get(invoicePlanID); + for (Entry entry : voMap.entrySet()){ + String invoicePlanID = entry.getKey(); + ForeignTousseAfterUseDeliveryVO vo = entry.getValue(); String[] washAndDisinfectUserArray = vo.getWashAndDisinfectUser().split(","); if (washAndDisinfectUserArray.length == 0) { @@ -18385,8 +18378,9 @@ * 4、把departmentToPatientArea和patientAreaToGoods存储的信息转成javaBean供报表展现 */ Set departmentCodes = departmentToPatientArea.keySet(); - for (String departmentCode : departmentCodes) { - Set patientAreaVOs = departmentToPatientArea.get(departmentCode); + for(Entry> entry : departmentToPatientArea.entrySet()){ + String departmentCode = entry.getKey(); + Set patientAreaVOs = entry.getValue(); for (SummaryUseRecordForPatientAreaVO patientAreaVO : patientAreaVOs) { String key2 = departmentCode + patientAreaVO.getPatientArea(); List goodsVOs = patientAreaToGoods.get(key2); @@ -26540,11 +26534,11 @@ //返回的vos List returnMaterialStockVos = new ArrayList(); //1、获取入库明细 - List mEInDetailStockVos = new ArrayList(); //获取sql语句 String mEInItemSql = dataIndex.getMaterialEntryItemInfoSql(startDate, endDate, materialId,warehouseId,orgUnitCode,MaterialEntry.TYPE_IN); - ResultSet meIRs = objectDao.executeSql(mEInItemSql.toString()); + ResultSet meIRs = null; try { + meIRs = objectDao.executeSql(mEInItemSql); while(meIRs.next()){ MaterialStockVo materialStockVo = new MaterialStockVo(); int amount = meIRs.getInt("amount");//入库数量