Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35804 -r35805 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35804) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35805) @@ -755,7 +755,7 @@ List configList = sterilizer.getConsumptives(); for (int i = 0 ; i < configList.size() ; i++) { Long id = configList.get(i).getId(); - if(id == conConfig.getId()){ + if(MathTools.equals(id,conConfig.getId())){ ret = true; } } @@ -765,7 +765,7 @@ List configList = rinser.getConsumptives(); for (int i = 0 ; i < configList.size() ; i++) { Long id = configList.get(i).getId(); - if(id == conConfig.getId()){ + if(MathTools.equals(id,conConfig.getId())){ ret = true; } } @@ -4539,7 +4539,6 @@ public List getSterilizingStoveUseCountData(String startTime,String endTime,String depart, String departCoding, String sterilizationPurpose, String sterilizerNameGroup, String sterilizerName, String sterilisation) { List ssList = new ArrayList(); - SterilizingStove ss = new SterilizingStove(); List list = new ArrayList(); //是否启用统计空炉灭菌次数功能 DGSDBZXYY-194 boolean showEmptyFurnace = CssdUtils.getSystemSetConfigByNameBool("enableCountTheNumberOfEmptyFurnaceSterilizationsFunction", false); @@ -5310,21 +5309,20 @@ List children = new ArrayList(); if (tousseNameAndBarcodes != null && tousseNameAndBarcodes.size() > 0) { children.add(new SterilizationOmitReportBeanChild()); - } - - for (String tousseNameAndBarcode : tousseNameAndBarcodes) { - SterilizationOmitReportBeanChild child = children.get(children.size() - 1); - - if (StringTools.isBlank(child.getTousseName1())) { - child.setTousseName1(tousseNameAndBarcode); - } else if (StringTools.isBlank(child.getTousseName2())) { - child.setTousseName2(tousseNameAndBarcode); - } else if (StringTools.isBlank(child.getTousseName3())) { - child.setTousseName3(tousseNameAndBarcode); - } else { - SterilizationOmitReportBeanChild newChild = new SterilizationOmitReportBeanChild(); - newChild.setTousseName1(tousseNameAndBarcode); - children.add(newChild); + for (String tousseNameAndBarcode : tousseNameAndBarcodes) { + SterilizationOmitReportBeanChild child = children.get(children.size() - 1); + + if (StringTools.isBlank(child.getTousseName1())) { + child.setTousseName1(tousseNameAndBarcode); + } else if (StringTools.isBlank(child.getTousseName2())) { + child.setTousseName2(tousseNameAndBarcode); + } else if (StringTools.isBlank(child.getTousseName3())) { + child.setTousseName3(tousseNameAndBarcode); + } else { + SterilizationOmitReportBeanChild newChild = new SterilizationOmitReportBeanChild(); + newChild.setTousseName1(tousseNameAndBarcode); + children.add(newChild); + } } } @@ -7478,10 +7476,8 @@ String patientArea = StringTools.defaultString(result.getString("patientArea")); String goodsName = StringTools.defaultString(result.getString("goodsName")); Double price = result.getDouble("price"); - price = (price != null ? price : 0D); Integer amount = result.getInt("amount"); Double total = result.getDouble("total"); - total = (total != null ? total : 0D); /** * 2、把物品信息按科室放入departmentToPatientArea @@ -7600,7 +7596,6 @@ String departName = StringTools.defaultString(result.getString("departName")); Long totalAmount = result.getLong("totalAmount"); Double totalPrice = result.getDouble("totalPrice"); - totalPrice = (totalPrice != null ? totalPrice : 0D); SummaryUseRecordVO item = new SummaryUseRecordVO(); item.setDepartName(departName); item.setTotalAmount(totalAmount); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java =================================================================== diff -u -r35797 -r35805 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java (.../TousseWorkLoadHelper.java) (revision 35797) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/TousseWorkLoadHelper.java (.../TousseWorkLoadHelper.java) (revision 35805) @@ -584,7 +584,6 @@ int index = formatedTousseName.lastIndexOf("("); if (index > 0) { formatedTousseName = formatedTousseName.substring(0, index); - tousseName = formatedTousseName; } return formatedTousseName; Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java =================================================================== diff -u -r35797 -r35805 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 35797) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java (.../YearWorkloadReportHelper.java) (revision 35805) @@ -453,29 +453,31 @@ endoscopicMap = dataIndex.getEndoscopicMap(monthlyStr, startDay, endDay, querySupplyRoom,false); } if(dataIndexSources.contains("下收下送次数（中六模式）")){ - String departs = ""; + StringBuffer departs = new StringBuffer(); GoodsOption goodsOption = goodsOptionManager.getGoodsOption(GoodsOption.MODEL_SURGICALINSTRUMENTS_DEPT, null); if (goodsOption != null) { String value = goodsOption.getValue(); if(StringUtils.isNotBlank(value)){ String[] nameArray = value.split(";"); for (int j = 0; j < nameArray.length; j++) { String name = nameArray[j]; - if(StringUtils.isNotBlank(departs)){ - departs += ","; + if(departs.length() > 0){ + departs.append(","); } - departs += "'" + name + "'"; + departs.append("'"); + departs.append(name); + departs.append("'"); } } } - if(StringUtils.isBlank(departs)){ - departs = "''";//产品说没有值就不查了.保持上个版本的逻辑不变 + if(departs.length() == 0){ + departs.append("''");//产品说没有值就不查了.保持上个版本的逻辑不变 } monthlyStr = dateQueryAdapter.dateConverAdapter3("rr.recyclingTime",mmOrdd); String sql8 = " select count(*) amount," + monthlyStr + " monthStr from RecyclingRecord rr " - + " where rr.depart in ("+ departs + ")" + + " where rr.depart in ("+ departs.toString() + ")" + " and rr.orgUnitCoding='" + querySupplyRoom + "' " + " and rr.recyclingTime between " + startDay + " and " + endDay + " group by " Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java =================================================================== diff -u -r35797 -r35805 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 35797) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/SupplyRoomQualityQuotaHelper.java (.../SupplyRoomQualityQuotaHelper.java) (revision 35805) @@ -1153,7 +1153,7 @@ Integer total = 0; if(CollectionUtils.isNotEmpty(firstDayToLastDay)){ for (String key : firstDayToLastDay) { - map.put(key, packAmountMap.get(key) == null?0:packAmountMap.get(key)); + map.put(key, packAmountMap.get(key) == null?MathTools.ZERO_INTEGER:packAmountMap.get(key)); if(packAmountMap.get(key) != null){ total += packAmountMap.get(key); } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java =================================================================== diff -u -r35799 -r35805 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java (.../CssdWorkloadReportForTangshanWorkersHospitalHelper.java) (revision 35799) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/CssdWorkloadReportForTangshanWorkersHospitalHelper.java (.../CssdWorkloadReportForTangshanWorkersHospitalHelper.java) (revision 35805) @@ -55,9 +55,6 @@ @SuppressWarnings("unchecked") List invoiceDepartments = objectDao.findByHql("select po from " + InvoiceDepartment.class.getSimpleName() + " po where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.id", departGroupIds)); for (InvoiceDepartment invoiceDepartment : invoiceDepartments) { - if("全部".equals(invoiceDepartment)){ - break; - } Set thisDepartSearchs = SqlUtils.splitStringToSet(invoiceDepartment.getDepartNames(), ";"); departSearchSet.addAll(thisDepartSearchs); Set thisDepartCodings = SqlUtils.splitStringToSet(invoiceDepartment.getDepartCodes(), ";");