From 556c9f3a1125dfe4a26224a6767b3f12c0a76465 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 16 Oct 2025 14:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cgd/service/impl/NuInvoicingCgdMainServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) 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());