Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jasper =================================================================== diff -u -r15409 -r15424 Binary files differ Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r15409 -r15424 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15409) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 15424) @@ -1113,7 +1113,7 @@ tousseInstance.setSterileFrequency(sterilizationRecord.getFrequency()+""); //(cjr) tousseInstance.setSterilizationUser(sterilizationRecord.getSterilizationUser()); tousseInstance.setSterilizerName(sterilizationRecord.getSterilizerName()); - tousseInstance.setSterileStartTime(TousseInstanceUtils.buildSterileStartTime(new Date())); + tousseInstance.setSterileStartTime(TousseInstanceUtils.buildSterileStartTime(sterilizationRecord.getStartDate())); tousseInstanceManager.saveOrUpdate(tousseInstance); } Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java =================================================================== diff -u -r15377 -r15424 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java (.../ForeignTousseSterilizationMonitorAndDeliveryVO.java) (revision 15377) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/javabeansource/ForeignTousseSterilizationMonitorAndDeliveryVO.java (.../ForeignTousseSterilizationMonitorAndDeliveryVO.java) (revision 15424) @@ -2,6 +2,11 @@ import java.util.Date; +/** + * 2016-10-18 + * @author Chenjiaru + * + */ public class ForeignTousseSterilizationMonitorAndDeliveryVO { Index: ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml =================================================================== diff -u -r15409 -r15424 --- ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml (.../sterilizationRecordReport.jrxml) (revision 15409) +++ ssts-web/src/main/webapp/jasperRtp/sterilizationRecordReport.jrxml (.../sterilizationRecordReport.jrxml) (revision 15424) @@ -1,8 +1,8 @@ - - - + + +