数据清洗

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

@@ -3954,6 +3954,15 @@ public class StatisticsService extends BaseService {
        return new JSONArray(list);
    }
    /**
     * 从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param type
     * @param doctor
     * @return
     */
    public JSONArray getTeamDoctorEduLineFromEs(String teamCode, String startDate, String endDate, String type, String doctor) {
        String startDateStr = changeDate(DateUtil.getNextDay(startDate,-1));
        String endDateStr = changeDate(endDate);
@@ -4161,7 +4170,15 @@ public class StatisticsService extends BaseService {
        }
    }
    /**
     * 直接从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param sort
     * @param sortType
     * @return
     */
    public JSONArray getTeamEduListFromEs(String teamCode, String startDate, String endDate, String sort, String sortType) {
        startDate = changeDate(DateUtil.getNextDay(startDate,-1));
        endDate = changeDate(endDate);
@@ -4243,6 +4260,14 @@ public class StatisticsService extends BaseService {
        return  new JSONArray(doctorList);
    }
    /**
     * 直接从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param doctor
     * @return
     */
    public JSONObject getTeamDoctorEduTitleFromEs(String teamCode, String startDate, String endDate, String doctor) {
        startDate = changeDate(DateUtil.getNextDay(startDate,-1));
        endDate = changeDate(endDate);
@@ -7076,7 +7101,14 @@ public class StatisticsService extends BaseService {
        return resultList;
    }
    /**
     * 从es查询
     * @param startDate
     * @param endDate
     * @param startDateStr
     * @param sql
     * @return
     */
    public List<Map<String,Object>> getGZBGDataMonthLineForEsFrom(String startDate,String endDate,String startDateStr,String sql){
        List<Map<String, Object>> resultList  = new ArrayList<>();
        List<Map<String,Object>> dateList = DateUtil.findDateASWeeks(DateUtil.strToDate(startDate),DateUtil.strToDate(endDate));
@@ -7153,6 +7185,13 @@ public class StatisticsService extends BaseService {
        return resultList;
    }
    /**
     * 从es查询
     * @param startDate
     * @param endDate
     * @param sql
     * @return
     */
    public List<Map<String,Object>> getGZBGDataWeekLineForEsFrom(String startDate,String endDate,String sql){
        List<Map<String, Object>> resultList  = new ArrayList<>();
        List<Map<String,Object>> dateList = DateUtil.findDates(DateUtil.strToDate(startDate),DateUtil.strToDate(endDate));