Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java =================================================================== diff -u -r32773 -r32779 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32773) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java (.../SterilizationRecordManagerImpl.java) (revision 32779) @@ -3699,6 +3699,12 @@ return JSONUtil.buildJsonObject(false, "干预失败,该灭菌记录的灭菌炉正在灭菌."); } } + if(!sr.getStatus().equals(status)){ + boolean enableTheSterilizationResultJudgmentFunction = CssdUtils.getSystemSetConfigByNameBool("enableTheSterilizationResultJudgmentFunction", false); + if(enableTheSterilizationResultJudgmentFunction && SterilizationRecord.STERILIZATION_STATUS_INTERRUPT.equals(sr.getStatus()) && (SterilizationRecord.STERILIZATION_STATUS_BEGIN.equals(status) || SterilizationRecord.STERILIZATION_STATUS_END.equals(status)) && objectDao.countBySql(getOtherSterilizationRecordsSql(sr.getId())) > 0){ + throw new RuntimeException("此灭菌记录的器械包已在其他灭菌记录中灭菌,此不能干预为" + status +"!"); + } + } if(fre != null && fre <= 0){ return JSONUtil.buildJsonObject(false, "干预失败,炉号不能小于1."); }