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

patient-co/patient-co-statistics-es/pom.xml

@@ -445,10 +445,6 @@
            <groupId>com.yihu</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.yihu</groupId>
            <artifactId>common-entity</artifactId>
        </dependency>
        <dependency>
            <groupId>com.alibaba</groupId>
            <artifactId>fastjson</artifactId>

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DiseaseAndAgeConvert.java

@@ -3,6 +3,7 @@ package com.yihu.wlyy.statistics.etl.convert.wlyy;
import com.yihu.wlyy.entity.dimension.WlyyDimensionQuota;
import com.yihu.wlyy.statistics.etl.convert.Convert;
import com.yihu.wlyy.statistics.etl.convert.wlyy.model.HealthLable;
import com.yihu.wlyy.statistics.util.IdCardUtil;
import com.yihu.wlyy.statistics.vo.DataModel;
import org.springframework.beans.BeanUtils;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
@@ -24,7 +25,7 @@ public class DiseaseAndAgeConvert implements Convert {
        List<DataModel> returnList = new ArrayList<>();
        Map<String, List<String>> healthLablesMap = new HashMap<>();//key是患者code value是患者标签 1高血压 2糖尿病 3 65岁以上
        //初始化标签Map
        initHealthLabesMap(jdbcTemplate, healthLablesMap);
        initHealthLabesMap(jdbcTemplate, healthLablesMap,oneList);
        //把标签Map设置到对应的维度里面
        for (DataModel dataModel : oneList) {
            List<String> labels = healthLablesMap.get(dataModel.getPatient());
@@ -44,7 +45,7 @@ public class DiseaseAndAgeConvert implements Convert {
        return returnList;
    }
    private void initHealthLabesMap(JdbcTemplate jdbcTemplate, Map<String, List<String>> healthLablesMap) {
    private void initHealthLabesMap(JdbcTemplate jdbcTemplate, Map<String, List<String>> healthLablesMap, List<DataModel> oneList) {
        //得到患者的疾病标签（只要高血压 糖尿病）
        String sql = "SELECT " +
                "  spli.label AS health_lable, " +
@@ -65,23 +66,16 @@ public class DiseaseAndAgeConvert implements Convert {
            healthLablesMap.put(one.getPatient(), labels);
        });
        //-得到患者的老年人标签
        sql = " SELECT " +
                "  spli.label AS health_lable, " +
                "  spli.patient " +
                " FROM " +
                "  wlyy_sign_patient_label_info spli " +
                " WHERE " +
                "  spli.label_type = '1' " +
                " AND spli. STATUS = '1' " +
                " AND spli.label = 3 ";
        healthLables = jdbcTemplate.query(sql, new BeanPropertyRowMapper(HealthLable.class));
        healthLables.stream().forEach(one -> {
            List<String> labels = healthLablesMap.get(one.getPatient());
            if (labels == null) {
                labels = new ArrayList<String>();
        oneList.stream().forEach(one->{
            int age = IdCardUtil.getAgeForIdcard(one.getIdcard());
            if(age>=65){
                List<String> labels = healthLablesMap.get(one.getPatient());
                if (labels == null) {
                    labels = new ArrayList<String>();
                }
                labels.add(one.getHealthLable());
                healthLablesMap.put(one.getPatient(), labels);
            }
            labels.add(one.getHealthLable());
            healthLablesMap.put(one.getPatient(), labels);
        });
    }
}

patient-co/patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/etl/mycache/CachePool.java

@@ -345,7 +345,7 @@ public class CachePool {
            model = new RenewCacheModel();
            String sql=" select fr.sign_code code,fr.hospital ,fr.admin_team_id ,fr.patient " +
            String sql=" select fr.sign_code code,fr.hospital ,fr.admin_team_id ,fr.patient,fr.idcard " +
                    "   from wlyy_sign_family_renew_log fr " +
                    "   where " +
                    "   fr.apply_date<'"+ date + Constant.quota_date_last+"' " +

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

@@ -147,7 +147,7 @@ public class CurrentDayAllQuotaJob implements Job {
     */
    public Map<String,Object> getCityRenewTotals(){
        try{
            String sql=" select fr.sign_code code,fr.old_hospital hospital,fr.old_admin_team_id admin_team_id ,fr.patient " +
            String sql=" select fr.sign_code code,fr.old_hospital hospital,fr.old_admin_team_id admin_team_id ,fr.patient,fr.idcard " +
                    " from wlyy_sign_family_renew_log fr " +
                    " where  " +
                    " fr.apply_date<'"+ tomorrow+"' and " +