草药医嘱

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/CaoYaoYiZhuController.java

@@ -51,12 +51,9 @@ public class CaoYaoYiZhuController {
     }
 
     @GetMapping("/huoQuCaoYao")
-    public ResultVo<IPage<YiZhuMingChen>> huoQuCaoYao(@RequestParam("queryName") String queryName,
-                                                      @RequestParam("groupNo") Integer groupNo,
-                                                      @RequestParam("currentPage") long currentPage,
-                                                      @RequestParam("pageSize") long pageSize,
-                                                      @RequestParam("total") long total) {
-        return server.huoQuCaoYao(queryName, groupNo, currentPage, pageSize, total);
+    public ResultVo<List<YiZhuMingChen>> huoQuCaoYao(@RequestParam("queryName") String queryName,
+                                                     @RequestParam("groupNo") Integer groupNo) {
+        return server.huoQuCaoYao(queryName, groupNo);
     }
 
     @GetMapping("/huoQuMuBan")

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/CaoYaoYiZhuDao.java

@@ -84,8 +84,7 @@ public interface CaoYaoYiZhuDao {
             "                  suprice_flag " +
             "FROM view_yp_zd_dict_base_yf with (NOLOCK) " +
             "${ew.customSqlSegment} AND isnull(visible_flag_zy, '') <> '1' ")
-    IPage<YiZhuMingChen> huoQuCaoYao(IPage<YiZhuMingChen> page,
-                                     @Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
+    List<YiZhuMingChen> huoQuCaoYao(@Param(Constants.WRAPPER) QueryWrapper<?> queryWrapper);
 
 
     @Select("select pattern_name, " +

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuServer.java

@@ -78,8 +78,7 @@ public class CaoYaoYiZhuServer {
         return ResultVoUtil.success(dao.fuYongFangFa());
     }
 
-    public ResultVo<IPage<YiZhuMingChen>> huoQuCaoYao(String queryName, Integer groupNo, long currentPage, long pageSize, long total) {
-        IPage<YiZhuMingChen> page = new Page<>(currentPage, pageSize, total == 0);
+    public ResultVo<List<YiZhuMingChen>> huoQuCaoYao(String queryName, Integer groupNo) {
         String name = StringUtil.englishToCapital(queryName);
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.and(QueryWrapper -> QueryWrapper
@@ -92,8 +91,7 @@ public class CaoYaoYiZhuServer {
                         .like("code", name)
                 )
                 .eq("group_no", groupNo);
-        dao.huoQuCaoYao(page, qw);
-        return ResultVoUtil.success(page);
+        return ResultVoUtil.success(dao.huoQuCaoYao(qw));
     }
 
 
@@ -109,7 +107,9 @@ public class CaoYaoYiZhuServer {
                 .like("pattern_name", name)
         );
         if (publicServer.noNeedRule(1, 38)) {
-            qw.eq("dept_code", deptCode);
+            if (StringUtil.notBlank(deptCode)) {
+                qw.eq("dept_code", deptCode);
+            }
         }
         qw.groupBy("pattern_name");
         dao.huoQuMuBan(page, qw);