Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/statistics/StatisticsService.java

@@ -2277,8 +2277,14 @@ public class StatisticsService {
                    " and mem.doctor_code = doc.id and mem.del=1 and doc.del=1 ";
            Integer count = jdbcTemplate.queryForObject(sql,Integer.class);
            map.put("doctorCount",count);
            SaveModel saveModel = elasticsearchUtil.findOneDateQuotaLevel1(DateUtil.getStringDateShort(), teamId, 5, "67", SaveModel.timeLevel_DDL,"-2,0,1");
            map.put("emeAssistanceCount",saveModel.getResult2().longValue());
            sql = " SELECT count(o.bussiness_id) " +
                    "FROM(SELECTo.id AS bussiness_id,o.team_code as dept,o.`status`,o.update_time " +
                    "FROM base_security_monitoring_order o UNION ALL  " +
                    "SELECT o.id AS bussiness_id,o.team_code as dept,o.`status`,o.update_time " +
                    "FROM base_emergency_assistance_order o " +
                    ") o WHERE 1=1  and dept='"+teamId+"' and `status` in (-2,0,1) ";
            Long emeAssistanceCount = jdbcTemplate.queryForObject(sql,Long.class);
            map.put("emeAssistanceCount",emeAssistanceCount);
            sql = " SELECT count(o.id) FROM base_life_care_order o WHERE o.status<>0 and o.status<>-1  and EXISTS ( " +
                    " select 1 from base_service_package_sign_record sr,base_service_package_record r, base_service_package_item i," +
                    " base_service_package pack " +

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/save/es/ElasticFactory.java

@@ -44,7 +44,7 @@ public class ElasticFactory {
     * @param "http://localhost:9200"
     * @return
     */
    public JestClient getJestClient() {
    public synchronized JestClient getJestClient() {
        if (factory == null) {
            //初始化链接
            init();

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java

@@ -269,6 +269,9 @@ public class CurrentMysqlToEsQuotaJob implements Job {
                case "4":
                    methodName = "getHospital";
                    break;
                case "5":
                    methodName = "getDept";
                    break;
                default:
                    methodName = "getDoctor";
                    break;