Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r38364 -r38572 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 38364) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 38572) @@ -657,6 +657,9 @@ tousseInstance.setWashOperatorCode(washRecord.getOperatorCode()); tousseInstance.setWashStartTime(washRecord.getStartDateStr()); tousseInstance.setWashEndTime(washRecord.getEndDateStr()); + if(tousseInstance.getOperationTime() == null){ + tousseInstance.setStatus(washRecord.getWashStatus()); + } if(StringUtils.isBlank(tousseInstance.getRecyclingOperator()) || StringUtils.isBlank(tousseInstance.getRecyclingUser())){ RecyclingRecord recyclingRecord = tousseInstance.getRecyclingRecord(objectDao); @@ -1867,6 +1870,9 @@ tousseInstance.setWashOperatorCode(null); tousseInstance.setWashStartTime(null); tousseInstance.setWashEndTime(null); + if(tousseInstance.getOperationTime() == null){ + tousseInstance.setStatus(null); + } objectDao.saveOrUpdate(tousseInstance); } }