修改团队教育统计

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java

@@ -40,7 +40,13 @@ public class Data2Save {
                    String invokeKey = (String) DataModel.class.getMethod("getSlaveKey"+slaveKeyNum).invoke(dataModel);
                    sb.append("-"+invokeKey);
                }
                dataModelMap.put(sb.toString(), dataModel);
                if(dataModelMap.get(dataModel.getTeam())==null) {
                    dataModelMap.put(sb.toString(), dataModel);
                }else{
                    double result1 = dataModelMap.get(dataModel.getTeam()).getResult1();
                    dataModel.setResult1(dataModel.getResult1()+result1);
                    dataModelMap.put(sb.toString(), dataModel);
                }
            }
        }
        //得到全部团队

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

@@ -3990,6 +3990,7 @@ public class StatisticsService extends BaseService {
                    " FROM " + esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND userType = 1"+
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
@@ -4000,6 +4001,7 @@ public class StatisticsService extends BaseService {
                    " FROM " +esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND userType = 1"+
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
@@ -4288,13 +4290,14 @@ public class StatisticsService extends BaseService {
        String totalSql = "select count(*) as articleCount,count(DISTINCT batchNo) as batchCount " +
                " from " +esType+
                " where adminTeamCode="+teamCode+" and doctorCode='"+doctor+"' and createTime <='"+endDate+"'";
                " where userType =1 and adminTeamCode="+teamCode+" and doctorCode='"+doctor+"' and createTime <='"+endDate+"'";
        String addSql = "SELECT " +
                " count(*) as addCount, " +
                " count(DISTINCT batchNo) as addBatchno " +
                " from " + esType +
                " where " +
                " adminTeamCode =" + teamCode +
                " userType=1" +
                " and adminTeamCode =" + teamCode +
                " and doctorCode ='" + doctor + "'" +
                " and createTime <= '" + endDate + "' " +
                " and createTime >= '" + startDate + "'";