Index: ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js =================================================================== diff -u -r26365 -r26426 --- ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 26365) +++ ssts-web/src/main/webapp/disinfectsystem/config/xjjqzyy/config.js (.../config.js) (revision 26426) @@ -224,5 +224,6 @@ //是否禁用科室同步 hiddenOrgunitSyncButton:true, //是否禁用人员同步 - hiddenUserSyncButton:true + hiddenUserSyncButton:true, + recyclingStatusOfIdCardBarcode : "已使用,已废弃" } \ No newline at end of file Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r26410 -r26426 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 26410) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 26426) @@ -2748,6 +2748,13 @@ throw new RecyclingRecordException(String.format("条码为%s的标识牌实例已被删除!", idCardBarcode)); } idCardTousseInstance = IDCardInstanceUtils.getLastOperatedTousseInstance(objectDao, idCardInstance); + String recyclingStatusOfIdCardBarcode = CssdUtils.getSystemSetConfigByName("recyclingStatusOfIdCardBarcode"); + if(StringUtils.isNotBlank(recyclingStatusOfIdCardBarcode) + && idCardTousseInstance != null){//有标识牌的,只回收状态为配置的状态 + if(StringUtils.isBlank(idCardTousseInstance.getStatus()) || recyclingStatusOfIdCardBarcode.indexOf(idCardTousseInstance.getStatus()) == -1){ + throw new RecyclingRecordException("该器械包未录入病人使用记录,不能回收"); + } + } } //已装配