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

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

@@ -982,7 +982,7 @@ public class DailyReportUploadService {
                doctorTotal = Integer.parseInt(deptMap.get("doctorTotal").toString());
                //总人次
                if (!day.equalsIgnoreCase("0")) {
                    total = doctorTotal * (Integer.parseInt(day)+1);
                    total = doctorTotal * (Integer.parseInt(day));
                } else {
                    total = doctorTotal;
                }
@@ -1583,7 +1583,7 @@ public class DailyReportUploadService {
        if (StringUtils.isNoneBlank(doctorTotal)) {
            //总人次
            if (!day.equalsIgnoreCase("0")) {
                total = Integer.parseInt(doctorTotal) * (Integer.parseInt(day)+1);
                total = Integer.parseInt(doctorTotal) * (Integer.parseInt(day));
            } else {
                total = Integer.parseInt(doctorTotal);
            }
@@ -1747,7 +1747,7 @@ public class DailyReportUploadService {
        Integer doctorTotal = jdbcTemplate.queryForObject(doctorSql,Integer.class);
        if (!day.equalsIgnoreCase("0")) {
            total = doctorTotal * (Integer.parseInt(day)+1);
            total = doctorTotal * (Integer.parseInt(day));
        } else {//当天
            total = doctorTotal;
        }