Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r28426 -r28440 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28426) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 28440) @@ -7808,210 +7808,7 @@ } - /** - * 器械包运作统计报表 - */ @Override - public List getTousseOperateData(String startDate, - String endDate, String tousseName, String orgUnit,String tousseType) { - - List toList = new ArrayList(); - Map operateMap = new LinkedHashMap(); - Map toMap = new LinkedHashMap(); - Map recycToMap = new LinkedHashMap(); - - String tousseSql = ""; - String tdSql = ""; - String recycSql = ""; - if(StringUtils.isNotBlank(tousseName)){ - try { - tousseName = URLDecoder.decode(tousseName, "utf-8"); - } catch (UnsupportedEncodingException e) { - e.printStackTrace(); - } - if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){ - tousseName = tousseName.replace("[", "[[]"); - tousseSql = " and ti.tousseName like '%"+tousseName+"%'"; - tdSql = " and po.name like '%"+tousseName+"%'"; - recycSql = ""; - }else{ - tousseSql = " and ti.tousseName = '"+tousseName+"'"; - tdSql = " and po.name = '"+tousseName+"'"; - recycSql = ""; - } - } - - String sql1 = " select ip.id,ti.tousseName as tousseName,ip.applicationTime,sum(ti.amount) as amount " - + " from invoicePlan ip,TousseItem ti where ip.id = ti.recyclingApplication_ID and " - + "ip.applicationTime between "+ dateQueryAdapter.dateAdapter(startDate) - +" and "+ dateQueryAdapter.dateAdapter(endDate) - +" and ip.depart = '"+orgUnit+"' " - + tousseSql - +" group by ip.id,ti.tousseName,ip.applicationTime,ti.tousseType order by ip.applicationTime desc"; - - ResultSet rs = objectDao.executeSql(sql1); - - try { - while(rs.next()){ - String id = rs.getString(1); - String name = rs.getString(2); - Timestamp appDate = rs.getTimestamp(3); - int amount = rs.getInt(4); - - - DepartMentTousseOperate_child child = new DepartMentTousseOperate_child(); - child.setId(id); - child.setTousseName(name); - child.setApplyDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(appDate)); - child.setApplyAmount(amount); - toMap.put(id+":"+name, child); - } - } catch (Exception e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(rs); - } - - String sql2 = "select * from (select rr.recyclingApplication_id as id,po.name as tousseName,rr.recyclingTime," - +"sum(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as amount from RecyclingRecord rr,ClassifiedItem ci,TousseDefinition po" - +" where rr.id = ci.recyclingRecordId " - +" and ci.toussedefinition_id = po.id" - +" and rr.recyclingTime between "+ dateQueryAdapter.dateAdapter(startDate) - +" and "+ dateQueryAdapter.dateAdapter(endDate) - +" and rr.depart = '"+orgUnit+"'" - + tdSql - +" group by rr.recyclingApplication_id,po.name,rr.recyclingTime" - +" union all " - +" select rr.recyclingApplication_id as id,po.name as tousseName," - +" rr.recyclingTime,sum(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as amount " - +" from RecyclingRecord rr,ClassifiedItem ci,MaterialDefinition po " - +" where rr.id = ci.recyclingRecordId " - +" and ci.materialdefinition_id = po.id " - +" and rr.recyclingTime between "+ dateQueryAdapter.dateAdapter(startDate) - +" and "+ dateQueryAdapter.dateAdapter(endDate) - +" and rr.depart = '"+orgUnit+"'" - + tdSql - +" group by rr.recyclingApplication_id,po.name,rr.recyclingTime )t order by t.recyclingTime desc "; - - ResultSet rs2 = objectDao.executeSql(sql2); - - try { - while(rs2.next()){ - String id = rs2.getString(1); - String name = rs2.getString(2); - Timestamp recycDate = rs2.getTimestamp(3); - int recycAmount = rs2.getInt(4); - - DepartMentTousseOperate_recycChild recycChild = new DepartMentTousseOperate_recycChild(); - recycChild.setId(id); - recycChild.setTousseName(name); - recycChild.setRecyclingDate(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(recycDate)); - recycChild.setRecyclingAmount(recycAmount); - recycToMap.put(id+":"+name, recycChild); - } - } catch (SQLException e) { - e.printStackTrace(); - }finally { - DatabaseUtil.closeResultSetAndStatement(rs2); - } - if(toMap.size()>0){ - for(Entry entry : toMap.entrySet()){ - String name = entry.getKey(); - DepartMentTousseOperate_child child = entry.getValue(); - String tempName = name.split(":")[1]; - - DepartMentTousseOperate operate = null; - List childList = null; - List recycChildList = null; - if(operateMap.get(tempName) != null){ - operate = operateMap.get(tempName); - childList = operate.getChildList(); - recycChildList = operate.getRecycChildList(); - }else{ - operate = new DepartMentTousseOperate(); - childList= new ArrayList(); - recycChildList = new ArrayList(); - } - DepartMentTousseOperate_recycChild recycChild = null; - childList.add(child); - //如果已经回收了 - if(recycToMap.get(name) != null){ - recycChild = recycToMap.get(name); - recycToMap.remove(name); - - }else{ - recycChild = new DepartMentTousseOperate_recycChild(); - recycChild.setRecyclingDate(""); - recycChild.setRecyclingAmount(0); - } - recycChildList.add(recycChild); - operate.setChildList(childList); - operate.setRecycChildList(recycChildList); - operate.setTousseName(tempName); - operateMap.put(tempName, operate); - } - } - - //处理没申请有回收的器械包 - Map> tempMap = new HashMap>(); - Iterator> recyciterator = recycToMap.entrySet().iterator(); - while(recyciterator.hasNext()){ - Entry entry = recyciterator.next(); - DepartMentTousseOperate_recycChild recycChild = entry.getValue(); - String tousseName2 = recycChild.getTousseName(); - if(tempMap.get(tousseName2) == null){ - tempMap.put(tousseName2, new ArrayList()); - } - tempMap.get(tousseName2).add(recycChild); - } - //处理没申请有回收的器械包 - Iterator>> tempIterator = tempMap.entrySet().iterator(); - while(tempIterator.hasNext()){ - Entry> entry = tempIterator.next(); - String name = entry.getKey(); - List list = entry.getValue(); - List childList = new ArrayList(); - Integer tempAmount = 0; - for(DepartMentTousseOperate_recycChild child : list){ - DepartMentTousseOperate_child temp = new DepartMentTousseOperate_child(); - temp.setTousseName(name); - temp.setApplyAmount(0); - temp.setApplyDate(""); - childList.add(temp); - tempAmount += child.getRecyclingAmount(); - } - DepartMentTousseOperate operate = new DepartMentTousseOperate(); - operate.setTousseName(name); - operate.setApplyTotalAmount(0); - operate.setChildList(childList); - operate.setRecycChildList(list); - operate.setRecycTotalAmount(tempAmount); - toList.add(operate); - } - - Iterator> iterator = operateMap.entrySet().iterator(); - while(iterator.hasNext()){ - Entry entry = iterator.next(); - DepartMentTousseOperate operate = entry.getValue(); - List childList = operate.getChildList(); - List recycChildList = operate.getRecycChildList(); - - Integer applyAmount = 0; - Integer recyclingAmount = 0; - for(DepartMentTousseOperate_child child : childList){ - applyAmount += child.getApplyAmount(); - } - for(DepartMentTousseOperate_recycChild child : recycChildList){ - recyclingAmount += child.getRecyclingAmount(); - } - operate.setApplyTotalAmount(applyAmount); - operate.setRecycTotalAmount(recyclingAmount); - toList.add(operate); - } - - return toList; - } - @Override public String getInformationOfDepartmentOperationMonitoringByMode( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8046,6 +7843,17 @@ } return resultStr; } + /** + * 获取部门运作监控使用信息详情 + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 当前登录科室 + * @param tousseType + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 物品使用的信息 + */ private String getUseInformationOfDepartmentOperationMonitoring( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8096,9 +7904,19 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - //logger.debug("运作监控使用详情查询result：" + listArr.toString()); return listArr.toString(); } + /** + * 获取部门运作监控签收信息详情 + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 当前登录科室 + * @param tousseType + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 签收物品的信息 + */ private String getSignInformationOfDepartmentOperationMonitoring( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8164,9 +7982,19 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - //logger.debug("运作监控签收详情查询result：" + listArr.toString()); return listArr.toString(); } + /** + * 获取部门运作监控申请信息详情 + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 当前登录科室 + * @param tousseType + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 申请物品的信息 + */ private String getInvoicePlanInformationOfDepartmentOperationMonitoring( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8226,9 +8054,19 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - //logger.debug("运作监控申请详情查询result：" + listArr.toString()); return listArr.toString(); } + /** + * 获取部门运作监控回收信息详情 + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 当前登录科室 + * @param tousseType + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 回收物品的信息 + */ private String getRecyInformationOfDepartmentOperationMonitoring( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8284,9 +8122,19 @@ }finally { DatabaseUtil.closeResultSetAndStatement(rs); } - //logger.debug("运作监控回收详情查询result：" + listArr.toString()); return listArr.toString(); } + /** + * 获取科室运作监控发货详情信息 + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 当前登录科室 + * @param tousseType 包类型 + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 发货物品的信息 + */ private String getInvoieInformationOfDepartmentOperationMonitoring( String startDate, String endDate, String tousseName, String orgUnit, String tousseType, String tousseGroupName, @@ -8342,7 +8190,6 @@ }finally { DatabaseUtil.closeResultSetAndStatement(invoiceRs); } - //logger.debug("运作监控发货详情查询result：" + listArr.toString()); return listArr.toString(); } @Override @@ -8388,10 +8235,6 @@ tdTousseNameWhereSql = " and td.name='"+ tousseName + "'"; } String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); - List toList = new ArrayList(); - Map operateMap = new LinkedHashMap(); - Map toMap = new LinkedHashMap(); - Map recycToMap = new LinkedHashMap(); Map resultMap = new HashMap(); List listArr = new ArrayList(); String tousseSql = ""; @@ -8433,12 +8276,10 @@ applicationRs = objectDao.executeSql(appAndRecyAmountSql); while(applicationRs.next()){ Long applicationAmount = applicationRs.getLong("amount"); - //Long recyclingAmount = applicationRs.getLong("recyclingAmount"); String applicationRstousseName = applicationRs.getString("tousseName"); JSONObject obj = new JSONObject(); obj.put("tousseName", applicationRstousseName); obj.put("applicationAmount", applicationAmount); - //obj.put("recyAmount", recyclingAmount); obj.put("uiProvider", "col");//前台需要 obj.put("cls", "master-task");//前台需要 obj.put("iconCls", "task-folder");//前台需要 @@ -8621,72 +8462,6 @@ } return listArr.toString(); } - private String getAppAndRecyAmountSql(String startDate,String endDate, String tousseName, String orgUnitCoding,String tousseType, String tousseGroupName, String sterilizationMode){ - String queryCoclumnSql = " select \"tousseName\",sum(\"urgentAmount\") \"urgentAmount\" ,sum(\"sendOutAmount\") \"sendOutAmount\",sum(\"amount\") \"amount\",sum(\"recyclingAmount\") \"recyclingAmount\" from ( select distinct po.id as \"id\",po.tousseName as \"tousseName\", case when ri.urgentAmount is not null then ri.urgentAmount else po.urgentAmount end AS \"urgentAmount\",po.sendOutAmount as \"sendOutAmount\",po.amount as \"amount\",case when ip.recyclingTime is not null then po.recyclingAmount else 0 end as \"recyclingAmount\",ip.applicationTime as \"applicationTime\",po.tousseType as \"tousseType\",po.tousseDefinitionId as \"tousseDefinitionId\" "; - String selectForCustomRecycling = " select distinct ri.id as \"id\",ri.tousseName as \"tousseName\",ri.urgentAmount as \"urgentAmount\",0 as \"sendOutAmount\",0 as \"amount\",ri.amount as \"recyclingAmount\" ,rr.recyclingTime as \"applicationTime\",ri.tousseType as \"tousseType\",ri.tousseDefinitionId as \"tousseDefinitionId\" "; - String groupBySql = " group by \"tousseName\" "; - String orderBySql = " order by \"tousseName\" "; - - String departCoding = ""; - String taskGroup = ""; - String startDateStr = dateQueryAdapter.dateAdapter(startDate); - String endDateStr = dateQueryAdapter.dateAdapter(endDate); - String whereSqlForOrgUnitCoding = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("ip.departCoding", orgUnitCoding, ","); - String typeSql = ""; - String typeSqlForCustomRecycling = ""; - if (StringUtils.isNotBlank(tousseType) && !tousseType.contains("全部")) { - typeSql = String.format(" and po.tousseType='%s'", tousseType); - typeSqlForCustomRecycling = String.format(" and ri.tousseType='%s' ", tousseType); - }else{ - typeSql = ""; - typeSqlForCustomRecycling = ""; - } - String taskGroupSql = ""; - String taskGroupSqlForCustomRecycling = ""; - if (StringUtils.isNotBlank(taskGroup) && !taskGroup.contains("全部")) { - taskGroupSql = String.format(" and po.tousseDefinitionId in (select cht.tousseDefinitionId from CssdHandleTousses cht where cht.orgUnitCode = '%s' %s)", AcegiHelper.getLoginUser().getCurrentOrgUnitCode(), SqlUtils.get_InSql_Extra("cht.taskGroup", taskGroup)); - taskGroupSqlForCustomRecycling = String.format(" and ri.tousseDefinitionId in (select cht.tousseDefinitionId from CssdHandleTousses cht where cht.orgUnitCode = '%s' %s)", AcegiHelper.getLoginUser().getCurrentOrgUnitCode(), SqlUtils.get_InSql_Extra("cht.taskGroup", taskGroup)); - } - String tousseGroupNameSql = ""; - String tousseGroupNameSqlForCustomRecycling = ""; - if (StringUtils.isNotBlank(tousseGroupName) && !tousseGroupName.contains("全部")) { - tousseGroupNameSql = String.format(" and po.tousseDefinitionId in (select id from TousseDefinition where 1=1 %s )", SqlUtils.get_InSql_Extra("tousseGroupName", tousseGroupName)); - tousseGroupNameSqlForCustomRecycling = String.format(" and ri.tousseDefinitionId in (select id from TousseDefinition where 1=1 %s )", SqlUtils.get_InSql_Extra("tousseGroupName", tousseGroupName)); - } - String sterilingMethodSql = ""; - String tsterilingMethodSqlForCustomRecycling = ""; - if (StringUtils.isNotBlank(sterilizationMode) && !sterilizationMode.contains("全部")) { - sterilingMethodSql = String.format(" and po.tousseDefinitionId in (select tdg.id from TousseDefinition tdg join Sterilisation ss on sterilingMethod=ss.sterilisation where 1=1 %s )", SqlUtils.get_InSql_Extra("ss.sterilizationMode", sterilizationMode)); - tsterilingMethodSqlForCustomRecycling = String.format(" and ri.tousseDefinitionId in (select tgs.id from TousseDefinition tgs join Sterilisation sss on sterilingMethod=sss.sterilisation where 1=1 %s )", SqlUtils.get_InSql_Extra("sss.sterilizationMode", sterilizationMode)); - } - String whereSql = String.format(queryCoclumnSql + " from TousseItem po join invoicePlan ip on po.RecyclingApplication_id = ip.id " + - " left join RecyclingRecord rr on rr.recyclingApplication_id = ip.id" + - " left join RecyclingItem ri on rr.id = ri.recyclingRecord_id and ri.tousseDefinitionId = po.toussedefinitionid " - + " where (ip.applicationTime between %s and %s or ip.recyclingTime between %s and %s) " - + " and ip.committedStatus = 1 %s %s %s %s %s %s %s " - //+ "and (ip.recyclingStatus != '%s' or ip.recyclingStatus is null)" - , startDateStr, endDateStr, startDateStr, endDateStr, whereSqlForOrgUnitCoding, - SqlUtils.getWhereSqlByfilterFieldAndStringValue("ip.depart", departCoding), - typeSql, - SqlUtils.getWhereSqlByfilterFieldAndStringValue("po.tousseName", tousseName), - taskGroupSql, - tousseGroupNameSql, - sterilingMethodSql); - //因为自定义回收的不产生申请单，所以RecyclingRecord的recyclingApplication_id是为空,因此要union上RecyclingRecord表中rr.recyclingApplication_id为空的数据 - String whereSqlForOrgUnitCodingForUnionSelect = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("rr.departCode", orgUnitCoding, ","); - String unionWhere = String.format(selectForCustomRecycling + " from RecyclingRecord rr join RecyclingItem ri on rr.id = ri.recyclingRecord_id " - + " where rr.recyclingApplication_id is null %s and rr.recyclingTime between %s and %s %s %s %s %s %s ", whereSqlForOrgUnitCodingForUnionSelect, startDateStr, endDateStr, - SqlUtils.getWhereSqlByfilterFieldAndStringValue("rr.depart", departCoding), - typeSqlForCustomRecycling, - SqlUtils.getWhereSqlByfilterFieldAndStringValue("ri.tousseName", tousseName), - taskGroupSqlForCustomRecycling, - tousseGroupNameSqlForCustomRecycling, - tsterilingMethodSqlForCustomRecycling); - whereSql += " union " + unionWhere; - whereSql += ") po where 1=1 "; - whereSql += groupBySql + orderBySql; - return whereSql; - } /** * 获取已装配数量 * @param startTime Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java =================================================================== diff -u -r28409 -r28440 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 28409) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/vo/TousseOperate.java (.../TousseOperate.java) (revision 28440) @@ -69,7 +69,12 @@ */ private String orgUnitCoding; /** - * 清洗物品类型 + * 与ClassifiedItem的itemType一致 + * 物品类型 是材料还是器械包 + * 拆包清洗的器械包，itemType为材料 + * 整包清洗的器械包或者消毒物品，itemType为器械包或者消毒物品 + * 对于外来器械，itemType为材料 + * */ private String itemType; public TousseOperate() { Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r28420 -r28440 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28420) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 28440) @@ -988,18 +988,7 @@ return jasperReportManager.getStatisticalWorkloadData(startTime, endTime, departCoding, tousseTypes, packageSizes, BooleanUtils.toBoolean(isStrengthen),taskGroup); } - } else if (reportName.equals("tousseOperate")) { - String startDate = StrutsParamUtils.getPraramValue("startDate", ""); - String endDate = StrutsParamUtils.getPraramValue("endDate", ""); - String tousseType = StrutsParamUtils.getPraramValue("tousseType", ""); - String tousseName = StrutsParamUtils - .getPraramValue("goodsName", ""); - - String orgUnit = AcegiHelper.getCurrentOrgUnitName(); - - return jasperReportManager.getTousseOperateData(startDate, - endDate, tousseName,orgUnit,tousseType); - } else if (reportName.equals("materialWashUnqualifiedContrast")) { + }else if (reportName.equals("materialWashUnqualifiedContrast")) { String tousseName = StrutsParamUtils.getPraramValue("tousseName", null);// 器械包名称 @@ -2236,8 +2225,6 @@ String startTime = StrutsParamUtils.getPraramValue("startTime", ""); String endTime = StrutsParamUtils.getPraramValue("endTime", ""); map.put("title", String.format("待装配任务工作表(%s~%s)", startTime, endTime)); - }else if("tousseOperate".equals(reportName)){ - getTousseOperateParam(map); }else if("apparatusInfusionisType".equals(reportName)){ getApparatusInfusionisTypeParam(map); }else if(reportName.equals("borrowingReport")){ @@ -2430,7 +2417,6 @@ map.put("title", String.format("预处理不合格统计报表(%s~%s)", startDate, endDate)); }else if("cleaningAreaWorkloadForUser".equals(reportName)){ String monthSearch = StrutsParamUtils.getPraramValue("monthSearch", ""); - String departmentCode = StrutsParamUtils.getPraramValue("departmentCode", ""); map.put("title", String.format("清洗区人员工作量统计报表(%s)", monthSearch)); }else if("materialErrorDamageDetail".equals(reportName)){ String startDay = StrutsParamUtils.getPraramValue("startDay", ""); @@ -3251,12 +3237,6 @@ } return map; } - - private void getTousseOperateParam(Map map) { - String startDate = StrutsParamUtils.getPraramValue("startDate", ""); - String endDate = StrutsParamUtils.getPraramValue("endDate", ""); - map.put("title", "科室申领物品监控 "+startDate+" ~ "+endDate); - } private void getMaterialMissTotalViewParam(Map map) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); @@ -4303,7 +4283,11 @@ } StrutsResponseUtils.output(jSONArray); } - + /** + * 获取科室运作监控信息(包含汇总和各数量详情) + * modeName的值与对应的查询关系 + * sum汇总 applicationDetails申请详情 recyDetails回收详情 invoiceDetails发货详情 signDetails签收详情 使用详情 + */ public void getInformationOfDepartmentOperationMonitoring(){ String startDate = StrutsParamUtils.getPraramValue("startDate", ""); String endDate = StrutsParamUtils.getPraramValue("endDate", ""); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r28420 -r28440 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 28420) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 28440) @@ -344,9 +344,6 @@ public List getmaterialWashUnqualifiedAssessMethodBean( String startDay, String endDay); - public List getTousseOperateData(String startDate, - String endDate, String tousseName, String orgUnit,String tousseType); - public List getMaterialWashUnqualifiedContrastBean( String tousseName, String queryTime, String queryYear, String queryMonth, String queryYear1, String queryMonth1); @@ -986,8 +983,30 @@ * @return */ public List getRinserStoveUseCountDetailData(String startTime,String endTime,String depart,String departCoding); - - public String getInformationOfDepartmentOperationMonitoringByMode(String startDate, String endDate, String tousseName, String orgUnit,String tousseType, String taskGroupName, String sterilizationMode, String modeName); - public String getSummaryInformationOfDepartmentOperationMonitoring(String startDate, String endDate, String tousseName, String orgUnit,String tousseType, String taskGroupName, String sterilizationMode); + /** + * + * @param startDate + * @param endDate + * @param tousseName + * @param orgUnit 登录科室名 + * @param tousseType 包类型 + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @param modeName 查询模块名称 applicationDetails申请详情 recyDetails回收详情 invoiceDetails发货详情 signDetails签收详情 使用详情 + * @return + */ + public String getInformationOfDepartmentOperationMonitoringByMode(String startDate, String endDate, String tousseName, String orgUnit,String tousseType, String tousseGroupName, String sterilizationMode, String modeName); + /** + * 获取运作监控汇总信息 + * @param startDate + * @param endDate + * @param tousseName 包名 + * @param orgUnit 当前登录科室名 + * @param tousseType 包类型 + * @param tousseGroupName 器械包分组 + * @param sterilizationMode 灭菌方式 + * @return 器械包各个指标的实例 + */ + public String getSummaryInformationOfDepartmentOperationMonitoring(String startDate, String endDate, String tousseName, String orgUnit,String tousseType, String tousseGroupName, String sterilizationMode); }