Merge branch 'master' into 'master'

门诊部医师运营动态

See merge request lighter/web-server!35

src/main/java/thyyxxk/webserver/controller/ybkf/YbUtilController.java

@@ -39,4 +39,14 @@ public class YbUtilController {
         return service.selectDoctor(map);
     }
 
+    @PostMapping("/selectAllSmallDept")
+    public ResultVo<List<Map<String, Object>>> selectAllSmallDept(@RequestBody @Validated Map<String, String> map){
+        return service.selectAllSmallDept(map);
+    }
+
+    @PostMapping("/selectAllDoctor")
+    public ResultVo<List<Map<String, Object>>> selectAllDoctor(@RequestBody @Validated Map<String, String> map){
+        return service.selectAllDoctor(map);
+    }
+
 }

src/main/java/thyyxxk/webserver/dao/his/ybkf/YbUtilDao.java

@@ -60,4 +60,25 @@ public interface YbUtilDao {
             " ) ")
     List<Map<String, Object>> selectChemotherapyDigan(@Param("patNo") String patNo, @Param("times") Integer times);
 
+    @Select("<script> " +
+            "select rtrim(name) as label, rtrim(code) as value from zd_unit_code with(nolock) where code not like '8%' and del_flag = 0 " +
+            "<if test=\"str != null and str != '' \"> " +
+            " and (name like '%${str}%' or code like '%${str}%' or py_code like ('%' + upper(#{str}) + '%') or d_code like ('%' + upper(#{str}) + '%') ) " +
+            "</if> " +
+            "order by code " +
+            "</script> ")
+    List<Map<String, Object>> selectAllSmallDept(@Param("str") String str);
+
+    @Select("<script> " +
+            "select rtrim(name) as label, rtrim(code) as value from a_employee_mi with(nolock) where 1 = 1 " +
+            "<if test=\"str != null and str != '' \"> " +
+            " and (name like '%${str}%' or code like '%${str}%' or py_code like ('%' + upper(#{str}) + '%') or d_code like ('%' + upper(#{str}) + '%') ) " +
+            "</if> " +
+            "<if test=\"dept != null and dept != '' \"> " +
+            "and dept_code = #{dept} " +
+            "</if> " +
+            "order by py_code " +
+            "</script> ")
+    List<Map<String, Object>> selectAllDoctor(@Param("str") String str, @Param("dept") String dept);
+
 }

src/main/java/thyyxxk/webserver/service/ybkf/YbUtilService.java

@@ -37,5 +37,19 @@ public class YbUtilService {
         return ResultVoUtil.success(list);
     }
 
+    public ResultVo<List<Map<String, Object>>> selectAllSmallDept(Map<String, String> map) {
+        String str = map.get("str");
+        List<Map<String, Object>> list = dao.selectAllSmallDept(str);
+        return ResultVoUtil.success(list);
+    }
+
+    public ResultVo<List<Map<String, Object>>> selectAllDoctor(Map<String, String> map) {
+        String str = map.get("str");
+        String dept = map.get("dept");
+        List<Map<String, Object>> list = dao.selectAllDoctor(str, dept);
+        return ResultVoUtil.success(list);
+    }
+
+
 
 }