Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jasper =================================================================== diff -u -r38250 -r38278 Binary files differ Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java =================================================================== diff -u -r38277 -r38278 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java (.../ForeignTousseReportHelper.java) (revision 38277) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/ForeignTousseReportHelper.java (.../ForeignTousseReportHelper.java) (revision 38278) @@ -395,7 +395,7 @@ vo.setReturneeOfSupplier(StringTools.defaultString(result.getString("returneeOfSupplier"))); } if(queryReturnMan){ - vo.setReceiveMan(StringTools.defaultString(result.getString("returnMan"))); + vo.setReturnMan(StringTools.defaultString(result.getString("returnMan"))); } if(queryCompleteness){ String completeness = result.getString("completeness"); Index: ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml =================================================================== diff -u -r38250 -r38278 --- ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml (.../foreignTousseAfterUseDelivery.jrxml) (revision 38250) +++ ssts-web/src/main/webapp/jasperRtp/foreignTousseAfterUseDelivery.jrxml (.../foreignTousseAfterUseDelivery.jrxml) (revision 38278) @@ -10,7 +10,7 @@ - + @@ -253,7 +253,7 @@ - + Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java =================================================================== diff -u -r38249 -r38278 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java (.../ForeignTousseAfterUseDeliveryVO.java) (revision 38249) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseAfterUseDeliveryVO.java (.../ForeignTousseAfterUseDeliveryVO.java) (revision 38278) @@ -31,11 +31,11 @@ */ private String washAndDisinfectUser; /** - * 接收人 + * 供应室归还人 CSSD交接者 */ - private String receiveMan; + private String returnMan; /** - * 厂家归还人 + * 厂家归还人 器械公司交接者 */ private String returneeOfSupplier; /** @@ -73,13 +73,13 @@ public void setWashAndDisinfectUser(String washAndDisinfectUser) { this.washAndDisinfectUser = washAndDisinfectUser; } - - public String getReceiveMan() { - return receiveMan; + + public String getReturnMan() { + return returnMan; } - public void setReceiveMan(String receiveMan) { - this.receiveMan = receiveMan; + public void setReturnMan(String returnMan) { + this.returnMan = returnMan; } public String getReturneeOfSupplier() {