Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java =================================================================== diff -u -r28936 -r28939 --- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 28936) +++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java (.../InvoiceManagerImpl.java) (revision 28939) @@ -11338,8 +11338,8 @@ //只查询所属回收/申请科室为对应科室的包实例(ZSYY-265 辅助发货功能改造、DGZYY-155 辅助发货查询数据过多会超时没有显示) if(StringUtils.equalsIgnoreCase(invoiceGroupByConfig, "settleAccountsDepartCoding")){ tousseInstanceSql.append(" and po.settleAccountsDepartCoding = '"+ departCode +"' "); - }else{ - tousseInstanceSql.append(" and (po.departCoding is null or po.departCoding='' or po.departCoding = '"+ departCode +"') "); + }else{//限制发货科室为是,发货科室必须为空或者是收货科室 + tousseInstanceSql.append(" and (limitInvoiceDepart='否' or (po.departCoding is null or po.departCoding='' or po.departCoding = '"+ departCode +"')) "); } //只查询包定义的"隐藏辅助发货"不为"是"的包实例(ZSYY-265 辅助发货功能改造)