Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r38934 -r38935 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 38934) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 38935) @@ -8255,6 +8255,8 @@ whereSql += " and po.recyclingStatus in('" + StringUtils.join(recycleStatus, "','") + "')"; boolean enableThirdPartySystemApplyUnnamedForeignTousse = CssdUtils.getSystemSetConfigByNameBool("enableThirdPartySystemApplyUnnamedForeignTousse", false); //外来器械申请单需要细到单里的包,有待接收和待二次回收时才显示 + //enableThirdPartySystemApplyUnnamedForeignTousse SZSZYY-34中如果存在特殊的空包ForeignTousseSupplierItem 即使不存在符合回收的TousseItem,也需要显示 + //后续如果需要优化 可考虑使用只查询近期的待回收申请功能 或 找or exists (select 1 from ForeignTousseSupplierItem fi where fi.invoicePlanId=po.id)的替代 if(enableThirdPartySystemApplyUnnamedForeignTousse){ whereSql += " and (po.type<>'" + InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION