Jelajahi Sumber

添加查询字段

DESKTOP-0GD05B0\Administrator 2 tahun lalu
induk
melakukan
5de3a8fe28

+ 5 - 0
src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/CaoYaoYiZhuDao.java

@@ -36,6 +36,11 @@ public interface CaoYaoYiZhuDao {
             "       quantity, " +
             "       quantity_dj, " +
             "       order_code_dj," +
+            "       cy_jssm," +
+            "       cy_mtjs," +
+            "       cy_ffcs," +
+            "       cy_fysm," +
+            "       cy_fysm_name     = (select name from mzysh_zd_fysm where code = cy_fysm)," +
             "       input_date," +
             "       exec_dept, " +
             "       exec_dept_name = (select name from zd_unit_code where code = exec_dept) " +

+ 2 - 0
src/main/java/thyyxxk/webserver/entity/zhuyuanyisheng/caoyaoyizhu/YzActOrderCy.java

@@ -157,6 +157,7 @@ public class YzActOrderCy implements Serializable {
      * 服用说明
      */
     private Integer cyFysm;
+    private String cyFysmName;
 
     /**
      * 加水类型
@@ -179,6 +180,7 @@ public class YzActOrderCy implements Serializable {
     private String execDept;
     private String execDeptName;
 
+
     /**
      * 药房 81-草药,82-中药颗粒
      */

+ 1 - 1
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuService.java

@@ -89,7 +89,7 @@ public class CaoYaoYiZhuService {
     public ResultVo<List<YiZhuMingChen>> huoQuCaoYao(String queryName, Integer groupNo) {
         String name = StringUtil.englishToCapital(queryName);
         QueryWrapper<?> qw = new QueryWrapper<>();
-        qw.and(QueryWrapper -> QueryWrapper
+        qw.and(q -> q
                         .like("py_code", name)
                         .or()
                         .like("name", name)