Index: ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jrxml =================================================================== diff -u -r25743 -r25748 --- ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jrxml (.../biologicalMonitoringReport.jrxml) (revision 25743) +++ ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jrxml (.../biologicalMonitoringReport.jrxml) (revision 25748) @@ -54,8 +54,8 @@ - - + + @@ -214,7 +214,7 @@ - + Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java =================================================================== diff -u -r25743 -r25748 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25743) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java (.../JasperReportManagerImpl.java) (revision 25748) @@ -16309,7 +16309,7 @@ List list = null; ResultSet rs = null; try { - String querySql = "select s.name, sr.frequency,sr.sterilizationType,sr.sterilizationUser,sr.monitorUser,sr.monitorAuditor,sr.biologyResult,sr.biologicalMonitoringStartDate,sr.biologicalMonitoringEndDate from "+ SterilizationRecord.class.getSimpleName() +" sr " + String querySql = "select s.name, sr.frequency,sr.sterilizationType,sr.sterilizationUser,sr.monitorUser,sr.monitorChecker,sr.biologyResult,sr.biologicalMonitoringStartDate,sr.biologicalMonitoringEndDate from "+ SterilizationRecord.class.getSimpleName() +" sr " + " join "+ Sterilizer.class.getSimpleName() +" s on sr.sterilizer_id = s.id " + " where " + dateQueryAdapter.dateAreaSql("sr.biologicalMonitoringStartDate", startDay + " 00:00:00", endDay + " 23:59:59") + SqlUtils.get_InSql_Extra("s.name", sterilizerNamesHidden); @@ -16334,7 +16334,7 @@ } item.setBiologyResult(biologyResult); item.setFrequency(rs.getString("frequency")); - item.setMonitorAuditor(rs.getString("monitorAuditor")); + item.setMonitorChecker(rs.getString("monitorChecker")); item.setMonitorUser(rs.getString("monitorUser")); item.setSterilizationType(rs.getString("sterilizationType")); item.setSterilizationUser(rs.getString("sterilizationUser")); Index: ssts-web/src/main/webapp/jasperRtp/biologicalMonitoringReport.jasper =================================================================== diff -u -r25743 -r25748 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/BiologicalMonitoringReportVo.java =================================================================== diff -u -r25743 -r25748 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/BiologicalMonitoringReportVo.java (.../BiologicalMonitoringReportVo.java) (revision 25743) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/BiologicalMonitoringReportVo.java (.../BiologicalMonitoringReportVo.java) (revision 25748) @@ -31,9 +31,9 @@ */ private String monitorUser; /** - * 审核员 + * 审核员(监测核对员) */ - private String monitorAuditor; + private String monitorChecker; /** * 监测结果 */ @@ -83,11 +83,11 @@ public void setMonitorUser(String monitorUser) { this.monitorUser = monitorUser; } - public String getMonitorAuditor() { - return monitorAuditor; + public String getMonitorChecker() { + return monitorChecker; } - public void setMonitorAuditor(String monitorAuditor) { - this.monitorAuditor = monitorAuditor; + public void setMonitorChecker(String monitorChecker) { + this.monitorChecker = monitorChecker; } public String getBiologyResult() { return biologyResult;