Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r36341 -r36368 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 36341) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 36368) @@ -4306,8 +4306,9 @@ for (TousseInstance tousseInstance : allTousseInstancesOfSterile) { // 如果记录是灭菌完成,包状态却不是已灭菌,说明包状态有改动,不允许干预 if(SterilizationRecord.STERILIZATION_STATUS_END.equals(sr.getStatus())){ - if(!TousseInstance.STATUS_STERILED.equals(tousseInstance.getStatus())){ - String msg = "干预失败,器械包:" + tousseInstance.getTousseName() + "," + tousseInstance.getBarcode() + " 不是已灭菌."; + if(!TousseInstance.STATUS_STERILED.equals(tousseInstance.getStatus()) + && !TousseInstance.STATUS_DELAY_CONFIRM.equals(tousseInstance.getStatus())){ + String msg = "干预失败,器械包:" + tousseInstance.getTousseName() + "," + tousseInstance.getBarcode() + " 不是已灭菌或"+ TousseInstance.STATUS_DELAY_CONFIRM +"."; return JSONUtil.buildJsonObject(false, msg); } } @@ -4335,7 +4336,7 @@ statusSet.add(tousseInstance.getStatus()); } if(statusSet.size() > 1){ - String msg = "不能修改此灭菌记录的灭菌状态,因为不满足如下修改要求:该炉所有包的状态均相同,并且为已灭菌、已审核、灭菌中的状态之一!"; + String msg = "不能修改此灭菌记录的灭菌状态,因为不满足如下修改要求:该炉所有包的状态均相同,并且为已灭菌、已审核、灭菌中、"+ TousseInstance.STATUS_DELAY_CONFIRM +"的状态之一!"; return JSONUtil.buildJsonObject(false, msg); } String orgUnitCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();