Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-statistics-es/doc/es/统计新增索引.txt

@@ -84,7 +84,7 @@ POST http://172.19.103.68:9200/wlyy_quota_test/wlyy_quota_test/_mapping
                    "index": "not_analyzed"
                },
                "result1": {
                    "type": "integer"
                    "type": "double"
                },
                "result2": {
                    "type": "integer"

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java

@@ -2,9 +2,6 @@ package com.yihu.wlyy.statistics.etl.compute;
import com.yihu.wlyy.entity.dimension.WlyyDimensionQuota;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.statistics.dao.DoctorAdminTeamDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.util.Contant;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.vo.*;
import org.springframework.beans.BeanUtils;
@@ -189,7 +186,7 @@ public class ComputeHelper {
        for (Map.Entry<String, SaveModel> one : lastMaps.entrySet()) {
            if (countMap.containsKey(one.getKey())) {
                List<DataModel> dataModels = countMap.get(one.getKey());
                Integer result1 = 0;
                Double result1 = 0.0;
                Integer result2 = 0;
                for (int j = 0; j < dataModels.size(); j++) {
                    DataModel dataModel = dataModels.get(j);

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

@@ -159,7 +159,7 @@ public class CurrentMysqlToEsQuotaJob implements Job {
                tjQuotaLog.setJobEndTime(new Date());
                tjQuotaLog.setJobContent(JSONArray.fromObject(filterModel.getErrorModels()).toString());
                saveLog(tjQuotaLog);
                logger.info("========================quotaCode:" + one.getId() + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + " start========================");
                logger.info("========================quotaCode:" + one.getId() + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + " end========================");
            } catch (Exception e) {
                e.printStackTrace();
            }

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/service/ExtractDataService.java

@@ -6,7 +6,6 @@ import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
@@ -43,7 +42,7 @@ public class ExtractDataService {
                saveModelTemp.setHospitalName(one.getOrgName());
                saveModelTemp.setTeam(one.getQkdoctorCode());
                saveModelTemp.setTeamName(one.getQkdoctorName());
                saveModelTemp.setResult1(Integer.valueOf(one.getResult()));
                saveModelTemp.setResult1(Double.valueOf(one.getResult()));
                saveModelTemp.setResult2(Integer.valueOf(one.getResult()));
                saveModelTemp.setSlaveKey1(one.getLevel2Type());
                saveModelTemp.setSlaveKey1Name(one.getLevel2TypeName());

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

@@ -21,7 +21,7 @@ public class DataModel {
    private String idcard;// 身份证
    private String serverType;//服务类型
    private String healthLable;//健康标签
    private Integer num=1;//分数 如果是累加的计算 默认是1 如果是分数从数据库拿
    private Double num=1.0;//分数 如果是累加的计算 默认是1 如果是分数从数据库拿
    public String getHealthLable() {
        return healthLable;
@@ -127,11 +127,11 @@ public class DataModel {
        this.serverType = serverType;
    }
    public Integer getNum() {
    public Double getNum() {
        return num;
    }
    public void setNum(Integer num) {
    public void setNum(Double num) {
        this.num = num;
    }

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

@@ -74,7 +74,7 @@ public class SaveModel {
    private String slaveKey4Name;
    private Integer result1 = 0;//统计结果  总的累加结果 如果是平均分 那就是总分 其他指标都是和result2一样
    private Double result1 = 0.0;//统计结果  总的累加结果 如果是平均分 那就是总分 其他指标都是和result2一样
    private Integer result2 = 0;//统计结果  次数
@@ -84,7 +84,7 @@ public class SaveModel {
    @JSONField(format = "yyyy-MM-dd'T'HH:mm:ssXX")
    private Date createTime;//创建时间
    private String timeLevel;// 1日 2年
    private String timeLevel;// 1增量 2到达量
    public Date getQuotaDate() {
        return quotaDate;
@@ -159,11 +159,11 @@ public class SaveModel {
        this.slaveKey4 = slaveKey4;
    }
    public Integer getResult1() {
    public Double getResult1() {
        return result1;
    }
    public void setResult1(Integer result1) {
    public void setResult1(Double result1) {
        this.result1 = result1;
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -1202,7 +1202,19 @@ public class StatisticsESService {
        String filesize = df.format(size);
        return Double.valueOf(filesize);
    }
    public double getRangeDouuble(Double first, int second, int i) {
        if (second == 0 && first > 0) {
            //如果分母为0 分子不为0 返回100%
            return 100;
        } else if (second == 0 && first == 0) {
            //如果分母为0 分子为0 返回0%
            return 0;
        }
        Double size = (first * 100) / second;
        DecimalFormat df = new DecimalFormat("0.00");//格式化小数，不足的补0
        String filesize = df.format(size);
        return Double.valueOf(filesize);
    }
    /**
     * 获取某个指标某一天某一level的值   到达量
     *
@@ -1222,11 +1234,11 @@ public class StatisticsESService {
        if (esModelList != null && esModelList.size() > 0) {
            esModelList.stream().forEach(one -> {
                if (lowLevel.equals("3")) {
                    returnMap.put(one.getTown(), one.getResult1());
                    returnMap.put(one.getTown(), one.getResult1().intValue());
                } else if (lowLevel.equals("2")) {
                    returnMap.put(one.getHospital(), one.getResult1());
                    returnMap.put(one.getHospital(), one.getResult1().intValue());
                } else if (lowLevel.equals("1")) {
                    returnMap.put(one.getTeam(), one.getResult1());
                    returnMap.put(one.getTeam(),one.getResult1().intValue());
                }
            });
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/quota/vo/SaveModel.java

@@ -72,7 +72,7 @@ public class SaveModel {
    private String slaveKey4Name;
    private Integer result1 = 0;//统计结果
    private Double result1 = 0.0;//统计结果
    private Integer result2 = 0;//统计结果
@@ -157,11 +157,11 @@ public class SaveModel {
        this.slaveKey4 = slaveKey4;
    }
    public Integer getResult1() {
    public Double getResult1() {
        return result1;
    }
    public void setResult1(Integer result1) {
    public void setResult1(Double result1) {
        this.result1 = result1;
    }