增加号别查询

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

@@ -54,4 +54,9 @@ public class YbUtilController {
         return service.selectAllDept(map);
     }
 
+    @PostMapping("/selectAllRegLevel")
+    public ResultVo<List<Map<String, Object>>> selectAllRegLevel(@RequestBody @Validated Map<String, String> map){
+        return service.selectAllRegLevel(map);
+    }
+
 }

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

@@ -90,4 +90,13 @@ public interface YbUtilDao {
             "</script> ")
     List<Map<String, Object>> selectAllDept(@Param("str") String str);
 
+    @Select("<script> " +
+            "select rtrim(name) as label, rtrim(code) as value from mzy_zd_charge_type 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> " +
+            "order by rtrim(code) " +
+            "</script> ")
+    List<Map<String, Object>> selectAllRegLevel(@Param("str") String str);
+
 }

src/main/java/thyyxxk/webserver/entity/highreport/HighReportDto.java

@@ -36,6 +36,10 @@ public class HighReportDto {
      * 姓名
      **/
     private String xm;
+    /**
+     * 号别
+     **/
+    private String regLevel;
     /**
      * 页面层级：1，2，3，4。。。与table_display_info表sort对应
      **/

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

@@ -63,4 +63,17 @@ public class YbUtilService {
         return ResultVoUtil.success(list);
     }
 
+    /**
+     * @description: 查询所有号别
+     * @author: hsh
+     * @date: 2023/8/3 15:32
+     * @param: [map]
+     * @return: ResultVo<List<Map<String,Object>>>
+     **/
+    public ResultVo<List<Map<String, Object>>> selectAllRegLevel(Map<String, String> map) {
+        String str = map.get("str");
+        List<Map<String, Object>> list = dao.selectAllRegLevel(str);
+        return ResultVoUtil.success(list);
+    }
+
 }

src/main/java/thyyxxk/webserver/utils/ReportUtil.java

@@ -47,6 +47,11 @@ public class ReportUtil {
      **/
     private static final String XM = "xm";
 
+    /**
+     * 号别(下拉选查询使用)
+     **/
+    private static final String REG_LEVEL = "regLevel";
+
     private static final String OTHER_PARAM = "其他";
 
     /**
@@ -84,6 +89,9 @@ public class ReportUtil {
         if(baseSql.contains(INSUR_NAME) && StringUtil.notBlank(dto.getInsurName())){
             sql.append(" and t.insurName = '").append(dto.getInsurName()).append("' ");
         }
+        if(baseSql.contains(REG_LEVEL) && StringUtil.notBlank(dto.getRegLevel())){
+            sql.append(" and t.regLevel = '").append(dto.getRegLevel()).append("' ");
+        }
         if(baseSql.contains(DIAGN) && StringUtil.notBlank(dto.getDiagn())){
             sql.append(" and t.diagn like '%").append(dto.getDiagn()).append("%' ");
         }