Merge branch 'master' into 'master'

增加按挂号按接诊选择

See merge request lighter/web-server!40

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

@@ -45,4 +45,11 @@ public class HighReportDto {
     private String trdName;
     private String fthName;
 
+    /**
+     * 门诊统计口径：0 按挂号；1 按接诊
+     **/
+    private String mzFlag;
+
+
+
 }

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

@@ -48,21 +48,23 @@ public class AllStatisticsService {
     public ResultVo<Map<String, Object>> selectWorkloadStatistics(HighReportDto dto){
 
         Map<String, Object> results = new HashMap<>();
+        String mzFlag = dto.getMzFlag();
+        boolean flag = "0".equals(mzFlag);
 
         // 查询门诊人数
-        ReportBaseInfo report_mz = highReportDao.selectReportPortalMenu("mz_mzrs", null, null);
+        ReportBaseInfo report_mz = highReportDao.selectReportPortalMenu(flag ? "mz_mzrs" : "mz_mzrsjz", null, null);
         report_mz.setGatherSql(report_mz.getGatherSql() + " as rs_mz, t.dept as ks_mz ");
         String sql_mz = ReportUtil.callSqlFormat(dto, report_mz.getBaseSql(), report_mz.getGatherSql(), "dept", null, "rs_mz desc");
         List<Map<String, Object>> mzrs = highReportDao.selectReportPortalData(report_mz.getReportId(), report_mz.getMenuId(), report_mz.getReportType(), sql_mz);
 
         // 查询急诊人数
-        ReportBaseInfo report_jz = highReportDao.selectReportPortalMenu("mz_jzrs", null, null);
+        ReportBaseInfo report_jz = highReportDao.selectReportPortalMenu(flag ? "mz_jzrs" : "mz_jzrsjz", null, null);
         report_jz.setGatherSql(report_jz.getGatherSql() + " as rs_jz, t.dept as ks_jz ");
         String sql_jz = ReportUtil.callSqlFormat(dto, report_jz.getBaseSql(), report_jz.getGatherSql(), "dept", null, "rs_jz desc");
         List<Map<String, Object>> jzrs = highReportDao.selectReportPortalData(report_jz.getReportId(), report_jz.getMenuId(), report_jz.getReportType(), sql_jz);
 
         // 查询退号人数
-        ReportBaseInfo report_th = highReportDao.selectReportPortalMenu("mz_thrs", null, null);
+        ReportBaseInfo report_th = highReportDao.selectReportPortalMenu(flag ? "mz_thrs" : "mz_thrsjz", null, null);
         report_th.setGatherSql(report_th.getGatherSql() + " as rs_th, t.dept as ks_th ");
         String sql_th = ReportUtil.callSqlFormat(dto, report_th.getBaseSql(), report_th.getGatherSql(), "dept", null, "rs_th desc");
         List<Map<String, Object>> thrs = highReportDao.selectReportPortalData(report_th.getReportId(), report_th.getMenuId(), report_th.getReportType(), sql_th);