diff --git a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java index e1de1c7..08477c5 100644 --- a/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java +++ b/nursing-unit-invoicing/nu-invoicing-biz/src/main/java/com/nu/modules/cgd/service/impl/NuInvoicingCgdMainServiceImpl.java @@ -169,6 +169,9 @@ public class NuInvoicingCgdMainServiceImpl extends ServiceImpl customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(warehouseMaterialInfo, req.getParameterMap(), customeRuleMap); queryWrapper.apply(StringUtils.isNotBlank(warehouseMaterialInfo.getWlParamInfo()),"( material_name like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or material_no like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or pinyin like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' or specification_model like '%"+warehouseMaterialInfo.getWlParamInfo()+"%' ) "); + queryWrapper.eq(StringUtils.isNotBlank(warehouseMaterialInfo.getCategoryId()),"category_id",warehouseMaterialInfo.getCategoryId()); + queryWrapper.eq(StringUtils.isNotBlank(warehouseMaterialInfo.getTypeId()),"type_id",warehouseMaterialInfo.getTypeId()); + queryWrapper.eq(StringUtils.isNotBlank(warehouseMaterialInfo.getMedicationId()),"medication_id",warehouseMaterialInfo.getMedicationId()); Page page = new Page<>(pageNo, pageSize); List list = warehouseMaterialInfoMapper.selectList(page,queryWrapper); IPage entityPage = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());