diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
index 4030e3e..e0810f8 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -138,7 +138,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
     /**
      * 计算时间差
      *
-     * @param endTime 最后时间
+     * @param endDate 最后时间
      * @param startTime 开始时间
      * @return 时间差（天/小时/分钟）
      */
diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java
index c190a8d..a1880a2 100644
--- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java
+++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/controller/HealthMedicineBasicController.java
@@ -1,30 +1,23 @@
 package com.ruoyi.health.controller;
 
-import java.util.List;
-import java.io.IOException;
-import javax.servlet.http.HttpServletResponse;
-import javax.annotation.Resource;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.core.web.controller.BaseController;
+import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.health.domain.HealthMedicineBasic;
-import com.ruoyi.health.domain.vo.HealthMedicineBasicVo;
 import com.ruoyi.health.domain.dto.HealthMedicineBasicDto;
+import com.ruoyi.health.domain.vo.HealthMedicineBasicVo;
 import com.ruoyi.health.service.IHealthMedicineBasicService;
-import com.ruoyi.common.core.web.controller.BaseController;
-import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.ruoyi.common.core.web.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 药品基础信息Controller
@@ -44,7 +37,7 @@ public class HealthMedicineBasicController extends BaseController
      * 查询药品基础信息列表
      */
     @ApiOperation(value="查询药品基础信息列表",response = HealthMedicineBasicVo.class)
-    @RequiresPermissions("health:medicineBasic:list")
+//    @RequiresPermissions("health:medicineBasic:list")
     @GetMapping("/list")
     public TableDataInfo list(HealthMedicineBasicDto healthMedicineBasicDto)
     {
diff --git a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml
index f85357f..0da12ef 100644
--- a/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml
+++ b/ruoyi-modules/intc-health/src/main/resources/mapper/health/HealthActivityMapper.xml
@@ -41,6 +41,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="startTime != null "> and a.start_time = #{startTime}</if>
             <if test="endTime != null "> and a.end_time = #{endTime}</if>
         </where>
+        <!-- 数据范围过滤 -->
+        ${params.dataScope}
         order by a.create_time desc
     </select>