Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java =================================================================== diff -u -r28029 -r28035 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 28029) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java (.../RecyclingApplicationAction.java) (revision 28035) @@ -613,10 +613,10 @@ if(!tousseTypesForTousseItem.contains(TousseDefinition.PACKAGE_TYPE_INSIDE) && !tousseTypesForTousseItem.contains(TousseDefinition.PACKAGE_TYPE_DISINFECTION) && !tousseTypesForTousseItem.contains(TousseDefinition.PACKAGE_TYPE_DRESSING)){ - return JSONUtil.buildJsonObject(false, "器械包申请单必须申请器械包、消毒物品、敷料包中的其中至少一种类型物品"); + return JSONUtil.buildJsonObject(false, recyclingApplication.getType() + "必须申请器械包、消毒物品、敷料包中的其中至少一种类型物品"); } if(tousseTypesForTousseItem.contains(DisposableGoods.TYPE_NAME)){ - return JSONUtil.buildJsonObject(false, "器械包申请单不能申请一次性物品"); + return JSONUtil.buildJsonObject(false, recyclingApplication.getType() + "不能申请一次性物品"); } }else if(recyclingApplication.isDisinfectGoodsAppliaction()){ //2.消毒物品申请单必须有且只有消毒物品,不允许有其它类型的物品