1.新增部分公式计算

2.新增字典接口

readme.MD

@@ -26,4 +26,5 @@ power design: https://192.168.1.103:888/svn/outwindow/基础开发部/doc/i健
- scheduler清理任务及新增special目录
- 合并ElasticsearchUtil和EsClientUtil。
增加util类很多时候就是为了去除面向对象的复制性，将类对象函数化，然调用过程更加方便。
如果在封装Util时有多个Util，实际上是增加了复杂度？为什么不用原生类呢？
如果在封装Util时有多个Util，实际上是增加了复杂度？为什么不用原生类呢？
- 

src/main/java/com/yihu/quota/contants/MicroServiceApi.java

@@ -0,0 +1,14 @@
package com.yihu.quota.contants;
/**
 * @author l4qiang
 */
public interface MicroServiceApi {
    interface Service {
        String RESOURCE = "svr-resource";
    }
    interface Resource {
        String DICT_ENTRY = "cache/dict-entry";
    }
}

src/main/java/com/yihu/quota/controller/QuotaReportController.java

@@ -19,7 +19,7 @@ import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.service.quota.DeviceService;
import com.yihu.quota.service.quota.special.DeviceService;
import com.yihu.quota.service.quota.QuotaService;
import com.yihu.quota.service.resource.ResourceQuotaService;
import com.yihu.quota.util.BasesicUtil;

src/main/java/com/yihu/quota/controller/special/DiabetesController.java

@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
/**
 * Created by janseny on 2018/4/25.
 */
@Deprecated
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(description = "糖尿病相关数据信息接口")

src/main/java/com/yihu/quota/controller/special/QuotaReportStatisticsController.java

@@ -24,6 +24,7 @@ import java.util.*;
/**
 * Created by janseny on 2017/12/14.
 */
@Deprecated
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(description = "报表统计 - 统计指标 接口")

src/main/java/com/yihu/quota/controller/special/SingleDiseasesController.java

@@ -20,7 +20,7 @@ import java.util.*;
/**
 * Created by janseny on 2018/4/4.
 */
@Deprecated
@RestController
@RequestMapping(ApiVersion.Version1_0)
@Api(description = "单病种报表统计 - 糖尿病")

src/main/java/com/yihu/quota/controller/special/SolrStatisticsEndPoint.java

