Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java =================================================================== diff -u -r23904 -r23913 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 23904) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java (.../ExpensiveGoodsApplicationManagerImpl.java) (revision 23913) @@ -431,9 +431,9 @@ Set formIds = apps.stream().map(p->p.getId()).collect(Collectors.toSet()); Map> mapVos = workFlowApprovalTaskManager.getForPrint(formIds); String instanceSql = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("invoicePlanId", formIds); - //simon-delete:针对于需求注释此行代码:高值耗材已入库即可打印申请单。 + //simon-add:增加判断条件,如果已入库即可打印高值耗材,那么不需要增加“useRecord is not null”过滤条件 if(!CssdUtils.getSystemSetConfigByNameBool("isPrintExpensiveGoodsApplicationByStatus",false)){ - instanceSql = String.format("%s and useRecord is not null and status='"+ ExpensiveGoodsGodownEntry.TYPE_IN +"'", instanceSql);//获取已使用高值耗材实例 + instanceSql = String.format("%s and useRecord is not null", instanceSql);//获取已使用高值耗材实例 } List instances = expensiveGoodsInstanceManager.getByHql(instanceSql); Map> invoicePlanUseedExpensiveGoods = new HashMap<>();