Index: ssts-web/src/main/webapp/homepage/menuconfigure.js =================================================================== diff -u -r27132 -r27180 --- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27132) +++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 27180) @@ -633,6 +633,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_SterilizationEffectMonitorReport,text:"灭菌效果监测结果报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationEffectMonitorView.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}, Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java =================================================================== diff -u -r27157 -r27180 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27157) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java (.../JasperreportsAction.java) (revision 27180) @@ -1346,6 +1346,13 @@ fullNames = SqlUtils.splitStringToSet(fullNameStr, ","); } return jasperReportManager.getScheduleReportDate(startTime, endTime, sheduleNames, fullNames); + }else if("sterilizationEffectMonitorReport".equals(reportName)){//灭菌效果监测结果报表 + String startDay = StrutsParamUtils.getPraramValue("startDayHidden", ""); + String endDay = StrutsParamUtils.getPraramValue("endDayHidden", ""); + String sterilizerName = StrutsParamUtils.getPraramValue("sterilizerNameHidden", ""); + int frequency = StrutsParamUtils.getPraramValue("frequency", -1); + String sterilizerNameGroup = StrutsParamUtils.getPraramValue("sterilizerNameGroupHidden", ""); + return jasperReportManager.getSterilizationEffectMonitorReportData(startDay, endDay, sterilizerName, frequency, sterilizerNameGroup); } return null; } @@ -2308,6 +2315,8 @@ map.put("title", String.format("生物监测统计报表(%s至%s)", startDay, endDay)); }else if("scheduleReport".equals(reportName)){ map.put("title", "人员班次统计表"); + }else if("sterilizationEffectMonitorReport".equals(reportName)){ + map.put("title", "灭菌效果监测结果报表"); } return map; } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationEffectMonitorReportVo.java =================================================================== diff -u --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationEffectMonitorReportVo.java (revision 0) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/SterilizationEffectMonitorReportVo.java (revision 27180) @@ -0,0 +1,213 @@ +package com.forgon.disinfectsystem.jasperreports.javabeansource; + +/** + * 灭菌效果监测结果报表Vo + * @author zc.li + * @date 2019.11.21 + */ +public class SterilizationEffectMonitorReportVo { + /** + * 灭菌炉名称 + */ + private String sterilizerName; + /** + * 炉次 + */ + private String frequency; + /** + * 灭菌程序 + */ + private String sterilizationType; + /** + * 灭菌员 + */ + private String sterilizationUser; + /** + * 监测结果 + */ + private String biologyResult; + /** + * 生物监测开始时间 + */ + private String biologicalMonitoringStartDate; + /** + * 生物监测结束时间 + */ + private String biologicalMonitoringEndDate; + /** + * 灭菌开始时间 + */ + private String startDateStr; + /** + * 灭菌结束时间 + */ + private String endDateStr; + /** + * 灭菌总数 + */ + private Integer amount; + /** + * 物理监测结果 + */ + private String physicsResult; + /** + * 化学监测结果 + */ + private String chemistryResult; + /** + * 监测管结果 + */ + private String monitoringTubeResult; + /** + * 对照管结果 + */ + private String controlTubeResult; + /** + * 对照管批号 + */ + private String controlBatchNum; + /** + * 对照管有效期 + */ + private String controlTubeExpiryDate; + /** + * 最低温度 + */ + private Double minTemperature; + /** + * 最高温度 + */ + private Double maxTemperature; + /** + * 最小压力 + */ + private Double minPressure; + /** + * 最大压力 + */ + private Double maxPressure; + + public String getSterilizerName() { + return sterilizerName; + } + public void setSterilizerName(String sterilizerName) { + this.sterilizerName = sterilizerName; + } + public String getFrequency() { + return frequency; + } + public void setFrequency(String frequency) { + this.frequency = frequency; + } + public String getSterilizationType() { + return sterilizationType; + } + public void setSterilizationType(String sterilizationType) { + this.sterilizationType = sterilizationType; + } + public String getSterilizationUser() { + return sterilizationUser; + } + public void setSterilizationUser(String sterilizationUser) { + this.sterilizationUser = sterilizationUser; + } + public String getBiologyResult() { + return biologyResult; + } + public void setBiologyResult(String biologyResult) { + this.biologyResult = biologyResult; + } + public String getBiologicalMonitoringStartDate() { + return biologicalMonitoringStartDate; + } + public void setBiologicalMonitoringStartDate( + String biologicalMonitoringStartDate) { + this.biologicalMonitoringStartDate = biologicalMonitoringStartDate; + } + public String getBiologicalMonitoringEndDate() { + return biologicalMonitoringEndDate; + } + public void setBiologicalMonitoringEndDate(String biologicalMonitoringEndDate) { + this.biologicalMonitoringEndDate = biologicalMonitoringEndDate; + } + + public String getStartDateStr() { + return startDateStr; + } + public void setStartDateStr(String startDateStr) { + this.startDateStr = startDateStr; + } + public String getEndDateStr() { + return endDateStr; + } + public void setEndDateStr(String endDateStr) { + this.endDateStr = endDateStr; + } + public Integer getAmount() { + return amount; + } + public void setAmount(Integer amount) { + this.amount = amount; + } + public String getPhysicsResult() { + return physicsResult; + } + public void setPhysicsResult(String physicsResult) { + this.physicsResult = physicsResult; + } + public String getChemistryResult() { + return chemistryResult; + } + public void setChemistryResult(String chemistryResult) { + this.chemistryResult = chemistryResult; + } + public String getMonitoringTubeResult() { + return monitoringTubeResult; + } + public void setMonitoringTubeResult(String monitoringTubeResult) { + this.monitoringTubeResult = monitoringTubeResult; + } + public String getControlTubeResult() { + return controlTubeResult; + } + public void setControlTubeResult(String controlTubeResult) { + this.controlTubeResult = controlTubeResult; + } + public String getControlBatchNum() { + return controlBatchNum; + } + public void setControlBatchNum(String controlBatchNum) { + this.controlBatchNum = controlBatchNum; + } + public String getControlTubeExpiryDate() { + return controlTubeExpiryDate; + } + public void setControlTubeExpiryDate(String controlTubeExpiryDate) { + this.controlTubeExpiryDate = controlTubeExpiryDate; + } + public Double getMinTemperature() { + return minTemperature; + } + public void setMinTemperature(Double minTemperature) { + this.minTemperature = minTemperature; + } + public Double getMaxTemperature() { + return maxTemperature; + } + public void setMaxTemperature(Double maxTemperature) { + this.maxTemperature = maxTemperature; + } + public Double getMinPressure() { + return minPressure; + } + public void setMinPressure(Double minPressure) { + this.minPressure = minPressure; + } + public Double getMaxPressure() { + return maxPressure; + } + public void setMaxPressure(Double maxPressure) { + this.maxPressure = maxPressure; + } + +} Index: ssts-web/src/main/resources/systemset/operationDefine.xml =================================================================== diff -u -r27127 -r27180 --- ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 27127) +++ ssts-web/src/main/resources/systemset/operationDefine.xml (.../operationDefine.xml) (revision 27180) @@ -469,6 +469,7 @@ + Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r27157 -r27180 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27157) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 27180) @@ -130,6 +130,7 @@ import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialItem; import com.forgon.disinfectsystem.entity.returnmaterialrecord.ReturnMaterialRecord; import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord; +import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizerrecord.SterilizerRecord; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MaterialStockVo; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.MonthGoodsDetailVo; import com.forgon.disinfectsystem.entity.stocktakerecordmanager.StockDiposableGoodBatch; @@ -19179,4 +19180,88 @@ .append(" GROUP BY SS.FULLNAME,SD.SHEDULENAME"); return sf.toString(); } + @Override + public List getSterilizationEffectMonitorReportData( + String startDay, String endDay, String sterilizerName, int frequency, String sterilizerNameGroup) { + List list = new ArrayList(); + ResultSet rs = null; + try { + StringBuffer querySql = new StringBuffer(1500); + querySql.append("select sterilizationUser,s.name,sc.frequency,sc.startDate,sc.endDate,sc.sterilizationType,sc.amount,sc.physicsResult,sc.chemistryResult,sc.biologyResult,sc.monitoringTubeResult,sc.controlTubeResult,sc.biologicalMonitoringStartDate,sc.biologicalMonitoringEndDate,sc.controlBatchNum,sc.controlTubeExpiryDate,min(t1Temp) minTemperature,max(t1Temp) maxTemperature,min(p1Mbar) minPressure,max(p1Mbar) maxPressure from ") + .append(SterilizationRecord.class.getSimpleName()) + .append(" sc inner join ") + .append(Sterilizer.class.getSimpleName()) + .append(" s on s.id=sc.sterilizer_id ") + .append("left join ") + .append(SterilizerRecord.class.getSimpleName()) + .append(" sr on sr.cycleCounter=sc.cycleCounter and s.deviceInterface_id=sr.deviceInterfaceID and s.machineNumber=sr.machineNo and phase='\"灭菌\"' where ") + .append(dateQueryAdapter.dateAreaSql("sc.startDate", startDay+" 00:00:00", endDay + " 23:59:59")) + .append(SqlUtils.get_InSql_Extra("s.name", sterilizerName)); + if(frequency != -1){ + querySql.append(" and frequency=" + frequency); + } + if(StringUtils.isNotBlank(sterilizerNameGroup)){ + querySql.append(" and s.ownGroup='" + sterilizerNameGroup).append("'"); + } + querySql.append(" group by sc.id,sterilizationUser,s.name,sc.frequency,sc.startDate,sc.endDate,sc.sterilizationType,sc.amount,sc.physicsResult,sc.chemistryResult,sc.biologyResult,sc.monitoringTubeResult,sc.controlTubeResult,sc.biologicalMonitoringStartDate,sc.biologicalMonitoringEndDate,sc.controlBatchNum,sc.controlTubeExpiryDate order by sc.startDate"); + rs = objectDao.executeSql(querySql.toString()); + SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm"); + while(rs.next()){ + SterilizationEffectMonitorReportVo item = new SterilizationEffectMonitorReportVo(); + Date biologicalMonitoringStartDate = rs.getTimestamp("biologicalMonitoringStartDate"); + Date biologicalMonitoringEndDate = rs.getTimestamp("biologicalMonitoringEndDate"); + if(biologicalMonitoringStartDate != null){ + item.setBiologicalMonitoringStartDate(ForgonDateUtils.safelyFormatDate(biologicalMonitoringStartDate, sdf, "")); + } + if(biologicalMonitoringEndDate != null){ + item.setBiologicalMonitoringEndDate(ForgonDateUtils.safelyFormatDate(biologicalMonitoringEndDate, sdf, "")); + } + Integer amount = rs.getInt("amount"); + String physicsResult = rs.getString("physicsResult"); + String chemistryResult = rs.getString("chemistryResult"); + String monitoringTubeResult = rs.getString("monitoringTubeResult"); + String controlTubeResult = rs.getString("controlTubeResult"); + String controlBatchNum = rs.getString("controlBatchNum"); + String controlTubeExpiryDate = rs.getString("controlTubeExpiryDate"); + String biologyResult = rs.getString("biologyResult"); + if("无".equals(biologyResult)){ + biologyResult = ""; + } + Date startDate = rs.getTimestamp("startDate"); + Date endDate = rs.getTimestamp("endDate"); + if(startDate != null){ + item.setStartDateStr(ForgonDateUtils.safelyFormatDate(startDate, sdf, "")); + } + if(endDate != null){ + item.setEndDateStr(ForgonDateUtils.safelyFormatDate(endDate, sdf, "")); + } + double minPressure = rs.getDouble("minPressure"); + double maxPressure = rs.getDouble("maxPressure"); + double minTemperature = rs.getDouble("minTemperature"); + double maxTemperature = rs.getDouble("maxTemperature"); + item.setMinPressure(minPressure); + item.setMaxPressure(maxPressure); + item.setMinTemperature(minTemperature); + item.setMaxTemperature(maxTemperature); + item.setAmount(amount); + item.setPhysicsResult(physicsResult); + item.setChemistryResult(chemistryResult); + item.setMonitoringTubeResult(monitoringTubeResult); + item.setControlTubeResult(controlTubeResult); + item.setControlBatchNum(controlBatchNum); + item.setControlTubeExpiryDate(controlTubeExpiryDate); + item.setBiologyResult(biologyResult); + item.setFrequency(rs.getString("frequency")); + item.setSterilizationType(rs.getString("sterilizationType")); + item.setSterilizationUser(rs.getString("sterilizationUser")); + item.setSterilizerName(rs.getString("name")); + list.add(item); + } + } catch (Exception e) { + e.printStackTrace(); + }finally{ + DatabaseUtil.closeResultSetAndStatement(rs); + } + return list; + } } Index: ssts-web/src/main/webapp/jasperRtp/sterilizationEffectMonitorReport.jrxml =================================================================== diff -u --- ssts-web/src/main/webapp/jasperRtp/sterilizationEffectMonitorReport.jrxml (revision 0) +++ ssts-web/src/main/webapp/jasperRtp/sterilizationEffectMonitorReport.jrxml (revision 27180) @@ -0,0 +1,375 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <band height="30" splitType="Stretch"> + <textField> + <reportElement uuid="4dd1a765-4207-4079-8cf6-8b2dc4d91f3b" x="0" y="0" width="1634" 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/disinfectsystem/reportforms/sterilizationEffectMonitorView.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationEffectMonitorView.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationEffectMonitorView.js (revision 27180) @@ -0,0 +1,268 @@ +var entityName = "灭菌效果监测结果报表"; +var form; + +/** + * 加载报表的数据 + * + */ +var myMask; +var ALL = '全部'; +function reloadReport(){ + if (!form.getForm().isValid()) { + showResult('请正确填写表单各值'); + return false; + } + + var startTime= $Id('startTime').value; + var endTime = $Id('endTime').value; + var sterilizerName = Ext.getCmp('sterilizerName').getValue(); + if(sterilizerName.indexOf(ALL) == 0){ + sterilizerName = ""; + } + var sterilizerNameGroup = Ext.getCmp('sterilizerNameGroup').getValue(); + var frequency = Ext.getCmp('frequency').getValue(); + myMask = new Ext.LoadMask(Ext.getBody(), { + msg: '正在查询中...，请稍候！', + removeMask: true + }); + myMask.show(); + document.getElementById('startDayHidden').value = startTime; + document.getElementById('endDayHidden').value = endTime; + document.getElementById('sterilizerNameHidden').value = sterilizerName; + document.getElementById('sterilizerNameGroupHidden').value = sterilizerNameGroup; + document.getElementById('formReport').action = "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do" + + "?jasperreportName=sterilizationEffectMonitorReport.jasper&reportName=sterilizationEffectMonitorReport&frequency="+frequency; + document.getElementById('formReport').submit(); +} + + +Ext.onReady(function() { + Ext.QuickTips.init(); + var needAll = '是'; + //灭菌炉分组 + var sterilizerNameGroupJsonStore = new Ext.data.Store({ + proxy : new Ext.data.HttpProxy({ + url : WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do', + method : 'POST' + }), + baseParams : {optionId : "sterilerGroup"}, + reader : new Ext.data.JsonReader({ + root : 'data' + },[ + {name : 'sterilizerNameGroup', mapping : 'value'} + ] + ) + }); + var dt = new Date(); + var startDayofMonth = dt.getFullYear() + "/" + (dt.getMonth() + 1) + "/01"; + + form = new Ext.form.FormPanel({ + title : entityName, + region : 'north', + labelAlign : 'right', + buttonAlign : 'center', + collapsible : true, + collapseMode : 'mini', + split : true, + border : 0, + frame : true, + bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px; + height : 105, + items : [{ + layout : 'column', + items : [{ + width : 200, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'datefield', + fieldLabel : '开始时间', + id : 'startTime', + name : 'startTime', + editable : false, + format : 'Y-m-d', + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + allowBlank : false, + anchor : '95%', + value:new Date(startDayofMonth), + listeners : { + specialkey : function(field, e) { + if (e.getKey() == Ext.EventObject.ENTER) { + var isOK = field.validate(); + if(isOK){ + var value = field.getValue(); + field.setValue(value); + var endTime = Ext.getCmp('endTime'); + endTime.setValue(''); + endTime.focus(); + } + + } + } + } + }] + },{ + width : 200, + layout : 'form', + labelWidth : 60, + items : [{ + xtype : 'datefield', + fieldLabel : '结束时间', + id : 'endTime', + name : 'endTime', + editable : false, + format : 'Y-m-d', + altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j', + allowBlank : false, + anchor : '95%', + value:new Date(), + listeners : { + specialkey : function(field, e) { + if (e.getKey() == Ext.EventObject.ENTER) { + var isOK = field.validate(); + if(isOK){ + var value = field.getValue(); + field.setValue(value); + } + + } + } + } + }] + },{ + width : 230, + layout : 'form', + labelWidth : 70, + items : [{ + xtype : 'combo', + fieldLabel : '灭菌炉分组', + valueField : 'sterilizerNameGroup', + displayField : 'sterilizerNameGroup', + triggerAction : 'all', + forceSelection : false, + lazyInit : false, + editable : true, + hideTrigger : false, + typeAhead : false, + allowBlank : true, + name : "sterilizerNameGroup", + id : "sterilizerNameGroup", + anchor : '95%', + store : sterilizerNameGroupJsonStore + }] + },{ + width : 300, + layout : 'form', + labelWidth : 50, + items : [{ + xtype : 'multiSelect', + fieldLabel : "灭菌炉", + valueField : 'sterilizerName', + displayField : 'sterilizerName', + store : new Ext.data.SimpleStore({ + fields : [ 'sterilizerName' ], + url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?', + listeners : { + beforeload : function(_this, options) { + _this.baseParams.needAll = '是'; + _this.baseParams.needFilter = false; + } + } + }), + listeners: { + select: function (combo, record, index) { + if (record.get('sterilizerName') == ALL) { + if (record.get('checked')) { + combo.selectAll(); + } else { + combo.deselectAll(); + } + } + var selectAll = true; + combo.store.each(function(record) { + if (record.get('sterilizerName') != ALL && !record.get(this.checkField)) { + selectAll = false; + return; + } + }, combo); + + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + combo.setValue(combo.getCheckedValue()); + } + }, + triggerAction : 'all', + forceSelection : false, + lazyInit : false, + editable : false, + hideTrigger : false, + typeAhead : false, + allowBlank : true, + name : "sterilizerName", + id : "sterilizerName", + anchor : '95%' + }] + },{ + layout:'form', + width : 100, + labelWidth : 40, + items:[{ + xtype : 'textfield', + id : 'frequency', + name : 'frequency', + fieldLabel : '炉次', + regex: /^\d+$/, + regexText:"只能够输入数字", + anchor : '95%', + allowBlank : true + }] + }] + }], + buttons:[{ + xtype : 'button', + text : '查询', + minWidth : 70, + iconCls : 'icon_search', + handler : function() { + reloadReport(); + } + },{ + xtype : 'button', + text : '重置', + minWidth : 70, + iconCls : 'icon_set', + handler : function() { + $Id('startTime').value = ""; + $Id('endTime').value = ""; + $Id('sterilizerName').value = ""; + $Id('frequency').value = ""; + $Id('sterilizerNameGroup').value = ""; + } + }] + }); + + + var reportForm = new Ext.Panel({ + frame:false, + autoScroll:true, + collapsible:true, + bodyPadding:5, + html:'' + + }); + + var viewport = new Ext.Viewport({ + layout : 'border', + items : [form, { + region : 'center', + margins : '0 0 0 0', + layout : 'fit', + items : reportForm + }] + }); + reloadReport(); +}); \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js =================================================================== diff -u -r27017 -r27180 --- ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 27017) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsykzx/config.js (.../config.js) (revision 27180) @@ -111,5 +111,7 @@ //使用设备接口 disableDeviceInterface:false, //启用生物阅读器配置 - enableBioreaderInterface: true + enableBioreaderInterface: true, + //是否启用灭菌效果监测报表 + enableSterilizationEffectMonitorReport : true } \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/menu.jsp =================================================================== diff -u -r27127 -r27180 --- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27127) +++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 27180) @@ -261,7 +261,7 @@ * 《消毒供应中心质量监测报表》菜单 */ var SSTS_QualityMonitoring_Menu_1 = true; - + if (!notInWhiteList(sstsConfig, 'qualityMonitoringRelatedReports')) { SSTS_QualityMonitoring_Menu_1 = false; } @@ -405,6 +405,16 @@ /** + * 《灭菌效果监测结果报表》权限 + */ +var SSTS_SterilizationEffectMonitorReport = true; +if (!notInWhiteList(sstsConfig, 'enableSterilizationEffectMonitorReport')) { + + SSTS_SterilizationEffectMonitorReport = false; + +} + +/** * 《清洗情况报表》权限 */ var SSTS_WashAndDisinfectRecordInfoReport = true; Index: ssts-web/src/main/webapp/jasperRtp/sterilizationEffectMonitorReport.jasper =================================================================== diff -u Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java =================================================================== diff -u -r27157 -r27180 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 27157) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java (.../JasperReportManager.java) (revision 27180) @@ -57,6 +57,7 @@ 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.SterilizationEffectMonitorReportVo; import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizationOmitReportBean; import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove; import com.forgon.disinfectsystem.jasperreports.javabeansource.SterilizingStove_child; @@ -931,5 +932,15 @@ */ public List getMonthReportDataGroupBySterilizationMode(String startDate,String endDate, String department,String tousseType,String disposableGoodsType,Boolean showCustonTousseAmount); + /** + * 获取灭菌效果监测结果报表数据 + * @param startDay 灭菌开始时间 + * @param endDay 灭菌结束时间 + * @param sterilizerName 灭菌炉名称 + * @param frequency 炉次 + * @param sterilizerNameGroup 灭菌炉分组 + * @return + */ + public List getSterilizationEffectMonitorReportData(String startDay,String endDay,String sterilizerName, int frequency, String sterilizerNameGroup); } Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationEffectMonitorView.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationEffectMonitorView.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationEffectMonitorView.jsp (revision 27180) @@ -0,0 +1,42 @@ +<%@page contentType="text/html; charset=UTF-8"%> +<%@include file="/common/taglibs.jsp"%> +<%@include file="/common/includeExtJsAndCss.jsp"%> + + + + + + + + + + + + + + + + + +灭菌效果监测结果报表 + + + + + + + +
+
+
+ +
+ + + + + sterilizerNameGroup +
+ + \ No newline at end of file