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

@@ -4200,7 +4200,7 @@ public class StatisticsService extends BaseService {
        String totalSql =
                "SELECT count(DISTINCT batchNo) AS batchCount, count(*) AS articleCount,doctorCode" +
                        " FROM " +esType+
                        " where adminTeamCode = "+teamCode+" and " +
                        " where userType =1 and adminTeamCode = "+teamCode+" and " +
                        " createTime <= '"+endDate+"' group by doctorCode";
        if ("0".equals(sort)) {
            //降序
@@ -4222,7 +4222,7 @@ public class StatisticsService extends BaseService {
        String addSql=
                "SELECT count(DISTINCT batchNo) AS addBatchno, count(*) AS addCount,doctorCode" +
                        " FROM " +esType+
                        " where adminTeamCode = "+teamCode+" and " +
                        " where userType =1 and adminTeamCode = "+teamCode+" and " +
                        "createTime >= '"+startDate+"' and createTime <= '"+endDate+"' group by doctorCode";
        if ("0".equals(sort)) {
            if ("1".equals(sortType)) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -2393,7 +2393,7 @@ public class StatisticsESService {
    }
    /**
     * 团队报告团队详情中健康教育折线图
     * 团队报告团队详情中健康教育折线图.
     *
     * @param teamCode
     * @param startDate