Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/care/label/BaseCapacityLabelDO.java

@@ -7,7 +7,9 @@ import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
 * 能力状况记录表
@@ -168,56 +170,157 @@ public class BaseCapacityLabelDO extends UuidIdentityEntityWithCreateTime {
    }
    @Transient
    public List<String> getCapacityLabels(){
        List<String> list = new ArrayList<>();
    public List<Map<String,Object>> getCapacityLabels(){
        List<Map<String,Object>> list = new ArrayList<>();
        Map<String,Object> tmp = new HashMap<>();
        if ("1".equals(hypertension)){
            list.add("高血压:是");
            tmp = new HashMap<>();
            tmp.put("txt","高血压:是");
            tmp.put("value",hypertension);
            tmp.put("code","hypertension");
            list.add(tmp);
        }
        if ("1".equals(hyperglycemia)){
            list.add("高血糖:是");
            tmp = new HashMap<>();
            tmp.put("txt","高血糖:是");
            tmp.put("value",hyperglycemia);
            tmp.put("code","hyperglycemia");
            list.add(tmp);
        }
        if ("1".equals(hyperglycemia)){
            list.add("心脏疾病:是");
        if ("1".equals(heartDisease)){
            tmp = new HashMap<>();
            tmp.put("txt","心脏疾病:是");
            tmp.put("value",heartDisease);
            tmp.put("code","heartDisease");
            list.add(tmp);
        }
        if(null!=workStatus){
            switch (workStatus){
                case "1":list.add("行走状态:迟缓");break;
                case "2":list.add("行走状态:一般");break;
                case "3":list.add("行走状态:健步如飞");break;
                case "1":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:迟缓");
                    tmp.put("value",workStatus);
                    tmp.put("code","workStatus");
                    list.add(tmp);
                    break;
                case "2":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:一般");
                    tmp.put("value",workStatus);
                    tmp.put("code","workStatus");
                    list.add(tmp);
                    break;
                case "3":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:健步如飞");
                    tmp.put("value",workStatus);
                    tmp.put("code","workStatus");
                    list.add(tmp);
                    break;
            }
        }
        if(null!=visualCondition){
            switch (visualCondition){
                case "1":list.add("视觉状况:看不见");break;
                case "2":list.add("视觉状况:近距离");break;
                case "3":list.add("视觉状况:正常");break;
                case "1":
                    tmp = new HashMap<>();
                    tmp.put("txt","视觉状况:看不见");
                    tmp.put("value",visualCondition);
                    tmp.put("code","visualCondition");
                    list.add(tmp);
                    break;
                case "2":
                    tmp = new HashMap<>();
                    tmp.put("txt","视觉状况:近距离");
                    tmp.put("value",visualCondition);
                    tmp.put("code","visualCondition");
                    list.add(tmp);
                    break;
                case "3":
                    tmp = new HashMap<>();
                    tmp.put("txt","视觉状况:正常");
                    tmp.put("value",visualCondition);
                    tmp.put("code","visualCondition");
                    list.add(tmp);
                    break;
            }
        }
        if(null!=auditoryCondition){
            switch (auditoryCondition){
                case "1":list.add("听觉状况:听不见");break;
                case "2":list.add("听觉状况:大声量");break;
                case "3":list.add("听觉状况:正常");break;
                case "1":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:迟缓");
                    tmp.put("value",auditoryCondition);
                    tmp.put("code","auditoryCondition");
                    list.add(tmp);
                    break;
                case "2":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:一般");
                    tmp.put("value",auditoryCondition);
                    tmp.put("code","auditoryCondition");
                    list.add(tmp);
                    break;
                case "3":
                    tmp = new HashMap<>();
                    tmp.put("txt","行走状态:健步如飞");
                    tmp.put("value",auditoryCondition);
                    tmp.put("code","auditoryCondition");
                    list.add(tmp);
                    break;
            }
        }
        if(null!=communication){
            switch (communication){
                case "1":list.add("交流情况:不善于");break;
                case "2":list.add("交流情况:一般");break;
                case "3":list.add("交流情况:善于");break;
                case "1":
                    tmp = new HashMap<>();
                    tmp.put("txt","交流情况:不善于");
                    tmp.put("value",communication);
                    tmp.put("code","communication");
                    list.add(tmp);
                    break;
                case "2":
                    tmp = new HashMap<>();
                    tmp.put("txt","交流情况:一般");
                    tmp.put("value",communication);
                    tmp.put("code",communication);
                    list.add(tmp);
                    break;
                case "3":
                    tmp = new HashMap<>();
                    tmp.put("txt","交流情况:善于");
                    tmp.put("value",communication);
                    tmp.put("code","communication");
                    list.add(tmp);
                    break;
            }
        }
        if ("1".equals(mentalIllness)){
            list.add("精神类疾病:是");
            tmp = new HashMap<>();
            tmp.put("txt","精神类疾病:是");
            tmp.put("value",mentalIllness);
            tmp.put("code","mentalIllness");
            list.add(tmp);
        }
        if ("1".equals(oftenGoOut)){
            list.add("经常外出:是");
            tmp = new HashMap<>();
            tmp.put("txt","经常外出:是");
            tmp.put("value",oftenGoOut);
            tmp.put("code","oftenGoOut");
            list.add(tmp);
        }
        if ("1".equals(usePhone)){
            list.add("会使用智能手机:是");
            tmp = new HashMap<>();
            tmp.put("txt","会使用智能手机:是");
            tmp.put("value",usePhone);
            tmp.put("code","usePhone");
            list.add(tmp);
        }
        if ("1".equals(takeExercise)){
            list.add("参加锻炼:是");
            tmp = new HashMap<>();
            tmp.put("txt","参加锻炼:是");
            tmp.put("value",takeExercise);
            tmp.put("code","takeExercise");
            list.add(tmp);
        }
        return list;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/third/PatientInfoPlatFormService.java

@@ -201,6 +201,7 @@ public class PatientInfoPlatFormService {
        return null;
    }
    /**
     * 大屏获取老人紧急预警、助老服务情况
     * @return
@@ -263,7 +264,7 @@ public class PatientInfoPlatFormService {
        olderService.put("unfinish",unfinish);
        olderService.put("finish",finish);
        //最近一次记录
        sql = " select o.id,p.name,p.id as patient,p.idcard,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time,GROUP_CONCAT(DISTINCT fed.name SEPARATOR '、' ) serveItems " +
        sql = " select o.id,p.name,p.id as patient,o.status,o.hospital_name hospitalName,p.idcard,DATE_FORMAT(o.create_time,'%Y-%m-%d %H:%i:%S') create_time,GROUP_CONCAT(DISTINCT fed.name SEPARATOR '、' ) serveItems " +
                " from base_life_care_order o INNER JOIN base_patient p on o.patient = p.id INNER JOIN base_life_care_fee_detail fed on o.id = fed.order_id " +
                " and fed.status<>3 where o.patient='"+patient+"' and o.`status`<>-1 and o.`status`<>0  " +
                "GROUP BY o.id ORDER BY create_time desc limit 1; ";
@@ -298,10 +299,17 @@ public class PatientInfoPlatFormService {
        healthIndex.put("warn",warnCount);
        sql = " select *,CAST(DATE_FORMAT(record_date,'%Y-%m-%d %H:%i:%S') as char) record_date, " +
                " CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
                " CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index where user='"+patient+"' and type in (1,2) ORDER BY sort_date DESC LIMIT 1 ";
                " CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index where user='"+patient+"' and type in (1) ORDER BY sort_date DESC LIMIT 1 ";
        list = jdbcTemplate.queryForList(sql);
        if (list.size()>0){
            healthIndex.put("lastXTHealthIndex",list.get(0));
        }
        sql = " select *,CAST(DATE_FORMAT(record_date,'%Y-%m-%d %H:%i:%S') as char) record_date, " +
                " CAST(DATE_FORMAT(sort_date,'%Y-%m-%d %H:%i:%S') as char) sort_date, " +
                " CAST(DATE_FORMAT(czrq,'%Y-%m-%d %H:%i:%S') as char) czrq from wlyy_patient_health_index where user='"+patient+"' and type in (2) ORDER BY sort_date DESC LIMIT 1 ";
        list = jdbcTemplate.queryForList(sql);
        if (list.size()>0){
            healthIndex.put("lastHealthIndex",list.get(0));
            healthIndex.put("lastXYHealthIndex",list.get(0));
        }
        result.put("healthIndex",healthIndex);
        return  result;