Index: ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jrxml (revision 24639) @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="30" splitType="Stretch"> + <textField> + <reportElement uuid="30f4ecf5-24e8-426b-b1d1-819032778443" x="0" y="0" width="800" height="30"/> + <textElement textAlignment="Center" verticalAlignment="Middle"> + <font size="14" isBold="true"/> + </textElement> + <textFieldExpression><![CDATA[$P{title}]]></textFieldExpression> + </textField> + </band> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r24563 -r24639 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 24563) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 24639) @@ -256,7 +256,7 @@ * 《消毒供应中心质量监测报表》菜单 */ var SSTS_QualityMonitoring_Menu_1 = true; - + if (!notInWhiteList(sstsConfig, 'qualityMonitoringRelatedReports')) { SSTS_QualityMonitoring_Menu_1 = false; } @@ -392,6 +392,14 @@ /** + * 《清洗情况报表》权限 + */ +var SSTS_WashAndDisinfectRecordInfoReport = true; + + SSTS_WashAndDisinfectRecordInfoReport = false; + + +/** * 《财务核算及物品发放报表》菜单 */ var SSTS_DepartmentMonthly_Menu = true; Index: ssts-web/src/main/webapp/jasperRtp/WashAndDisinfectRecordReport.jasper =================================================================== diff -u Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r24581 -r24639 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24581) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 24639) @@ -130,104 +130,7 @@ import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord; import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecordMaterial; import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ApparatusInfusionisType; -import com.forgon.disinfectsystem.jasperreports.javabeansource.BaseBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordItemVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.BorrowingRecordVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.CleaningAreaWorkloadForUser; -import com.forgon.disinfectsystem.jasperreports.javabeansource.CrossTableBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DamageErrorMontBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartMentTousseOperate; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartMentTousseOperate_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartMentTousseOperate_recycChild; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartmentMonthDetail; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DepartmentMonthDetailItem; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DeviceMaintenanceCusBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.DisinfectionFractionDefectiveBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.EighteenQuotaBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseAfterUseDeliveryVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseApplicationVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ForeignTousseSterilizationMonitorAndDeliveryVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.FormInstanceVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryItemVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.GodownEntryStatistic_main; -import com.forgon.disinfectsystem.jasperreports.javabeansource.GoodsAmountSummaryByGrade; -import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceAmountContrastBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQuery; -import com.forgon.disinfectsystem.jasperreports.javabeansource.InvoiceQueryItem; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageSummaryOfDepartmentVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialErrorDamageVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialMissBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialMissItemBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialTypeWorkloadReport; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialWashUnqualified; -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; -import com.forgon.disinfectsystem.jasperreports.javabeansource.MonthReportChartBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.NurseWorkloadBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_child_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationDetail_main; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_child_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.OperationReservationSum_main; -import com.forgon.disinfectsystem.jasperreports.javabeansource.PackingFractionDefectiveBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityControlOfClinic; -import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityMonitoringInspectBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.QualityMonitoringInspectMonthLineChartBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.RecycleMaterialVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsItemVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnGoodsVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.ReturnRecordItemVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SignGoodsItemVo; -import com.forgon.disinfectsystem.jasperreports.javabeansource.StatisticalWorkload; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationAreaWorkLoadBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationOmitReportBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationOmitReportBeanChild; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizerQualiyBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizerQualiyBean_Child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForDepartmentVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForGoodsVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForPatientAreaVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.SupplyRoomQualityQuota; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplyDepartment; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplyDepartment_Child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseApplySummary; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseItemVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseMorrowSendBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseOverLoadBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseReturnDisinfectionForDepartment; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseReturnDisinfectionForTousseInstance; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSpecificationSizeStatistics; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSpecificationSizeStatistics_child; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSterilizationInspectSituationBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseTraceabilityInquiry; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadChildVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseWorkLoadVO; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UrgentNeedGoodsProcessingCycle; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordEnteringBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordEnteringTousse; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordItemBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorItemBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordTousseItemBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WaitPackingTaskReportBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WaitPackingTaskReportBeanChild; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WashUnUnqualifiedBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WashWorkload_main; -import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection; -import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkLoadReportBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.YearWorkloadBean; -import com.forgon.disinfectsystem.jasperreports.javabeansource.returnGoodsSummary; +import com.forgon.disinfectsystem.jasperreports.javabeansource.*; import com.forgon.disinfectsystem.qualitymonitoring.definition.service.QualityMonitoringDefinitionManager; import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager; import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialCheckManager; @@ -20675,4 +20578,84 @@ return result; } + @Override + public List getWashAndDisinfectRecordDataSource( + String startDate, String endDate, String querySupplyRoom, + String rinserName, String disinfectProgram, String tousseName) { + //查询条件 + String queryCondition = " where 1=1 "; + queryCondition += " and " + dateQueryAdapter.dateAreaSql("alias.startDate", startDate, endDate); + if(StringUtils.isNotBlank(querySupplyRoom)){ + queryCondition += " and alias.orgUnitCoding='"+ querySupplyRoom +"'"; + } + if(StringUtils.isNotBlank(rinserName)){ + queryCondition += " and alias.rinserName='"+ rinserName +"'"; + } + if(StringUtils.isNotBlank(disinfectProgram)){ + queryCondition += " and alias.disinfectProgram='"+ disinfectProgram +"'"; + } + if(StringUtils.isNotBlank(tousseName)){ + queryCondition += " and alias.tousseName='"+ tousseName +"'"; + } + //查询语句 + String querySql = "select alias.startDate,alias.endDate,alias.rinserName,alias.disinfectProgram,alias.tousseName,alias.operator,sum(alias.tousseAmount) tousseAmount from (" + + " select r.orgUnitCoding,r.name rinserName," + + " wr.disinfectProgram disinfectProgram," + + " ci.tousseNameForMaterial tousseName," + + " ci.amount tousseAmount," + + " wr.startDate,wr.endDate,wr.operator" + + " from WashAndDisinfectRecord wr join rinser r on wr.rinserId = r.id" + + " join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id" + + " join ClassifyBasket cb on cw.ClassifyBasket_ID=cb.id" + + " join ClassifiedItem ci on ci.classifybasket_id=cb.id" + + " where ci.itemType='"+ MaterialDefinition.TYPE_NAME +"'" + + + " union all" + + + " select r.orgUnitCoding,r.name rinserName," + + " wr.disinfectProgram disinfectProgram," + + " ci.name tousseName," + + " ci.amount * (select sum(mi.count) from MaterialInstance mi where mi.tousse_id=ci.tousseDefinitionID)," + + " wr.startDate,wr.endDate,wr.operator " + + " from WashAndDisinfectRecord wr join rinser r on wr.rinserId = r.id" + + " join ClassifyBasket_WashRecord cw on cw.WashAndDisinfectRecord_ID=wr.id" + + " join ClassifyBasket cb on cw.ClassifyBasket_ID=cb.id" + + " join ClassifiedItem ci on ci.classifybasket_id=cb.id" + + " where ci.itemType='"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"'" + + " ) alias" + queryCondition + + " group by alias.startDate,alias.endDate,alias.rinserName,alias.disinfectProgram,alias.tousseName,alias.operator"; + ResultSet rs = null; + List dataList = new ArrayList(); + try { + rs = objectDao.executeSql(querySql); + WashAndDisinfectRecordItemBean bean = null; + while(rs.next()){ + bean = new WashAndDisinfectRecordItemBean(); + bean.setRinserName(rs.getString("rinserName")); + bean.setDisinfectProgram(rs.getString("disinfectProgram")); + bean.setTousseName(rs.getString("tousseName")); + bean.setOperator(rs.getString("operator")); + + Object tousseAmountObj = rs.getObject("tousseAmount"); + if(tousseAmountObj != null && tousseAmountObj instanceof Number){ + bean.setTousseAmount(((Number)tousseAmountObj).intValue()); + } + Date startDateObj = rs.getTimestamp("startDate"); + if(startDateObj != null){ + bean.setStartDate(ForgonDateUtils.safelyFormatDate(startDateObj, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, null)); + } + Date endDateObj = rs.getTimestamp("endDate"); + if(startDateObj != null){ + bean.setEndDate(ForgonDateUtils.safelyFormatDate(endDateObj, ForgonDateUtils.SIMPLEDATEFORMAT_YYYYMMDDHHMMSS, null)); + } + dataList.add(bean); + } + } catch (Exception e) { + e.printStackTrace(); + }finally{ + DatabaseUtil.closeResultSetAndStatement(rs); + } + return dataList; + } + } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WashAndDisinfectRecordItemBean.java =================================================================== diff -u --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WashAndDisinfectRecordItemBean.java (revision 0) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/WashAndDisinfectRecordItemBean.java (revision 24639) @@ -0,0 +1,101 @@ +package com.forgon.disinfectsystem.jasperreports.javabeansource; + +/** + * 清洗情况报表bean + * @author shuyongfu + * @since 2018-10-18 + */ +public class WashAndDisinfectRecordItemBean { + + /** + * 清洗机名称 + */ + private String rinserName; + + /** + * 清洗程序名称 + */ + private String disinfectProgram; + + /** + * 器械包名称 + */ + private String tousseName; + + /** + * 器械数量 + */ + private Integer tousseAmount; + + /** + * 开始时间 + */ + private String startDate; + + /** + * 结束时间 + */ + private String endDate; + + /** + * 操作人 + */ + private String operator; + + public String getRinserName() { + return rinserName; + } + + public void setRinserName(String rinserName) { + this.rinserName = rinserName; + } + + public String getDisinfectProgram() { + return disinfectProgram; + } + + public void setDisinfectProgram(String disinfectProgram) { + this.disinfectProgram = disinfectProgram; + } + + public String getTousseName() { + return tousseName; + } + + public void setTousseName(String tousseName) { + this.tousseName = tousseName; + } + + public Integer getTousseAmount() { + return tousseAmount; + } + + public void setTousseAmount(Integer tousseAmount) { + this.tousseAmount = tousseAmount; + } + + public String getStartDate() { + return startDate; + } + + public void setStartDate(String startDate) { + this.startDate = startDate; + } + + public String getEndDate() { + return endDate; + } + + public void setEndDate(String endDate) { + this.endDate = endDate; + } + + public String getOperator() { + return operator; + } + + public void setOperator(String operator) { + this.operator = operator; + } + +} Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r24004 -r24639 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 24004) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 24639) @@ -71,6 +71,7 @@ import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordEnteringBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.WaitPackingTaskReportBean; +import com.forgon.disinfectsystem.jasperreports.javabeansource.WashAndDisinfectRecordItemBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection; import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean; @@ -772,5 +773,19 @@ */ public List getMaterialErrorDamageSummaryData(String startDay, String endDay, String departmentCode, String goodsId); + + /** + * 清洗情况报表 + * @param startDate 开始日期 + * @param endDate 结束日期 + * @param querySupplyRoom 供应室编码 + * @param rinserName 清洗机名称 + * @param disinfectProgram 清洗程序 + * @param tousseName 器械包名称 + * @return + */ + public List getWashAndDisinfectRecordDataSource(String startDate , String endDate , + String querySupplyRoom , String rinserName , String disinfectProgram , String tousseName); + } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java =================================================================== diff -u -r23079 -r24639 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 23079) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/rinser/action/RinserAction.java (.../RinserAction.java) (revision 24639) @@ -342,8 +342,10 @@ * added by wang 2012-4-1 9:30 */ public void getAllRinserListData(){ - - String departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + String departCoding = StrutsParamUtils.getPraramValue("departCoding", null); + if(StringUtils.isBlank(departCoding)){ + departCoding = AcegiHelper.getLoginUser().getCurrentOrgUnitCode(); + } List list = rinserManager.getRinserByDepartCoding(departCoding); StringBuffer buff = new StringBuffer("["); if (list != null && list.size() > 0) { Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r24484 -r24639 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 24484) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 24639) @@ -589,6 +589,7 @@ {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材报损明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageItemView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_MATERIAL_MISS_ITEM_TOTAL_VIEW,text:"器材丢失报损分类统计月报",href:WWWROOT+'/disinfectsystem/reportforms/materialDamageMissMonthView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :SSTS_SterilizationRecordInfoReport,text:"灭菌情况报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, + {hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true}, {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true}, Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java =================================================================== diff -u -r12331 -r24639 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java (.../CleanMethodAction.java) (revision 12331) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/cleanmethod/action/CleanMethodAction.java (.../CleanMethodAction.java) (revision 24639) @@ -164,7 +164,7 @@ buff.append(","); } buff.append("['").append(cleanMethod.getId()).append("','") - .append(cleanMethod.getCleanMethod()).append("'") + .append(cleanMethod.getCleanMethod()).append("','") .append(cleanMethod.getBarcode()).append("',") .append(cleanMethod.getCleanMinutes()) .append("]"); Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r24004 -r24639 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 24004) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 24639) @@ -322,6 +322,14 @@ return jasperReportManager.getFormInstanceData(startDate,endDate,departCoding,formName); }else if(reportName.equals("SterilizationRecord")){ // 灭菌记录信息 return getSterilizationRecordDataSource(); + }else if(reportName.equals("WashAndDisinfectRecord")){ // 清洗情况报表 + String startDate = StrutsParamUtils.getPraramValue("startDate", ""); + String endDate = StrutsParamUtils.getPraramValue("endDate", ""); + String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", ""); + String rinserName = StrutsParamUtils.getPraramValue("rinserName", ""); + String disinfectProgram = StrutsParamUtils.getPraramValue("disinfectProgram", ""); + String tousseName = StrutsParamUtils.getPraramValue("tousseName", ""); + return jasperReportManager.getWashAndDisinfectRecordDataSource(startDate , endDate , querySupplyRoom , rinserName , disinfectProgram , tousseName); } else if(reportName.equals("SterilizerQualityReport")){ // 灭菌物品质量监测统计报表 Map params = StrutsParamUtils.getParameters(); @@ -1356,6 +1364,19 @@ String endTime = StrutsParamUtils.getPraramValue("endDate", ""); map.put("title", "灭菌记录信息"); map.put("createDate", " " + startTime + " ~ " + endTime ); + }else if(reportName.equals("WashAndDisinfectRecord")){ // 清洗情况报表 + String startTime = StrutsParamUtils.getPraramValue("startDate", ""); + String endTime = StrutsParamUtils.getPraramValue("endDate", ""); + String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", ""); + String rinserName = StrutsParamUtils.getPraramValue("rinserName", ""); + String disinfectProgram = StrutsParamUtils.getPraramValue("disinfectProgram", ""); + String tousseName = StrutsParamUtils.getPraramValue("tousseName", ""); + map.put("title", "清洗情况报表"); + map.put("createDate", " " + startTime + " ~ " + endTime ); + map.put("querySupplyRoom", querySupplyRoom); + map.put("rinserName", rinserName); + map.put("disinfectProgram", disinfectProgram); + map.put("tousseName", tousseName); }else if(reportName.equals("SterilizerQualityReport")){ String startTime = StrutsParamUtils.getPraramValue("startDate", ""); String endTime = StrutsParamUtils.getPraramValue("endDate", "");