药品搜索

src/main/java/cn/hnthyy/thmz/mapper/his/zd/MzZdYpYshMapper.java

@@ -29,7 +29,7 @@ public interface MzZdYpYshMapper {
             "    FROM view_mz_zd_yp_ysh a WITH(NOLOCK) left join yp_zd_dict b on a.code=b.code and a.serial=b.serial ",
             "where  stock_amount_virtual <![CDATA[>]]> 0 and (case when a.bill_code='TC' or a.group_no='00' then  '71' else a.group_no end)=#{groupNo}  ",
             "<when test='commonParams!=null'>",
-            " and (py_code like #{commonParams} collate Chinese_PRC_CI_AS or d_code  like #{commonParams} collate Chinese_PRC_CI_AS or code like #{commonParams} collate Chinese_PRC_CI_AS or name like #{commonParams} collate Chinese_PRC_CI_AS or class_code like #{commonParams} collate Chinese_PRC_CI_AS ) ",
+            " and (a.py_code like #{commonParams} collate Chinese_PRC_CI_AS or a.d_code  like #{commonParams} collate Chinese_PRC_CI_AS or a.code like #{commonParams} collate Chinese_PRC_CI_AS or a.name like #{commonParams} collate Chinese_PRC_CI_AS or a.class_code like #{commonParams} collate Chinese_PRC_CI_AS ) ",
             "</when>",
             "GROUP BY a.code,a.serial, a.name,a.specification,charge_amount,manufactory,a.mini_unit,group_no,stock_amount_virtual,drug_win,a.national_code,b.yb_flag_new order by stock_amount_virtual desc ) t",
             "</script>"})

src/main/resources/application-dev.yml

@@ -41,9 +41,9 @@ spring:
       max-request-size: 1000MB
   datasource:
     his:
-      jdbc-url: "jdbc:sqlserver://localhost:1433;databaseName=his"
+      jdbc-url: "jdbc:sqlserver://localhost:1433;databaseName=hisdb"
       username: "sa"
-      password: "123456"
+      password: "Symhyy@123"
       # jdbc-url: "jdbc:sqlserver://130.150.161.124:1433;databaseName=po"
       # username: "sa"
       # password: "root"

src/main/resources/static/js/fy_config.js

@@ -8,15 +8,11 @@ $(function (){
     });
 
     // 查询药房信息
-<<<<<<< HEAD
-    initDynamicSelect("selectYfAllByTime", "groupNo", "groupNo", "groupName", function (){
+    initDynamicSelect("selectYfAll", "groupNo", "groupNo", "groupName", function (){
         $('#groupNo').selectpicker('val', getLocalStorage("groupNo"));
         $('#groupNo').selectpicker('refresh');
     });
 
-=======
-    initDynamicSelect("selectYfAll", "groupNo", "groupNo", "groupName");
->>>>>>> origin/淮海科技
     // 查询药库信息
     initDynamicSelect("selectYkAll", "groupYk", "groupNo", "groupName");