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

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

@@ -3677,7 +3677,7 @@ public class DailyReportUploadService {
        Long members = 0l;
        String memberSql = " select count(distinct mem.user_id) from base_daily_report_item it  " +
                "inner join base_daily_report_item_members mem on it.id = mem.report_item_id and mem.del=1 " +
                "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 " +
                "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 and doc.identity=0 " +
                "INNER JOIN base_doctor_hospital dh on doc.id = dh.doctor_code and dh.del=1 " +
                "LEFT JOIN base_doctor_daily_report_upload up on doc.id = up.doctor_id " +
                "LEFT JOIN base_daily_report_detail rd on up.id = rd.report_id and rd.report_item_id = it.id where 1=1 "+sqlWhere;
@@ -4021,7 +4021,7 @@ public class DailyReportUploadService {
        Long members = 0l;
        String memberSql = " select count(distinct mem.user_id) from base_daily_report_item it  " +
                "inner join base_daily_report_item_members mem on it.id = mem.report_item_id and mem.del=1 " +
                "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 " +
                "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 and doc.identity=0 " +
                "INNER JOIN base_doctor_hospital dh on doc.id = dh.doctor_code and dh.del=1 " +
                "LEFT JOIN base_doctor_daily_report_upload up on doc.id = up.doctor_id " +
                "LEFT JOIN base_daily_report_detail rd on up.id = rd.report_id and rd.report_item_id = it.id where 1=1 "+sqlWhere;
@@ -4261,7 +4261,7 @@ public class DailyReportUploadService {
            Long members = 0l;
            String memberSql = " select count(distinct mem.user_id) from base_daily_report_item it  " +
                    "inner join base_daily_report_item_members mem on it.id = mem.report_item_id and mem.del=1 " +
                    "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 " +
                    "INNER JOIN base_doctor doc on mem.user_id = doc.id and doc.del=1 and doc.identity=0 " +
                    "INNER JOIN base_doctor_hospital dh on doc.id = dh.doctor_code and dh.del=1 " +
                    "LEFT JOIN base_doctor_daily_report_upload up on doc.id = up.doctor_id " +
                    "LEFT JOIN base_daily_report_detail rd on up.id = rd.report_id and rd.report_item_id = it.id where 1=1 "+sqlWhere;