Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r16052 -r16064 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16052) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 16064) @@ -1265,11 +1265,13 @@ // sterilizationRecord.setEndDate(new Date()); } - // 对应将器械包状态改回原来的状态(已审核状态) + // 对应将器械包状态改回原来的状态(已审核状态),如果没有废弃的话 List tousseList = sterilizationRecord .getTousseInstanceList(); for (TousseInstance tousse : tousseList) { - tousse.setStatus(TousseInstance.STATUS_REVIEWED); + if(tousse != null && !tousse.isDiscarded()){ + tousse.setStatus(TousseInstance.STATUS_REVIEWED); + } } List basketList = sterilizationRecord .getReviewedBaskets(); @@ -1280,7 +1282,9 @@ .setStatus(Container.CONTAINER_STATUS_STERILIZELOADING); // basket.setSterilizationRecords(null); for (TousseInstance tousse : basket.getTousseInstances(objectDao)) { - tousse.setStatus(TousseInstance.STATUS_REVIEWED); + if(tousse != null && !tousse.isDiscarded()){ + tousse.setStatus(TousseInstance.STATUS_REVIEWED); + } } } saveOrUpdate(sterilizationRecord);