Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java =================================================================== diff -u -r34610 -r34717 --- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34610) +++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java (.../WashAndDisinfectRecordManagerImpl.java) (revision 34717) @@ -1465,7 +1465,7 @@ boolean exist = validateWashIsEnd(disinfectIdentification, washRecord.getStartDate(), washRecord.getEndDate()); - if (exist && washRecord.getId() == 0) { + if (exist && !DatabaseUtil.isPoIdValid(washRecord.getId())) { throw new RuntimeException(disinfectIdentification + "正在清洗,不能添加清洗记录。"); } else { saveOrUpdateWashAndDisinfectRecordAndMaterials( @@ -3013,7 +3013,7 @@ if(Rinser.CONCURRENT_DISABLE.equals(rinser.getConCurrent())){ boolean exist = validateWashIsEnd(disinfectIdentification, washRecord.getStartDate(), washRecord.getEndDate()); - if(exist && washRecord.getId() == null ){ + if(exist && !DatabaseUtil.isPoIdValid(washRecord.getId())){ return JSONUtil.buildErrorMsgJsonResult(disinfectIdentification+" 正在清洗,不能添加清洗记录。"); } }