diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
index 5ef03cf..e5d83d0 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/PublicController.java
@@ -4,39 +4,28 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.hxhq.business.domain.*;
+import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.dto.sj.SjListDto;
-import com.hxhq.business.dto.study.StudyListDto;
 import com.hxhq.business.enums.NormalEnum;
 import com.hxhq.business.enums.SnTypeEnum;
-import com.hxhq.business.enums.study.StudyStatusEnum;
 import com.hxhq.business.form.common.SignForm;
+import com.hxhq.business.form.gyzj.SearchForm;
 import com.hxhq.business.form.sj.SjSearchListForm;
-import com.hxhq.business.form.study.StudyFormPreSearchForm;
-import com.hxhq.business.form.study.StudySearchForm;
 import com.hxhq.business.form.yq.YqSearchForm;
 import com.hxhq.business.form.zcg.ZcgSearchForm;
 import com.hxhq.business.service.*;
-import com.hxhq.common.core.constant.CacheConstants;
-import com.hxhq.common.core.exception.ServiceException;
-import com.hxhq.common.core.utils.DateUtils;
 import com.hxhq.common.core.utils.StringUtils;
 import com.hxhq.common.core.web.controller.BaseController;
 import com.hxhq.common.core.web.domain.AjaxResult;
 import com.hxhq.common.core.web.page.TableDataInfo;
 import com.hxhq.common.redis.service.RedisService;
-import com.hxhq.common.security.annotation.RequiresPermissions;
 import com.hxhq.common.security.utils.SecurityUtils;
 import com.hxhq.system.service.ISysUserService;
-import org.aspectj.weaver.loadtime.Aj;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
 import java.util.List;
-import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -70,6 +59,8 @@ public class PublicController extends BaseController {
     public ISjService sjService;
     @Autowired
     public IYqService yqService;
+    @Autowired
+    public IGyzjService gyzjService;
 
     /**
      * 获取编号
@@ -212,4 +203,15 @@ public class PublicController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询给药制剂列表
+     */
+    @GetMapping("/gyzjList")
+    public TableDataInfo gyzjList(SearchForm form)
+    {
+        startPage();
+        List<ListDto> list = gyzjService.queryStudyList(form);
+        return getDataTable(list);
+    }
+
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
index bebcd9d..d0b9121 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/dto/gyzj/ListDto.java
@@ -108,6 +108,17 @@ public class ListDto {
     @JsonFormat(pattern = "yyyy-MM-dd")
     private Date jyjsrq;
 
+    /** 所属试验 */
+    private String studyMc;
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public Date getJyksrq() {
         return jyksrq;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java
index 9f86133..5a8bbeb 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/form/gyzj/SearchForm.java
@@ -30,6 +30,17 @@ public class SearchForm {
     /** 试验id */
     private Long studyId;
 
+    /** 试验名称 */
+    private String studyMc;
+
+    public String getStudyMc() {
+        return studyMc;
+    }
+
+    public void setStudyMc(String studyMc) {
+        this.studyMc = studyMc;
+    }
+
     public Long getStudyId() {
         return studyId;
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
index eb00d04..650b5bc 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IGyzjService.java
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.hxhq.business.dto.gyzj.DetailDto;
 import com.hxhq.business.dto.gyzj.ListDto;
 import com.hxhq.business.form.gyzj.*;
+import com.hxhq.business.form.sj.SjSearchListForm;
 
 /**
  * 给药制剂Service接口
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
index d0f3462..dfef5d6 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/GyzjServiceImpl.java
@@ -73,6 +73,9 @@ public class GyzjServiceImpl extends ServiceImpl<GyzjMapper, Gyzj> implements IG
         if (StringUtils.isNoneBlank(form.getBh())) {
             queryWrapper.and(p -> p.like("t.`bh`", form.getBh()));
         }
+        if (StringUtils.isNoneBlank(form.getStudyMc())) {
+            queryWrapper.and(p -> p.like("s.`name`", form.getStudyMc()));
+        }
         if (StringUtils.isNoneBlank(form.getStartDate())) {
             queryWrapper.apply("t.sxrq>={0}", form.getStartDate());
         }
diff --git a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
index 83de8c5..d9fb002 100644
--- a/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
+++ b/hxhq-modules/hxhq-system/src/main/resources/mapper/business/GyzjMapper.xml
@@ -28,9 +28,10 @@
     </select>
 
     <select id="queryStudyList" resultType="com.hxhq.business.dto.gyzj.ListDto">
-        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,t.cczt,t.rksqzt,ts.resource_id
+        select t.id,t.mc,t.bh,t.nd,t.nddw,t.kc,t.kcdw,t.sxrq,t.ghzt,t.zjzt,t.cczt,t.rksqzt,ts.resource_id,s.name as studyMc
         FROM `t_study_gyzj` ts
         join  `t_gyzj` t on t.id=ts.resource_id
+        left join  `t_study` s on s.id=t.study_id
         <if test="ew.sqlSegment != '' and ew.sqlSegment != null">
             <where>
                 ${ew.sqlSegment}