Merge branch 'master' into 'master'

指标详情优化

See merge request lighter/web-server!55

src/main/java/thyyxxk/webserver/dao/his/highreport/HighReportDao.java

@@ -39,9 +39,7 @@ public interface HighReportDao {
 
     @Select("<script> " +
             " select * from report_base_info where flag = 'Y' " +
-            " <if test=\"reportId != null and reportId != '' \"> " +
             " and report_id = #{reportId} " +
-            " </if> " +
             " <if test=\"reportType != null and reportType != '' \"> " +
             " and report_type = #{reportType} " +
             " </if> " +

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

@@ -34,6 +34,8 @@ public enum ReportType {
 
     FBT("fbt_show", "分布图"),
 
+    GROUP_ZB("group_zb", "指标"),
+
     GROUP_KS("group_ks", "科室");
 
     private final String code;

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

@@ -77,6 +77,11 @@ public class HighReportService {
         String menuId = dto.getMenuId();
         String reportType = dto.getReportType();
         String type = dto.getType();
+
+        if(null == reportId){
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+        }
+
         ReportBaseInfo report = dao.selectReportPortalMenu(reportId, menuId, reportType);
         if(null == report){
             log.info("没有配置报表参数");
@@ -106,6 +111,9 @@ public class HighReportService {
             // 固定分组类型是科室
             if(ReportType.GROUP_KS.getCode().equals(level)){
                 reportId = ReportType.GROUP_KS.getCode();
+            } else if(ReportType.GROUP_ZB.getCode().equals(level)){
+                // 固定分组类型是指标
+                reportId = ReportType.GROUP_ZB.getCode();
             }
             TableGroupInfo info = dao.selectTableGroupInfoByLevel(reportId, level);
             String sql = ReportUtil.callSqlFormatByGroup(dto, report, info, true);