Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16092 -r16095 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16092) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16095) @@ -2151,16 +2151,18 @@ } } appLogManager.saveLog(AcegiHelper.getLoginUser(), "灭菌干预", Log.TYPE_ADD,"灭菌记录id:" - + sr.getId() + ",干预前信息:" + sr.getSterilizerName() + ",startDate: " + - sdf.format(sr.getStartDate()) + ", endDate:" + sdf.format(sr.getEndDate()) + + sr.getId() + ",干预前信息:" + sr.getSterilizerName() + + ",startDate: " + (sr.getStartDate() == null ? "":sdf.format(sr.getStartDate())) + + ", endDate:" + (sr.getEndDate() == null ? "":sdf.format(sr.getEndDate())) + ",status : " + sr.getStatus() + ", purpose : " + sr.getSterilizationPurpose() + ",frequency : " + sr.getFrequency() ); // 保存灭菌记录信息 + Sterilizer sterilizer = sterilizerManager.getSterilizerByName(sterilizationName); sr.setStartDate(sdf.parse(startDate)); sr.setEndDate(sdf.parse(endDate)); - sr.setSterilizerName(sterilizationName); + sr.setSterilizer(sterilizer); sr.setStatus(status); sr.setSterilizationPurpose(sterilizationPurpose); sr.setSterilizationType(sterilizationMethod);