From c086dc8c7787a8ed3f44426eb14f065add0e7706 Mon Sep 17 00:00:00 2001 From: wzk <2438381872@qq.com> Date: Tue, 11 Nov 2025 11:51:52 +0800 Subject: [PATCH] =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E3=80=8B=E9=99=A2=E5=86=85=E5=BA=93?= =?UTF-8?q?=E6=88=BF=E6=83=85=E5=86=B5=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8?= =?UTF-8?q?-=E3=80=8B=E5=BA=93=E5=AD=98=E5=95=86=E5=93=81=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E6=9F=A5=E8=AF=A2=E6=8A=A5=E8=A1=A8=EF=BC=8C=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=BA=93=E5=AD=98=E8=8C=83=E5=9B=B4=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=8A=A5=E9=94=99=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InventoryProductReportAppServiceImpl.java | 32 +++---------------- .../mapper/InventoryProductReportMapper.java | 4 ++- .../InventoryProductReportMapper.xml | 16 ++++++++++ 3 files changed, 23 insertions(+), 29 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java index d4580f86..c0e54f89 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/appservice/impl/InventoryProductReportAppServiceImpl.java @@ -81,22 +81,10 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inventoryProductReportSearchParam, searchKey, searchFields, request); - // 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5） - if (inventoryScope != null) { - if (inventoryScope.equals(2)) { - queryWrapper.eq("item_quantity", 0); - } else if (inventoryScope.equals(3)) { - queryWrapper.gt("item_quantity", 0); - } else if (inventoryScope.equals(4)) { - queryWrapper.le("item_quantity", 20); - } else if (inventoryScope.equals(5)) { - queryWrapper.le("item_quantity", 50); - } - } - // 查询库存商品明细分页列表 Page productReportPage = inventoryProductReportMapper.selectProductReportPage( - new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString()); + new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString(), + inventoryScope); productReportPage.getRecords().forEach(e -> { // 药品类型 @@ -135,22 +123,10 @@ public class InventoryProductReportAppServiceImpl implements IInventoryProductRe QueryWrapper queryWrapper = HisQueryUtils.buildQueryWrapper(inventoryProductReportSearchParam, searchKey, searchFields, request); - // 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5） - if (inventoryScope != null) { - if (inventoryScope.equals(2)) { - queryWrapper.eq("item_quantity", 0); - } else if (inventoryScope.equals(3)) { - queryWrapper.gt("item_quantity", 0); - } else if (inventoryScope.equals(4)) { - queryWrapper.le("item_quantity", 20); - } else if (inventoryScope.equals(5)) { - queryWrapper.le("item_quantity", 50); - } - } - // 查询库存商品明细分页列表 Page productReportPage = inventoryProductReportMapper.selectProductReportPage( - new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString()); + new Page<>(pageNo, pageSize), queryWrapper, ConditionCode.LOT_NUMBER_COST.getValue().toString(), + inventoryScope); productReportPage.getRecords().forEach(e -> { // 药品类型 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java index bcf1e808..a1c655fe 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/reportmanage/mapper/InventoryProductReportMapper.java @@ -27,9 +27,11 @@ public interface InventoryProductReportMapper { * @param page 分页 * @param queryWrapper 查询条件 * @param lotNumber 命中条件枚举类型：产品批号 + * @param inventoryScope 库存范围：无限制（1）、数量等于0（2）、数量大于0（3）、数量小于等于20（4）、数量小于等于50（5） * @return 库存商品明细 */ Page selectProductReportPage(@Param("page") Page page, @Param(Constants.WRAPPER) QueryWrapper queryWrapper, - @Param("lotNumber") String lotNumber); + @Param("lotNumber") String lotNumber, + @Param("inventoryScope") Integer inventoryScope); } diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml index a75f02db..51a5213b 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/reportmanage/InventoryProductReportMapper.xml @@ -139,5 +139,21 @@ WHERE T1.delete_flag = '0') AS T10 ) AS T ${ew.customSqlSegment} + + + + AND item_quantity = 0 + + + AND item_quantity > 0 + + + AND item_quantity 20 + + + AND item_quantity 50 + + +