@@ -18,6 +18,7 @@ import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@Deprecated
@RestController
@RequestMapping(value = ApiVersion.Version1_0)
@Api(value = "SolrStatisticsEndPoint", description = "门急诊服务统计接口", tags = {"临时报表接口--门急诊服务统计接口"})
@@ -68,10 +69,144 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
        return envelop;
    }
    @ApiOperation("当月相关数据")
    @RequestMapping(value = "/statistics/{position}", method = RequestMethod.POST)
    public Envelop statistics(
            @ApiParam(name = "core", value = "集合", required = true)
            @RequestParam(value = "core") String core,
            @ApiParam(name = "position", value = "位置参数1,2,3,4", required = true)
            @PathVariable(value = "position") String position) throws Exception {
        if (position.equals("1")) {
            return emergencyRoom(core);
        } else if (position.equals("2")) {
            return hundredPeople(core);
        } else if (position.equals("3")) {
            return emergency(core);
        } else if (position.equals("4")) {
            return referral(core);
        } else {
            Envelop envelop = new Envelop();
            envelop.setSuccessFlg(false);
            envelop.setErrorMsg("参数：" + position + "，有误！");
            return envelop;
        }
    }
    @ApiOperation("医院门急诊人次分布")
    @RequestMapping(value = "/statistics/monthDistribution", method = RequestMethod.POST)
    public Envelop monthDistribution(
            @ApiParam(name = "core", value = "集合", required = true)
            @RequestParam(value = "core") String core,
            @ApiParam(name = "year", value = "年份", required = true)
            @RequestParam(value = "year") int year) throws Exception {
        Envelop envelop = new Envelop();
        Calendar calendar = Calendar.getInstance();
        int nowYear = calendar.get(Calendar.YEAR);
        if (nowYear > year) {
            calendar.set(Calendar.MONTH, 11);
        }
        calendar.set(Calendar.YEAR, year);
        calendar.set(Calendar.DAY_OF_MONTH, 1);
        calendar.set(Calendar.HOUR_OF_DAY, 0);
        calendar.set(Calendar.MINUTE, 0);
        calendar.set(Calendar.SECOND, 0);
        calendar.set(Calendar.MILLISECOND, 0);
        int month = calendar.get(Calendar.MONTH) + 1;
        List<Map<String, Integer>> dataList = new ArrayList<>(month);
        for (int i = 1; i <= month; i++) {
            String monthStr;
            if (i < 10) {
                monthStr = "0" + i;
            } else {
                monthStr = "" + i;
            }
            String start = String.format("%s-%s-01T00:00:00Z", year, monthStr);
            String end;
            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
            calendar.set(Calendar.MONTH, i - 1);
            int day;
            if (i == month && nowYear == year) {
                Calendar calendar1 = Calendar.getInstance();
                end = dateFormat.format(calendar1.getTime());
            } else {
                day = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                end = String.format("%s-%s-%sT23:59:59Z", year, monthStr, day);
            }
            String q = String.format("event_type:0 AND event_date:[%s TO %s]", start, end);
            Map<String, Integer> data = solr.getFacetQuery(core, q);
            data.put(monthStr, data.get(q));
            data.remove(q);
            dataList.add(data);
        }
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(dataList);
        return envelop;
    }
    @ApiOperation("本月各类医院门急诊人次")
    @RequestMapping(value = "/statistics/rescue", method = RequestMethod.POST)
    public Envelop variousTypes() throws Exception {
        Envelop envelop = new Envelop();
        Calendar calendar = Calendar.getInstance();
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        String monthStr;
        if (month < 10) {
            monthStr = "0" + month;
        } else {
            monthStr = "" + month;
        }
        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
        String start = String.format("%s-%s-01T00:00:00Z", year, monthStr);
        String end = dateFormat.format(calendar.getTime());
        String fq = String.format("event_type:0 AND event_date:[%s TO %s]", start, end);
        FacetField facetField = solr.getFacetField("HealthProfile", "org_code", fq, 0, 0, 1000000, false);
        List<FacetField.Count> list = facetField.getValues();
        Map<String, Long> dataMap = new HashMap<>(list.size());
        for (FacetField.Count count : list) {
            dataMap.put(count.getName(), count.getCount());
        }
        Map<String, Long> resultMap = new HashMap<>();
        for (String code : dataMap.keySet()) {
            String level = orgService.getLevel(code);
            if (!StringUtils.isEmpty(level)) {
                if (resultMap.containsKey(level)) {
                    long count = resultMap.get(level) + dataMap.get(code);
                    resultMap.put(level, count);
                } else {
                    resultMap.put(level, dataMap.get(code));
                }
            } else {
                if (resultMap.containsKey("9")) {
                    long count = resultMap.get("9") + dataMap.get(code);
                    resultMap.put("9", count);
                } else {
                    resultMap.put("9", dataMap.get(code));
                }
            }
        }
        Map<String, Object> resap = new HashMap<>();
        // dictId=99 (医院等级)
        Map<String, Object> dictEntrysMap = orgService.getDictEntries(99);
        for (String code : resultMap.keySet()) {
            if (null != dictEntrysMap.get(code)) {
                resap.put(dictEntrysMap.get(code).toString(), resultMap.get(code));
            } else {
                resap.put(code, resultMap.get(code));
            }
        }
        envelop.setSuccessFlg(true);
        envelop.setObj(resap);
        return envelop;
    }
    /**
     * 根据指定字段分组统计
     *
     * @param facetField 分组字段名
     * @param fq 筛选条件
     * @param fq         筛选条件
     * @return
     * @throws Exception
     */
