Fisheye: Tag 35919 refers to a dead (removed) revision in file `ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/MaterialWashUnqualifiedContrast.java'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedContrast.jasper =================================================================== diff -u -r12331 -r35919 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r35917 -r35919 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35917) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 35919) @@ -1543,29 +1543,8 @@ return jasperReportManager.getStatisticalWorkloadData(startTime, endTime, departCoding, tousseTypes, packageSizes, BooleanUtils.toBoolean(isStrengthen),taskGroup); } - }else if (reportName.equals("materialWashUnqualifiedContrast")) { + }else if (reportName.equals("disposableGoodsInventory")) {// 一次性物品盘点月报 - String tousseName = StrutsParamUtils.getPraramValue("tousseName", - null);// 器械包名称 - String queryTime = StrutsParamUtils.getPraramValue("queryTime", - null);// 按年份，按季度，按月份 - String queryYear = StrutsParamUtils.getPraramValue("queryYear", - null);// 第一个查询年份 - String queryMonth = StrutsParamUtils.getPraramValue("queryMonth", - null);// 第一个查询季度或月份 - String queryYear1 = StrutsParamUtils.getPraramValue("queryYear1", - null);// 第二个查询年份 - String queryMonth1 = StrutsParamUtils.getPraramValue("queryMonth1", - null);// 第二个查询季度或月份 - if ("按月份".equals(queryTime)) { - queryMonth = getMonthDate(queryYear, queryMonth); - queryMonth1 = getMonthDate(queryYear1, queryMonth1); - } - return jasperReportManager.getMaterialWashUnqualifiedContrastBean( - tousseName, queryTime, queryYear, queryMonth, queryYear1, - queryMonth1); - } else if (reportName.equals("disposableGoodsInventory")) {// 一次性物品盘点月报 - String month = StrutsParamUtils.getPraramValue("month", null); if (month != null) { Map monthMap = getMonthStartAndEndDate(month); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r35917 -r35919 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35917) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 35919) @@ -14,15 +14,12 @@ import net.sf.json.JSONObject; import com.forgon.directory.model.BrancheOfHospital; -import com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinitionItem; import com.forgon.disinfectsystem.entity.disposablegoods.DisposableGoodsInventory; -import com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MaterialStockVo; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MonthGoodsDetailVo; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockTakeRecord; import com.forgon.disinfectsystem.jasperreports.javabeansource.AdverseEventRecordReportVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.ApparatusInfusionisType; -import com.forgon.disinfectsystem.jasperreports.javabeansource.BaseBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.InstrumentRepairVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.BiologicalMonitoringReportVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordItemVo; @@ -42,7 +39,6 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSizeReportBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSterilizationMonitorAndDeliveryVO; import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSupplierStatisticsReportVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.FormDefinitionReportColumnVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryItemVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_main; @@ -56,7 +52,6 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageSummaryOfDepartmentVO; import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageVO; import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialTypeWorkloadReport; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialWashUnqualifiedContrast; import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialWashUnqualifiedPosition; import com.forgon.disinfectsystem.jasperreports.javabeansource.MonitoringItemBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportBean; @@ -102,7 +97,6 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.WashAndDisinfectRecordItemBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkloadScoreStatisticReportVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.OperatingRoomUseRecortSumBean; import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking; @@ -318,10 +312,6 @@ public List getmaterialWashUnqualifiedAssessMethodBean( String startDay, String endDay); - public List getMaterialWashUnqualifiedContrastBean( - String tousseName, String queryTime, String queryYear, - String queryMonth, String queryYear1, String queryMonth1); - public List getDisposableGoodsInventoryBean( String startDay, String endDay); Fisheye: Tag 35919 refers to a dead (removed) revision in file `ssts-web/src/main/webapp/jasperRtp/materialWashUnqualifiedContrast.jrxml'. Fisheye: No comparison available. Pass `N' to diff? Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r35918 -r35919 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35918) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 35919) @@ -206,7 +206,6 @@ import com.forgon.disinfectsystem.report.dao.ReportDao; import com.forgon.disinfectsystem.report.entity.ReportDataWriteRecord; import com.forgon.disinfectsystem.reportforms.vo.ReportQueryParams; -import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryItemManager; import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking; @@ -255,8 +254,6 @@ @Autowired private InitDbConnection dbConnection; @Autowired - private MaterialDefinitionManager materialDefinitionManager; - @Autowired private HttpOptionManager httpOptionManager; private static final String DIPOSABLEGOODS = "一次性物品"; @Autowired @@ -984,119 +981,6 @@ map.put("timeType", timeType); return map; } - - /** - * 获取清洗不合格数据 - * - * @param tousseName - * @param queryTime - * @param queryYear - * @param queryMonth - * @return - */ - private List getContrastData( - String tousseName, String queryTime, String queryYear, - String queryMonth) { - - List list = new ArrayList(); - - String sql = "select qi.material,sum(qmd.amount) from QualityMonitoringInstance qi ,FormInstance fi," - + "FormDefinition fd ,QualityMonitoringGoods qmd " - + " where qi.id = fi.id and fi.formDefinition_id = fd.id and qi.id=qmd.qualityMonitoringInstance_id " - + "and fd.formName like '%器械清洗不合格%' and qi.material is not null" - + " and fd.formType = '质量监测'"; - - Map dateMap = getQueryDate(queryTime, queryYear, - queryMonth); - - String startDay = dateMap.get("startDay"); - String endDay = dateMap.get("endDay"); - String timeType = dateMap.get("timeType"); - - if (tousseName != null) { - sql += " and qi.tousseName = '" + tousseName + "'"; - } - - sql += " and qi.datetime between " - + dateQueryAdapter.dateAdapter(startDay) + " and " - + dateQueryAdapter.dateAdapter(endDay) - + " group by qi.material "; - - ResultSet rs = objectDao.executeSql(sql); - Map materialMap = new HashMap(); - String materialName = ""; - String specification = ""; - if (rs != null) { - try { - while (rs.next()) { - String materialNameWithSpec = rs.getString(1); - Integer amount = rs.getInt(2); - JSONObject obj = CssdUtils.getGoodsNameAndSp(rs.getString(1)); - materialName = obj.optString("materialName"); - specification = obj.optString("specification"); - MaterialDefinition materialDefinition = materialDefinitionManager - .getMaterialDefinitionByName(materialName, - specification); - specification = ""; - if (materialDefinition != null) { - String xAsis = StringUtils.isNotBlank(tousseName) ? materialNameWithSpec - : materialDefinition.getType(); - if (materialMap.get(xAsis) != null) { - Integer count = materialMap.get(xAsis); - count += amount; - materialMap.put(xAsis, count); - } else { - materialMap.put(xAsis, amount); - } - } - } - } catch (SQLException e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - if (materialMap.size() > 0) { - Iterator> iterator = materialMap - .entrySet().iterator(); - - while (iterator.hasNext()) { - Entry entry = iterator.next(); - String type = entry.getKey(); - Integer amount = entry.getValue(); - MaterialWashUnqualifiedContrast mwc = new MaterialWashUnqualifiedContrast(); - mwc.setSeries(timeType); - mwc.setCategory(type); - mwc.setAmount(amount); - list.add(mwc); - } - } - } - return list; - } - - @Override - public List getMaterialWashUnqualifiedContrastBean( - String tousseName, String queryTime, String queryYear, - String queryMonth, String queryYear1, String queryMonth1) { - - List list = null; - List list2 = null; - - if (queryYear != null && !"".equals(queryYear)) { - list = getContrastData(tousseName, queryTime, queryYear, queryMonth); - list2 = getContrastData(tousseName, queryTime, queryYear1, - queryMonth1); - } - - if ((queryMonth != null && !queryMonth.equals(queryMonth1)) - || (queryYear != null && !queryYear.equals(queryYear1))) { - list.addAll(list2); - } - - return list; - - } - private Map getWarehouseData(String sql, Map diposableGoodsMap) {