Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -3991,7 +3991,7 @@ public class StatisticsService extends BaseService {
                    " FROM " + esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND userType = 1"+
                    " AND userType = 1 AND sendType = 1"+
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
@@ -4002,7 +4002,7 @@ public class StatisticsService extends BaseService {
                    " FROM " +esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND userType = 1"+
                    " AND userType = 1 AND sendType=1"+
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
@@ -4203,7 +4203,7 @@ public class StatisticsService extends BaseService {
        String totalSql =
                "SELECT count(DISTINCT batchNo) AS batchCount, count(*) AS articleCount,doctorCode" +
                        " FROM " +esType+
                        " where userType =1 and adminTeamCode = "+teamCode+" and " +
                        " where userType =1 and sendType=1 and adminTeamCode = "+teamCode+" and " +
                        " createTime <= '"+endDate+"' group by doctorCode";
        if ("0".equals(sort)) {
            //降序
@@ -4225,7 +4225,7 @@ public class StatisticsService extends BaseService {
        String addSql=
                "SELECT count(DISTINCT batchNo) AS addBatchno, count(*) AS addCount,doctorCode" +
                        " FROM " +esType+
                        " where userType =1 and adminTeamCode = "+teamCode+" and " +
                        " where userType =1 and sendType=1 and adminTeamCode = "+teamCode+" and " +
                        "createTime >= '"+startDate+"' and createTime <= '"+endDate+"' group by doctorCode";
        if ("0".equals(sort)) {
            if ("1".equals(sortType)) {
@@ -4291,13 +4291,13 @@ public class StatisticsService extends BaseService {
        String totalSql = "select count(*) as articleCount,count(DISTINCT batchNo) as batchCount " +
                " from " +esType+
                " where userType =1 and adminTeamCode="+teamCode+" and doctorCode='"+doctor+"' and createTime <='"+endDate+"'";
                " where userType =1 and sendType=1 and adminTeamCode="+teamCode+" and doctorCode='"+doctor+"' and createTime <='"+endDate+"'";
        String addSql = "SELECT " +
                " count(*) as addCount, " +
                " count(DISTINCT batchNo) as addBatchno " +
                " from " + esType +
                " where " +
                " userType=1" +
                " userType=1 and sendType=1" +
                " and adminTeamCode =" + teamCode +
                " and doctorCode ='" + doctor + "'" +
                " and createTime <= '" + endDate + "' " +