diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
index 1390a86f..74f599e1 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inventorymanage/appservice/impl/ProductDetailAppServiceImpl.java
@@ -86,7 +86,7 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         List<String> medCategoryCodes = productDetailSearchParam.getMedCategoryCodes();
         // 药品类型
         List<String> devCategoryCodes = productDetailSearchParam.getDevCategoryCodes();
-        // 库存是否为零
+        // 库存范围
         Integer zeroFlag = productDetailSearchParam.getZeroFlag();
         // 过期天数
         Integer remainingDays = productDetailSearchParam.getRemainingDays();
@@ -108,12 +108,29 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
             queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
         }
-        // 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
+        // 库存范围筛选 (zeroFlag: 1=无限制, 2=数量等于0, 3=数量大于0, 4=数量<=20, 5=数量<=50)
         if (zeroFlag != null) {
-            if (Integer.valueOf(1).equals(zeroFlag)) {
-                queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
-            } else {
-                queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+            switch (zeroFlag) {
+                case 2:
+                    // 数量等于0
+                    queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 3:
+                    // 数量大于0
+                    queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 4:
+                    // 数量小于等于20
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("20"));
+                    break;
+                case 5:
+                    // 数量小于等于50
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("50"));
+                    break;
+                case 1:
+                default:
+                    // 无限制，不添加筛选条件
+                    break;
             }
         }
         // 所在位置
@@ -132,7 +149,6 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         Page<ProductDetailPageDto> productDetailsPage = productDetailsMapper.selectProductDetailsPage(
                 new Page<>(pageNo, pageSize), queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION, ConditionCode.LOT_NUMBER_COST.getCode());
-        // 库存明细
         List<ProductDetailPageDto> productDetailList = productDetailsPage.getRecords();
         if (productDetailList != null && !productDetailList.isEmpty()) {
             // 医嘱定价来源
@@ -259,12 +275,29 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
             queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
         }
-        // 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
+        // 库存范围筛选 (zeroFlag: 1=无限制, 2=数量等于0, 3=数量大于0, 4=数量<=20, 5=数量<=50)
         if (zeroFlag != null) {
-            if (Integer.valueOf(1).equals(zeroFlag)) {
-                queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
-            } else {
-                queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+            switch (zeroFlag) {
+                case 2:
+                    // 数量等于0
+                    queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 3:
+                    // 数量大于0
+                    queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 4:
+                    // 数量小于等于20
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("20"));
+                    break;
+                case 5:
+                    // 数量小于等于50
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("50"));
+                    break;
+                case 1:
+                default:
+                    // 无限制，不添加筛选条件
+                    break;
             }
         }
         // 所在位置
@@ -507,12 +540,29 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         if (devCategoryCodes != null && !devCategoryCodes.isEmpty()) {
             queryWrapper.in(CommonConstants.FieldName.DevCategoryCode, devCategoryCodes);
         }
-        // 库存是否为零 (zeroFlag: 1=库存为零, 0=库存大于零)
+        // 库存范围筛选 (zeroFlag: 1=无限制, 2=数量等于0, 3=数量大于0, 4=数量<=20, 5=数量<=50)
         if (zeroFlag != null) {
-            if (Integer.valueOf(1).equals(zeroFlag)) {
-                queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
-            } else {
-                queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+            switch (zeroFlag) {
+                case 2:
+                    // 数量等于0
+                    queryWrapper.eq(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 3:
+                    // 数量大于0
+                    queryWrapper.gt(CommonConstants.FieldName.Quantity, BigDecimal.ZERO);
+                    break;
+                case 4:
+                    // 数量小于等于20
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("20"));
+                    break;
+                case 5:
+                    // 数量小于等于50
+                    queryWrapper.le(CommonConstants.FieldName.Quantity, new BigDecimal("50"));
+                    break;
+                case 1:
+                default:
+                    // 无限制，不添加筛选条件
+                    break;
             }
         }
         // 所在位置
@@ -527,7 +577,7 @@ public class ProductDetailAppServiceImpl extends ServiceImpl<InventoryItemMapper
         if (remainingDays != null) {
             queryWrapper.le(CommonConstants.FieldName.RemainingDays, remainingDays);
         }
-        // 查询库存商品明细分页列表
+        // 查询库存商品明细分页列表（不分页，查询全部）
         List<ProductDetailPageDto> productDetailList = productDetailsMapper.getProductDetailPageAndTranslateField(
                 queryWrapper, CommonConstants.TableName.MED_MEDICATION_DEFINITION,
                 CommonConstants.TableName.ADM_DEVICE_DEFINITION, ConditionCode.LOT_NUMBER_COST.getCode());