代码修改

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -1661,7 +1661,6 @@ public class StatisticsEsService {
        SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
        List<SaveModel> saveModels = new ArrayList<>();
        //startDate = DateUtil.getNextDay(startDate,-1);
        if (StringUtils.isNotBlank(lowCode)) {
            if (StringUtils.isNoneBlank(lowCode2)) {
                saveModels = elasticsearchUtil.findLineChartDateQuotaLevel2(startDate, endDate, area, level, index, timelevel, SaveModel.interval_day, lowCode, lowCode2);
@@ -1675,9 +1674,7 @@ public class StatisticsEsService {
        }
        List<JSONObject> result = new ArrayList<>();
//        if (saveModels != null && saveModels.size() >0) {
        List<Map<String, Object>> resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(dateFormat.parse(endDate), 1)));
//            result.clear();
        for (Map<String, Object> one : resultList) {
            JSONObject json = new JSONObject();
            json.put("range", one.get("date"));
@@ -1685,7 +1682,6 @@ public class StatisticsEsService {
            json.put("num", 0.00);
            result.add(json);
        }
//        }
        DecimalFormat decimalFormat = new DecimalFormat("0.00");
        if (saveModels != null) {
            // 计算结果
@@ -1703,36 +1699,7 @@ public class StatisticsEsService {
                        obj.put("num", decimalFormat.format(num));
                    }
                }
//                json.put("range", range);
//                json.put("amount", amount);
//                result.add(json);
            }
//            if (saveModels != null && saveModels.size() == 1 && saveModels.get(0).getHospital() == null) {
//                List<Map<String, Object>> resultList = DateUtil.findDates(dateFormat.parse(startDate), dateFormat.parse(DateUtil.getNextDay(endDate, 1)));
//                result.clear();
//                for (Map<String, Object> map : resultList) {
//                    JSONObject json = new JSONObject();
//                    json.put("range", map.get("date"));
//                    json.put("amount", 0);
//                    result.add(json);
//                }
//            }
//            SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
//            Date startDate1 = sf.parse(startDate);
//            Date endDate1 = sf.parse(endDate);
//            long days = DateUtil.getDays(startDate1,endDate1);
//            Calendar calendar = Calendar.getInstance();
//            calendar.setTime(startDate1);
//            List<JSONObject> resultTemp = new ArrayList<>();
//            for(int i=1;i<=days;i++){
//                calendar.add(calendar.DATE,i);//把日期往后增加一天.整数往后推,负数往前移动
//                String dateString = sf.format(calendar.getTime());
//                Map<String, Object> map = new HashMap<>();
//                map.put("range",sf.format(calendar.getTime()));
//                map.put()
//            }
            // 排序
            result.sort(new Comparator<JSONObject>() {
                @Override
@@ -6258,15 +6225,17 @@ public class StatisticsEsService {
     * {"index":5,"startDate":"2023-07-01","endDate":"2023-07-19","area":"350200","level":2,"level2_type":4,"interval":1}
     */
    public JSONObject getKindsConsultCount(ScreenQvo qvo) throws Exception {
        if (qvo.getFlag() == 1) {
            qvo.setStartDate(DateUtil.getFirstMonthDay());
            qvo.setEndDate(DateUtil.getLastMonthDay());
        } else if (qvo.getFlag() == 2) {
            qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
            qvo.setEndDate(DateUtil.getStringDateShort());
        } else if (qvo.getFlag() == 3) {
            qvo.setStartDate(DateUtil.getCurrentYearStartTime());
            qvo.setEndDate(DateUtil.getCurrentYearEndTime());
        if(StringUtils.isBlank(qvo.getStartDate())){
            if (qvo.getFlag() == 1) {
                qvo.setStartDate(DateUtil.getFirstMonthDay());
                qvo.setEndDate(DateUtil.getLastMonthDay());
            } else if (qvo.getFlag() == 2) {
                qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
                qvo.setEndDate(DateUtil.getStringDateShort());
            } else if (qvo.getFlag() == 3) {
                qvo.setStartDate(DateUtil.getCurrentYearStartTime());
                qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            }
        }
        //专家咨询数量 = 图文咨询 + 视频咨询
@@ -6314,20 +6283,16 @@ public class StatisticsEsService {
     */
    public JSONObject getConsultAndPrescriptionList(ScreenQvo qvo) throws Exception {
        JSONObject result = new JSONObject();
        if (qvo.getFlag() == 1) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
        if (StringUtils.isBlank(qvo.getStartDate())) {
            if (qvo.getFlag() == 1) {
                //本月
                qvo.setStartDate(DateUtil.getFirstMonthDay());
                qvo.setEndDate(DateUtil.getLastMonthDay());
            }
        } else if (qvo.getFlag() == 2) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
            } else if (qvo.getFlag() == 2) {
                //近半年
                qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
                qvo.setEndDate(DateUtil.getStringDateShort());
            }
        } else if (qvo.getFlag() == 3) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
            } else if (qvo.getFlag() == 3) {
                //全年
                qvo.setStartDate(DateUtil.getCurrentYearStartTime());
                qvo.setEndDate(DateUtil.getCurrentYearEndTime());
@@ -6401,30 +6366,27 @@ public class StatisticsEsService {
     */
    public JSONObject getDrugAndExaminationFeeList(ScreenQvo qvo) throws Exception {
        System.out.println("getDrugAndExaminationFeeList获取：诊查费(21) + 处方费(3)");
        if (qvo.getFlag() == 1) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
        if (StringUtils.isBlank(qvo.getStartDate())) {
            if (qvo.getFlag() == 1) {
                //本月
                qvo.setStartDate(DateUtil.getFirstMonthDay());
                qvo.setEndDate(DateUtil.getLastMonthDay());
            }
        } else if (qvo.getFlag() == 2) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
            } else if (qvo.getFlag() == 2) {
                //近半年
                qvo.setStartDate(DateUtil.getMonthDate(new Date(), -6));
                qvo.setEndDate(DateUtil.getStringDateShort());
            }
        } else if (qvo.getFlag() == 3) {
            if (StringUtils.isBlank(qvo.getStartDate())) {
            } else if (qvo.getFlag() == 3) {
                //全年
                qvo.setStartDate(DateUtil.getCurrentYearStartTime());
                qvo.setEndDate(DateUtil.getCurrentYearEndTime());
            }
        }
        System.out.println("赋值时间-参数:" + JSON.toJSONString(qvo));
        HashMap<String, String> map = new HashMap<>();
        JSONObject result = new JSONObject();
        map.put("drugFree", "3"); //诊查费
        map.put("ExaminationFee", "1"); //处方费
        map.put("ExaminationFee", "21"); //处方费
        for (Map.Entry<String, String> entry : map.entrySet()) {
            String key = entry.getKey();