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<InventoryProductReportSearchParam> 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<InventoryProductReportPageDto> 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<InventoryProductReportSearchParam> 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<InventoryProductReportPageDto> 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<InventoryProductReportPageDto> selectProductReportPage(@Param("page") Page<InventoryProductReportPageDto> page,
         @Param(Constants.WRAPPER) QueryWrapper<InventoryProductReportSearchParam> 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}
+            <if test="inventoryScope != null">
+                <choose>
+                    <when test="inventoryScope == 2">
+                        AND item_quantity = 0
+                    </when>
+                    <when test="inventoryScope == 3">
+                        AND item_quantity > 0
+                    </when>
+                    <when test="inventoryScope == 4">
+                        AND item_quantity <![CDATA[ <= ]]> 20
+                    </when>
+                    <when test="inventoryScope == 5">
+                        AND item_quantity <![CDATA[ <= ]]> 50
+                    </when>
+                </choose>
+            </if>
     </select>
 </mapper>