统计代码重构

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/ESExtract.java

@@ -26,7 +26,8 @@ public class ESExtract<T> {
     * @return
     */
    public List<DataModel> extract(QuartzJobConfig wlyyJobConfigVO) {
        //这边是直接查询 后面还用扩展ES 维度查询
        //扩展维度
        String sql= initSql(wlyyJobConfigVO.getSql(),wlyyJobConfigVO.getStartTime(),wlyyJobConfigVO.getEndTime());

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/EsToEsQuotaJob.java

@@ -165,10 +165,12 @@ public class EsToEsQuotaJob implements Job {
    }
    private List<SaveModel> data2save(List<DataModel> dataModels) {
        //初始化维度的数据
        Map<String,DataModel> dataModelMap=new HashMap<>();
        if(dataModels!=null){
            for(DataModel dataModel:dataModels){
                dataModelMap.put(dataModel.getAdminTeamCode(),dataModel);
                dataModelMap.put(dataModel.getTeam(),dataModel);
            }
        }

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/util/ElasticsearchUtil.java

@@ -433,7 +433,7 @@ public class ElasticsearchUtil {
                        }
                        try {
                            if (value instanceof String) {
                                DataModel.class.getMethod(key, String.class).invoke(dataModel, value);
                                 DataModel.class.getMethod(key, String.class).invoke(dataModel, value);
                            } else if (value instanceof Integer) {
                                DataModel.class.getMethod(key, Integer.class).invoke(dataModel, value);
                            } else if (value instanceof Double) {

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/vo/DataModel.java

@@ -4,6 +4,9 @@ package com.yihu.wlyy.statistics.vo;
import org.elasticsearch.common.collect.HppcMaps;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.List;
/**
 * Created by chenweida on 2017/6/1.
 */
@@ -13,7 +16,6 @@ public class DataModel {
    private String town;//区代码 350206
    private String hospital;//机构code
    private String team;//团队的code
    private String adminTeamCode;//
    private String slaveKey1;//从维度  1级维度
    private String slaveKey2;//从维度  2级维度
    private String slaveKey3;//从维度  3级维度
@@ -23,12 +25,12 @@ public class DataModel {
    private String idcard;// 身份证
    private String serverType;//服务类型
    private String healthLable;//健康标签
    private Double num=1.0;//分数 如果是累加的计算 默认是1 如果是分数从数据库拿
    private Double num = 1.0;//分数 如果是累加的计算 默认是1 如果是分数从数据库拿
    private String prescriptionCode;//处方code
    private String healthProblem;//诊断标签
    private Double result1=0.0; //从ES统计的时候的数目
    private Double result1 = 0.0; //从ES统计的时候的数目
    public String getHealthLable() {
@@ -159,6 +161,7 @@ public class DataModel {
        return null;
    }
    @Override
    public String toString() {
        return "DataModel{" +
@@ -182,7 +185,9 @@ public class DataModel {
        this.patient = patient;
    }
    public String getPrescriptionCode() { return prescriptionCode; }
    public String getPrescriptionCode() {
        return prescriptionCode;
    }
    public void setPrescriptionCode(String prescriptionCode) {
        this.prescriptionCode = prescriptionCode;
@@ -204,11 +209,4 @@ public class DataModel {
        this.result1 = result1;
    }
    public String getAdminTeamCode() {
        return adminTeamCode;
    }
    public void setAdminTeamCode(String adminTeamCode) {
        this.adminTeamCode = adminTeamCode;
    }
}