统计修改

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

@@ -3511,7 +3511,7 @@ public class StatisticsEsService {
            //咨询总数
            List<SaveModel> total = elasticsearchUtil.findListDateQuotaLevel0(startTime, endTime, area, level, index1, SaveModel.timeLevel_ZL, lowLevel);
            //已结束
            List<SaveModel> endTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"2");
            List<SaveModel> endTotal = elasticsearchUtil.findListDateQuotaLevel1(startTime, endTime, area, level, index, SaveModel.timeLevel_ZL, lowLevel,"1,2,3");
            result.put("resultList", getCoutList1(level, lowLevel, endTotal, total, noReceiveTotal));
        }
@@ -4303,7 +4303,23 @@ public class StatisticsEsService {
                }
            }
        }
        object.put("excelData",resultArray);
        List<JSONObject> bindArrayResult = JSONArray.parseArray(resultArray.toJSONString(), JSONObject.class);
        System.out.println("排序前："+bindArrayResult);
        Collections.sort(bindArrayResult, new Comparator<JSONObject>() {
            @Override
            public int compare(JSONObject o1, JSONObject o2) {
                double a = o1.getDouble("specialist");
                double b = o2.getDouble("specialist");
                if (a > b) {
                    return -1;
                } else if(a == b) {
                    return 0;
                } else
                    return 1;
            }
        });
        JSONArray jsonArray = JSONArray.parseArray(bindArrayResult.toString());
        object.put("excelData",jsonArray);
        return object;
    }
    /**

svr/svr-internet-hospital-job/src/main/java/com/yihu/jw/service/channel/PrescriptionStatusUpdateService.java

@@ -347,7 +347,7 @@ public class PrescriptionStatusUpdateService {
            logger.info("setOutPatientOver count :"+0);
        }
        logger.info("setOutPatientOver end ");
        logger.info("进入结束超时未接诊的门诊");
        /*logger.info("进入结束超时未接诊的门诊");
        List<WlyyOutpatientDO> timeout = outpatientDao.findAllWaitingOutpatient();
        if (null!=timeout&&timeout.size()>0){
            logger.info("开始结束超时未接诊的门诊");
@@ -433,7 +433,7 @@ public class PrescriptionStatusUpdateService {
                    }
                    } else if (wechatId.equalsIgnoreCase("xm_zsyy_wx")) {
                    /*businessOrderService.ylzOrderRefund(wechatId, wlyyOutpatientDO.getPatient(), businessOrderDO.getOrderNo(), businessOrderDO.getPayPrice(), description);*/
                    *//*businessOrderService.ylzOrderRefund(wechatId, wlyyOutpatientDO.getPatient(), businessOrderDO.getOrderNo(), businessOrderDO.getPayPrice(), description);*//*
                    }
@@ -443,7 +443,7 @@ public class PrescriptionStatusUpdateService {
                logger.info(wlyyOutpatientDO.getId()+"的门诊记录设置为取消");
            }
            outpatientDao.save(outpatientDOs);
        }
        }*/
    }