Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r36562 -r36577 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 36562) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 36577) @@ -3659,20 +3659,17 @@ // 设置回收记录的状态 record.setStatus(RecyclingRecord.STATUS_SAVED); boolean materialsLost = record.isMaterialsLost();// 是否有丢失材料 - boolean tousseMaterialsLost = record.isTousseMaterialsLost();// 是否有丢失器械材料 - boolean idCardLost = record.isIDCardLost();// 是否有丢失标识牌 - boolean tousseMaterialsLostMustConfirm = CssdUtils.getSystemSetConfigByNameBool("tousseMaterialsLostMustConfirm",true); boolean confirmed = false; if(materialsLost){ - if(tousseMaterialsLost){ - if(tousseMaterialsLostMustConfirm){ + if(record.isTousseMaterialsLost()){// 是否有丢失器械材料 + if(CssdUtils.getSystemSetConfigByNameBool("tousseMaterialsLostMustConfirm",true)){ record.setStatus(RecyclingRecord.STATUS_UNCONFIRMED); }else{ // 配置为不需要确认 record.setStatus(RecyclingRecord.STATUS_CONFIRMED); confirmed = true; } - }else if(idCardLost){ + }else if(record.isIDCardLost()){// 是否有丢失标识牌 // 标识牌丢失不需要确认 record.setStatus(RecyclingRecord.STATUS_CONFIRMED); confirmed = true;