Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r32644 -r32645 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32644) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32645) @@ -2735,8 +2735,11 @@ if(updateTousseStatus.equals(tousse.getStatus())){ continue; } - if(!SterilizationRecord.STERILIZATION_STATUS_FAILURE.equals(type) && TousseInstance.STATUS_STERILED.equals(tousse.getStatus())){ - throw new RuntimeException("器械包" + tousse.getTousseName() + tousse.getBarcode() +"不为已审核或已灭菌,不能修改灭菌结果"); + if(!SterilizationRecord.STERILIZATION_STATUS_FAILURE.equals(type) + && !TousseInstance.STATUS_STERILED.equals(tousse.getStatus()) + && !TousseInstance.STATUS_STERILING.equals(tousse.getStatus()) + && !TousseInstance.STATUS_REVIEWED.equals(tousse.getStatus())){ + throw new RuntimeException("器械包" + tousse.getTousseName() + tousse.getBarcode() +"不为已审核或已灭菌或灭菌中,不能修改灭菌结果"); } tousse.setStatus(updateTousseStatus); //如果是聚合包,则将该聚合包下属的普通器械包实例也相应赋值