Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r17903 -r17971 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17903) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 17971) @@ -968,9 +968,15 @@ boolean materialsLost = record.isMaterialsLost();// 是否有丢失材料 boolean tousseMaterialsLost = record.isTousseMaterialsLost();// 是否有丢失器械材料 boolean idCardLost = record.isIDCardLost();// 是否有丢失标识牌 + boolean tousseMaterialsLostMustConfirm = CssdUtils.getSystemSetConfigByNameBool("tousseMaterialsLostMustConfirm",true); if(materialsLost){ if(tousseMaterialsLost){ - record.setStatus(RecyclingRecord.STATUS_UNCONFIRMED); + if(tousseMaterialsLostMustConfirm){ + record.setStatus(RecyclingRecord.STATUS_UNCONFIRMED); + }else{ + // 配置为不需要确认 + record.setStatus(RecyclingRecord.STATUS_CONFIRMED); + } }else if(idCardLost){ // 标识牌丢失不需要确认 record.setStatus(RecyclingRecord.STATUS_CONFIRMED); Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js =================================================================== diff -u -r17968 -r17971 --- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 17968) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js (.../config.js) (revision 17971) @@ -105,5 +105,7 @@ //使用记录转申请单合并后的备注信息(如手术台数:** 器械数量:**) useRecordMergeConvertRecyclingApplicationRemark : '手术台数:@operationAmount;器械包数量:@tousseAmount', //已经预回收的,回收数量为0的物品,在回收的时候是否隐藏.为true则隐藏,为false则不隐藏,默认为false - hideZeroPrerecycleAmountTousseItem:true + hideZeroPrerecycleAmountTousseItem:true, + //器械包有材料丢失,是否必须确认。默认值为true,表示必须确认。false表示不用确认,此时保存后,历史回收记录的状态就是已确认(这就跟标识牌丢失一样,不用再次确认) + tousseMaterialsLostMustConfirm:false } \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java =================================================================== diff -u -r17962 -r17971 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 17962) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/common/CssdUtils.java (.../CssdUtils.java) (revision 17971) @@ -279,6 +279,20 @@ } return ret; } + /** + * 根据key获取config.js的配置 + * @param key 属性名 + * @param defValue 默认值。如果没有找到对应的属性配置,则使用此默认值 + * @return 如果有配置,则返回配置的值,如果未配置,则返回默认值 + */ + public static boolean getSystemSetConfigByNameBool(String key,boolean defValue){ + Boolean ret = defValue; // 默认返回false + String value = getSystemSetConfigByName(key); + if(StringUtils.isNotBlank(value)){ + ret = Boolean.valueOf(value); + } + return ret; + } /** * 根据key与value对config.js的进行设值