@@ -82,7 +217,7 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
        List<FacetField.Count> facetCountList = facetResult.getValues();
        List<String> nameList = new ArrayList<>();
        List<Long> valList = new ArrayList<>();
        for(FacetField.Count item : facetCountList) {
        for (FacetField.Count item : facetCountList) {
            nameList.add(item.getName());
            valList.add(item.getCount());
        }
@@ -92,31 +227,9 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
        return result;
    }
    @ApiOperation("当月相关数据")
    @RequestMapping(value = "/statistics/{position}", method = RequestMethod.POST)
    public Envelop statistics(
            @ApiParam(name = "core", value = "集合", required = true)
            @RequestParam(value = "core") String core,
            @ApiParam(name = "position", value = "位置参数1,2,3,4", required = true)
            @PathVariable(value = "position") String position) throws Exception {
        if (position.equals("1")) {
            return emergencyRoom(core);
        }else if(position.equals("2")){
            return hundredPeople(core);
        }else if(position.equals("3")){
            return emergency(core);
        }else if(position.equals("4")) {
            return referral(core);
        }else {
            Envelop envelop = new Envelop();
            envelop.setSuccessFlg(false);
            envelop.setErrorMsg("参数：" + position + "，有误！");
            return envelop;
        }
    }
    /**
     * 本月门急诊人次
     *
     * @return
     */
    private Envelop emergencyRoom(String core) throws Exception {
@@ -143,6 +256,7 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
    /**
     * 本月每百门急诊入院人数
     *
     * @param core
     * @return
     * @throws Exception
@@ -180,6 +294,7 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
    /**
     * 本月急诊总人次数
     *
     * @return
     */
    private Envelop emergency(String core) throws Exception {
@@ -231,116 +346,6 @@ public class SolrStatisticsEndPoint extends EnvelopRestEndPoint {
        return envelop;
    }
    @ApiOperation("医院门急诊人次分布")
    @RequestMapping(value = "/statistics/monthDistribution", method = RequestMethod.POST)
    public Envelop monthDistribution(
            @ApiParam(name = "core", value = "集合", required = true)
            @RequestParam(value = "core") String core,
            @ApiParam(name = "year", value = "年份", required = true)
            @RequestParam(value = "year") int year) throws Exception {
        Envelop envelop = new Envelop();
        Calendar calendar = Calendar.getInstance();
        int nowYear = calendar.get(Calendar.YEAR);
        if(nowYear > year) {
            calendar.set(Calendar.MONTH, 11);
        }
        calendar.set(Calendar.YEAR, year);
        calendar.set(Calendar.DAY_OF_MONTH, 1);
        calendar.set(Calendar.HOUR_OF_DAY, 0);
        calendar.set(Calendar.MINUTE, 0);
        calendar.set(Calendar.SECOND, 0);
        calendar.set(Calendar.MILLISECOND, 0);
        int month = calendar.get(Calendar.MONTH) + 1;
        List<Map<String, Integer>> dataList = new ArrayList<>(month);
        for(int i = 1; i <= month; i ++) {
            String monthStr;
            if(i < 10) {
                monthStr = "0" + i;
            }else {
                monthStr = "" + i;
            }
            String start = String.format("%s-%s-01T00:00:00Z", year, monthStr);
            String end;
            DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
            calendar.set(Calendar.MONTH, i - 1);
            int day;
            if(i == month && nowYear == year) {
                Calendar calendar1 = Calendar.getInstance();
                end = dateFormat.format(calendar1.getTime());
            }else {
                day = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
                end = String.format("%s-%s-%sT23:59:59Z", year, monthStr, day);
            }
            String q = String.format("event_type:0 AND event_date:[%s TO %s]", start, end);
            Map<String, Integer> data = solr.getFacetQuery(core, q);
            data.put(monthStr, data.get(q));
            data.remove(q);
            dataList.add(data);
        }
        envelop.setSuccessFlg(true);
        envelop.setDetailModelList(dataList);
        return envelop;
    }
    @ApiOperation("本月各类医院门急诊人次")
    @RequestMapping(value = "/statistics/rescue", method = RequestMethod.POST)
    public Envelop variousTypes() throws Exception{
        Envelop envelop = new Envelop();
        Calendar calendar = Calendar.getInstance();
        int year = calendar.get(Calendar.YEAR);
        int month = calendar.get(Calendar.MONTH) + 1;
        String monthStr;
        if(month < 10) {
            monthStr = "0" + month;
        }else {
            monthStr = "" + month;
        }
        DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
        String start = String.format("%s-%s-01T00:00:00Z", year, monthStr);
        String end = dateFormat.format(calendar.getTime());
        String fq = String.format("event_type:0 AND event_date:[%s TO %s]", start, end);
        FacetField facetField = solr.getFacetField("HealthProfile", "org_code", fq, 0, 0, 1000000, false);
        List<FacetField.Count> list = facetField.getValues();
        Map<String, Long> dataMap = new HashMap<>(list.size());
        for(FacetField.Count count : list) {
            dataMap.put(count.getName(), count.getCount());
        }
        Map<String, Long> resultMap = new HashMap<>();
        for(String code : dataMap.keySet()) {
            String level = orgService.getLevel(code);
            if(!StringUtils.isEmpty(level)) {
                if(resultMap.containsKey(level)) {
                    long count = resultMap.get(level) + dataMap.get(code);
                    resultMap.put(level, count);
                }else {
                    resultMap.put(level, dataMap.get(code));
                }
            }else {
                if(resultMap.containsKey("9")) {
                    long count = resultMap.get("9") + dataMap.get(code);
                    resultMap.put("9", count);
                }else {
                    resultMap.put("9", dataMap.get(code));
                }
            }
        }
        Map<String, Object> resap = new HashMap<>();
        // dictId=99 (医院等级)
        Map<String,Object> dictEntrysMap = orgService.getDictEntries(99);
        for(String code : resultMap.keySet()) {
            if(null != dictEntrysMap.get(code)){
                resap.put(dictEntrysMap.get(code).toString(),resultMap.get(code));
            }else{
                resap.put(code,resultMap.get(code));
            }
        }
        envelop.setSuccessFlg(true);
        envelop.setObj(resap);
        return envelop;
    }
    // 获取当月第一天日期（精确到00:00:00）
    private String getCurrMonthFirstDay() {
        Calendar calendar = Calendar.getInstance();

src/main/java/com/yihu/quota/etl/extract/mysql/MysqlExtract.java

@@ -24,6 +24,7 @@ import java.util.*;
/**
 * Created by janseny on 2017/7/10.
 */
@Deprecated
@Component
@Scope("prototype")
public class MysqlExtract {

src/main/java/com/yihu/quota/etl/extract/solr/SolrExtract.java

@@ -33,6 +33,7 @@ import java.util.*;
 * <p>
 * Created by janseny on 2017/7/10.
 */
@Deprecated
@Component
@Scope("prototype")
public class SolrExtract {

src/main/java/com/yihu/quota/etl/formula/AgeGroup.java

@@ -0,0 +1,44 @@
package com.yihu.quota.etl.formula;
/**
 * @author l4qiang
 */
public class AgeGroup implements Functioner {
    public static final String level_age_1_name = "0~6";
    public static final String level_age_2_name = "7~17";
    public static final String level_age_3_name = "18~40";
    public static final String level_age_4_name = "41~65";
    public static final String level_age_5_name = ">65";
    public static final String level_age_6_name = "其他";
    private static final String level_age_1 = "1";
    private static final String level_age_2 = "2";
    private static final String level_age_3 = "3";
    private static final String level_age_4 = "4";
    private static final String level_age_5 = "5";
    private static final String level_age_6 = "6";
    private static final int AGE_6 = 6;
    private static final int AGE_17 = 17;
    private static final int AGE_40 = 40;
    private static final int AGE_65 = 65;
    @Override
    public String execute(Object... args) {
        if (args.length == 0) {
            return level_age_6;
        }
        int age = (int) args[0];
        if (age <= AGE_6) {
            return level_age_1;
        } else if (age <= AGE_17) {
            return level_age_2;
        } else if (age <= AGE_40) {
            return level_age_3;
        } else if (age < AGE_65) {
            return level_age_4;
        } else {
            return level_age_5;
        }
    }
}

src/main/java/com/yihu/quota/etl/formula/Day.java

@@ -0,0 +1,21 @@
package com.yihu.quota.etl.formula;
import java.util.Calendar;
import java.util.Date;
/**
 * @author l4qiang
 */
public class Day implements Functioner {
    @Override
    public Integer execute(Object... args) {
        if (args.length == 0) {
            return 0;
        }
        Date date = (Date) args[0];
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        return calendar.get(Calendar.DAY_OF_MONTH);
    }
}

src/main/java/com/yihu/quota/etl/formula/Days.java

@@ -0,0 +1,25 @@
package com.yihu.quota.etl.formula;
import java.time.Duration;
import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Date;
/**
 * @author l4qiang
 */
public class Days implements Functioner {
    @Override
    public Long execute(Object... args) {
        if (args.length < 2) {
            return 0L;
        }
        Date start = (Date) args[0];
        LocalDate startLocalDate = start.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
        Date end = (Date) args[1];
        LocalDate endLocalDate = end.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
        Duration duration = Duration.between(endLocalDate, startLocalDate);
        return Math.abs(duration.toDays());
    }
}

src/main/java/com/yihu/quota/etl/formula/Division.java

@@ -0,0 +1,21 @@
package com.yihu.quota.etl.formula;
/**
 * @author l4qiang
 */
public class Division implements Functioner {
    @Override
    public String execute(Object... args) {
        if (args.length < 2) {
            return "";
        }
        String orgCode = (String) args[0];
        String level = (String) args[1];
        String divisonCode = "";
        return divisonCode;
    }
}

src/main/java/com/yihu/quota/etl/formula/Functioner.java

@@ -0,0 +1,8 @@
package com.yihu.quota.etl.formula;
/**
 * @author l4qiang
 */
public interface Functioner {
    Object execute(Object... args);
}

src/main/java/com/yihu/quota/etl/formula/Month.java

@@ -0,0 +1,21 @@
package com.yihu.quota.etl.formula;
import java.util.Calendar;
import java.util.Date;
/**
 * @author l4qiang
 */
public class Month implements Functioner {
    @Override
    public Integer execute(Object... args) {
        if (args.length == 0) {
            return 0;
        }
        Date date = (Date) args[0];
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        return calendar.get(Calendar.MONTH);
    }
}

src/main/java/com/yihu/quota/etl/formula/Year.java

@@ -0,0 +1,21 @@
package com.yihu.quota.etl.formula;
import java.util.Calendar;
import java.util.Date;
/**
 * @author l4qiang
 */
public class Year implements Functioner {
    @Override
    public Integer execute(Object... args) {
        if (args.length == 0) {
            return 0;
        }
        Date date = (Date) args[0];
        Calendar calendar = Calendar.getInstance();
        calendar.setTime(date);
        return calendar.get(Calendar.YEAR);
    }
}

src/main/java/com/yihu/quota/feign/RsDictClient.java

@@ -0,0 +1,30 @@
package com.yihu.quota.feign;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.quota.contants.MicroServiceApi;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.netflix.feign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import springfox.documentation.annotations.ApiIgnore;
/**
 * @author l4qiang
 */
@FeignClient(name = MicroServiceApi.Service.RESOURCE)
@RequestMapping(value = ApiVersion.Version1_0)
@ApiIgnore
public interface RsDictClient {
    @RequestMapping(value = MicroServiceApi.Resource.DICT_ENTRY, method = RequestMethod.GET)
    @ApiOperation(value = "根据code从缓存获取字典项值")
    String getCacheValue(
            @ApiParam(name = "dict") @RequestParam(value = "dict") String dict,
            @ApiParam(name = "code") @RequestParam(value = "code") String code);
    @RequestMapping(value = MicroServiceApi.Resource.DICT_ENTRY, method = RequestMethod.DELETE)
    @ApiOperation(value = "清空缓存字典项")
    void deleteCacheValue(
            @ApiParam(name = "dict") @RequestParam(value = "dict") String dict);
}

src/main/java/com/yihu/quota/service/quota/DeviceService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.quota;
package com.yihu.quota.service.quota.special;
import com.yihu.ehr.query.common.model.DataList;
import com.yihu.ehr.query.services.DBQuery;

src/main/java/com/yihu/quota/service/quota/HbaseService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.quota;
package com.yihu.quota.service.quota.special;
import com.yihu.ehr.hbase.HBaseDao;
import com.yihu.ehr.profile.core.ResourceCore;

src/main/java/com/yihu/quota/service/quota/SolrStatistsService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.quota;
package com.yihu.quota.service.quota.special;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.profile.core.ResourceCore;

src/main/java/com/yihu/quota/service/quota/StatisticsService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.quota;
package com.yihu.quota.service.quota.special;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/quota/util/QuartzHelper.java

@@ -98,7 +98,9 @@ public class QuartzHelper {
                withIdentity("job-id:" + id, "job-group:" + id)
                .build();
        JobDataMap jobDataMap = job.getJobDataMap();
        if (null != params) jobDataMap.putAll(params);
        if (null != params) {
            jobDataMap.putAll(params);
        }
        SimpleTrigger trigger = TriggerBuilder.newTrigger().withIdentity("trigger-id:" + id, "group-group:" + id)
                .startAt(time)