Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r23469 -r23517 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23469) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 23517) @@ -2866,8 +2866,8 @@ for (RecyclingBasketItemVo json : itemJsonList) { Long tousseDefinitionID = json.getTousseDefinitionID(); TousseDefinition tousseDefinition = getTousseDefinition(tousseDefinitions, tousseDefinitionID); - if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseDefinition.getTousseType())){ - if(TousseDefinition.STR_YES.equals(tousseDefinition.getIsPacking())){ + if(tousseDefinition.isDisinfection()){ + if(tousseDefinition.needPacking()){ throw new RuntimeException("非临床科室回收单不允许添加消毒物品!"); } }