Merge branch 'master' into 'master'

指标维护优化

See merge request lighter/web-server!89

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

@@ -90,8 +90,16 @@ public class HighReportService {
 
         List<TableDisplayInfo> tableInfoList = dao.selectTableDisplayInfoByReportId(reportId);
         // 没有配置病人详情展示数据的话默认查询公共展示数据信息
-        if(tableInfoList.size() == 0){
-            tableInfoList = dao.selectTableDisplayInfoByReportId("comm_report");
+        String level = report.getLevel();
+        if(tableInfoList.isEmpty()){
+            if(ReportType.GROUP_KS.getCode().equals(level)){
+                // 固定分组类型是科室
+                tableInfoList = dao.selectTableDisplayInfoByReportId("comm_report");
+            } else if(ReportType.GROUP_ZB.getCode().equals(level)){
+                // 固定分组类型是指标
+                tableInfoList = dao.selectTableDisplayInfoByReportId("zb_report");
+            }
+
         }
         report.setTableDisplays(tableInfoList);
 
@@ -107,7 +115,6 @@ public class HighReportService {
             List<Map<String, Object>> dataList = dao.selectReportPortalData(reportId, menuId, reportType, sql);
             report.setDataList(dataList);
         } else {
-            String level = report.getLevel();
             // 固定分组类型是科室
             if(ReportType.GROUP_KS.getCode().equals(level)){
                 reportId = ReportType.GROUP_KS.getCode();