传染病统计

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

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

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

@@ -81,4 +81,13 @@ public interface YbUtilDao {
             "</script> ")
     List<Map<String, Object>> selectAllDoctor(@Param("str") String str, @Param("dept") String dept);
 
+    @Select("<script> " +
+            "select rtrim(name) as label, rtrim(code) as value from zd_unit_code with(nolock) where 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>> selectAllDept(@Param("str") String str);
+
 }

src/main/java/thyyxxk/webserver/service/highreport/HighReportService.java

@@ -172,7 +172,7 @@ public class HighReportService {
         for(Map.Entry<String, List<TableDisplayInfo>> entry : map.entrySet()){
             String pid = entry.getKey();
             List<TableDisplayInfo> list = entry.getValue();
-            HeadInfo headInfo = new HeadInfo();
+            List<HeadInfo> headInfoList = new ArrayList<>();
             List<HeadInfo> headInfoChildrenList = new ArrayList<>();
             for(TableDisplayInfo table : list){
                 String id = table.getId();
@@ -182,26 +182,25 @@ public class HighReportService {
                 * 如果表格行id与表格行父id是一样的话，表示这条记录是此表格行的父级行，其余的都是表格的子级行
                 *（例如二级表头pid与id父子关系：1 1，1 2，1 3，1 4 其中1 1是父级表头，1 2、1 3、1 4都是它的子级表头）
                 */
-                if(StringUtil.notBlank(pid) && id.equals(pid)){
-                    headInfo.setDisplay(table.getLabel());
-                    headInfo.setName(table.getProp());
-                    headInfo.setSort(table.getSort());
-                } else if(StringUtil.notBlank(pid) && !id.equals(pid)){
+                if(StringUtil.notBlank(pid) && !id.equals(pid)){
                     HeadInfo headInfoChild = new HeadInfo();
                     headInfoChild.setDisplay(table.getLabel());
                     headInfoChild.setName(table.getProp());
                     headInfoChild.setSort(table.getSort());
                     headInfoChildrenList.add(headInfoChild);
                 } else {
+                    HeadInfo headInfo = new HeadInfo();
                     headInfo.setDisplay(table.getLabel());
                     headInfo.setName(table.getProp());
                     headInfo.setSort(table.getSort());
+                    headInfoList.add(headInfo);
                 }
             }
             if(headInfoChildrenList.size() > 0){
-                headInfo.setColumns(headInfoChildrenList);
+                // 存在子节点的父节点只允许有一个
+                headInfoList.get(0).setColumns(headInfoChildrenList);
             }
-            headList.add(headInfo);
+            headList.addAll(headInfoList);
         }
         return headList;
     }

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

@@ -50,6 +50,17 @@ public class YbUtilService {
         return ResultVoUtil.success(list);
     }
 
-
+    /**
+     * @description: 查询所有科室
+     * @author: hsh
+     * @date: 2023/7/26 10:31
+     * @param: [map]
+     * @return: ResultVo<List<Map<String,Object>>>
+     **/
+    public ResultVo<List<Map<String, Object>>> selectAllDept(Map<String, String> map) {
+        String str = map.get("str");
+        List<Map<String, Object>> list = dao.selectAllDept(str);
+        return ResultVoUtil.success(list);
+    }
 
 }