Merge branch 'dev' of liubing/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/dailyReport/service/DailyReportUploadService.java

@@ -981,16 +981,12 @@ public class DailyReportUploadService {
            if (deptMap.get("doctorTotal")!=null){
                doctorTotal = Integer.parseInt(deptMap.get("doctorTotal").toString());
                //总人次
                if (!day.equalsIgnoreCase("0")) {
                    total = doctorTotal * (Integer.parseInt(day));
                } else {
                    total = doctorTotal;
                }
                total = doctorTotal * (Integer.parseInt(day));
            }
            if (deptMap.get("yishangbaoTotal")!=null) {
                yishangbaoTotal = Integer.parseInt(deptMap.get("yishangbaoTotal").toString());
            }
            weishangbaoTotal = total-yishangbaoTotal;
            weishangbaoTotal = total-yishangbaoTotal>0?total-yishangbaoTotal:0;
            if (deptMap.get("notVerified")!=null) {
                notVerified = Integer.parseInt(deptMap.get("notVerified").toString());
            }
@@ -1582,11 +1578,7 @@ public class DailyReportUploadService {
        }
        if (StringUtils.isNoneBlank(doctorTotal)) {
            //总人次
            if (!day.equalsIgnoreCase("0")) {
                total = Integer.parseInt(doctorTotal) * (Integer.parseInt(day));
            } else {
                total = Integer.parseInt(doctorTotal);
            }
            total = Integer.parseInt(doctorTotal) * (Integer.parseInt(day));
        }
        Integer yishangbaoTotal = 0;
        Integer weishangbaoTotal = 0;
@@ -1602,7 +1594,7 @@ public class DailyReportUploadService {
            }
        }
        //未上报
        weishangbaoTotal = total - yishangbaoTotal;
        weishangbaoTotal = total - yishangbaoTotal>0?total - yishangbaoTotal:0;
        //上传总次数
        Integer shangchuanTotal = 0;
@@ -1746,11 +1738,7 @@ public class DailyReportUploadService {
        Integer doctorTotal = jdbcTemplate.queryForObject(doctorSql,Integer.class);
        if (!day.equalsIgnoreCase("0")) {
            total = doctorTotal * (Integer.parseInt(day));
        } else {//当天
            total = doctorTotal;
        }
        total = doctorTotal * (Integer.parseInt(day));
        Integer yishangbaoTotal=0;//上传人数
        Integer weishangbaoTotal=0;//未上报
@@ -1778,7 +1766,7 @@ public class DailyReportUploadService {
        yishangbaoTotal = jdbcTemplate.queryForObject(sql,Integer.class);
        //未上报
        weishangbaoTotal = total - yishangbaoTotal;
        weishangbaoTotal = total - yishangbaoTotal>0?total - yishangbaoTotal:0;
        String shangchuanTotalSql = "select COUNT(1) as \"total\" from base_doctor_daily_report_upload d where 1=1  ";