Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-figure/src/main/java/com/yihu/figure/controller/patient/PortraitController.java

@@ -20,6 +20,8 @@ import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.math.BigDecimal;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -95,16 +97,16 @@ public class PortraitController extends BaseController {
            for (Map.Entry<String, Integer> one : data.entrySet()) {
                if (!one.getKey().equals("allSize")) {
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 2) + "");
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 4) + "");
                }
            }
            returnjo.put("data",return1);
            String name=getNameTownByKey(value);
            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
            if(systemDicts!=null&&systemDicts.size()==1){
                returnjo.put("message",systemDicts.get(0).getValue());//文字
            }
            String name=getNameTownByKey(value,  return1);
//            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
//            if(systemDicts!=null&&systemDicts.size()==1){
//                returnjo.put("message",systemDicts.get(0).getValue());//文字
//            }
            returnjo.put("message",name);
            return write(200, "获取成功！", "data", returnjo);
        } catch (Exception e) {
            error(e);
@@ -112,13 +114,61 @@ public class PortraitController extends BaseController {
        }
    }
    private String getNameTownByKey(String value) {
    private String getNameTownByKey(String value,JSONObject return1) {
        DecimalFormat df   = new DecimalFormat("######0.00");
        String message="根据{disease}患者所在区域分布情况，{town}{disease}患者人群较高，" +
                "{disease}患者将占全市{townSize}%。重点关注{town}{disease}患者健康情况，" +
                " 需加强{disease}患者健康随访和健康指导。";
        Double haichan=return1.getDouble("海沧区");
        Double huli=return1.getDouble("湖里区");
        Double jimei=return1.getDouble("集美区");
        Double tongan=return1.getDouble("同安区");
        Double siming=return1.getDouble("思明区");
        Double xiangan=return1.getDouble("翔安区");
        if(haichan>huli&&haichan>jimei&&haichan>tongan&&haichan>siming&&haichan>xiangan){
            message=message.replace("{town}","海沧区").replace("{townSize}",df.format(haichan*100));
        }else if(huli>haichan&&
                huli>jimei&&
                huli>tongan&&
                huli>siming&&
                huli>xiangan){
            message=message.replace("{town}","湖里区").replace("{townSize}",df.format(huli*100));
        }else if(jimei>haichan&&
                jimei>huli&&
                jimei>tongan&&
                jimei>siming&&
                jimei>xiangan){
            message=message.replace("{town}","集美区").replace("{townSize}",df.format(jimei*100));
        }else if(tongan>huli&&
                tongan>jimei&&
                tongan>haichan&&
                tongan>siming&&
                tongan>xiangan){
            message=message.replace("{town}","同安区").replace("{townSize}",df.format(tongan*100));
        }else if(siming>huli&&
                siming>jimei&&
                siming>tongan&&
                siming>haichan&&
                siming>xiangan){
            message=message.replace("{town}","思明区").replace("{townSize}",df.format(siming*100));
        }else if(xiangan>huli&&
                xiangan>jimei&&
                xiangan>tongan&&
                xiangan>siming&&
                xiangan>haichan){
            message=message.replace("{town}","翔安区").replace("{townSize}",df.format(xiangan*100));
        }
        switch (value){
            case "高血压":{
                return "TOWN_GXY";
                message=message.replace("{disease}","高血压");
                return message;
            }
            case "糖尿病":{
                return "TOWN_TNB";
                message=message.replace("{disease}","糖尿病");
                return message;
            }
        }
        return "";
@@ -136,16 +186,17 @@ public class PortraitController extends BaseController {
            for (Map.Entry<String, Integer> one : data.entrySet()) {
                if (!one.getKey().equals("allSize")) {
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 2) + "");
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 4) + "");
                }
            }
            returnjo.put("data",return1);
            String name=getNameAgeByKey(value);
            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
            if(systemDicts!=null&&systemDicts.size()==1){
                returnjo.put("message",systemDicts.get(0).getValue());//文字
            }
            String name=getNameAgeByKey(value,return1);
            returnjo.put("message",name);
//            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
//            if(systemDicts!=null&&systemDicts.size()==1){
//                returnjo.put("message",systemDicts.get(0).getValue());//文字
//            }
            return write(200, "获取成功！", "data", returnjo);
        } catch (Exception e) {
@@ -154,13 +205,42 @@ public class PortraitController extends BaseController {
        }
    }
    private String getNameAgeByKey(String value) {
    private String getNameAgeByKey(String value,JSONObject return1) {
        DecimalFormat df   = new DecimalFormat("######0.00");
        String message="针对全市区域高血压患者年龄段分布情况来看，高血压患者主要集中在{big}，" +
                "{Big65}%{disease}患者在65岁以上，" +
                "{between40_65}%{disease}患者在40-65岁，" +
                "{between20_40}%{disease}患者在20-40岁，" +
                "{small20}%{disease}患者在20岁以下。";
        Double Big65=return1.getDouble("65岁以上");
        Double between40_65=return1.getDouble("40-65岁");
        Double between20_40=return1.getDouble("20-40岁");
        Double small20=return1.getDouble("20岁以下");
        message=message.replace("{Big65}",df.format(Big65*100));
        message=message.replace("{between40_65}",df.format(between40_65*100));
        message=message.replace("{between20_40}",df.format(between20_40*100));
        message=message.replace("{small20}",df.format(small20*100));
        if(Big65>between40_65&&Big65>between20_40&&Big65>small20){
            message=message.replace("{big}","65岁以上");
        }else if(between40_65>Big65&&between40_65>between20_40&&between40_65>small20){
            message=message.replace("{big}","40-65岁");
        }else if(between20_40>Big65&&between20_40>between40_65&&between20_40>small20){
            message=message.replace("{big}","20-40岁");
        }else if(small20>Big65&&small20>between40_65&&small20>between20_40){
            message=message.replace("{big}","20岁以下");
        }
        switch (value){
            case "高血压":{
                return "AGE_GXY";
                message=message.replace("{disease}","高血压");
                return message;
            }
            case "糖尿病":{
                return "AGE_TNB";
                message=message.replace("{disease}","糖尿病");
                return message;
            }
        }
        return "";
@@ -178,16 +258,18 @@ public class PortraitController extends BaseController {
            for (Map.Entry<String, Integer> one : data.entrySet()) {
                if (!one.getKey().equals("allSize")) {
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 2) + "");
                    return1.put(one.getKey(), round(one.getValue(), data.get("allSize"), 4) + "");
                }
            }
            returnjo.put("data",return1);
            String name=getNameSexByKey(value);
            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
            if(systemDicts!=null&&systemDicts.size()==1){
                returnjo.put("message",systemDicts.get(0).getValue());//文字
            }
            String name=getNameSexByKey(value,return1);
            returnjo.put("message",name);
//            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
//            if(systemDicts!=null&&systemDicts.size()==1){
//                returnjo.put("message",systemDicts.get(0).getValue());//文字
//            }
            return write(200, "获取成功！", "data", returnjo);
        } catch (Exception e) {
@@ -196,13 +278,26 @@ public class PortraitController extends BaseController {
        }
    }
    private String getNameSexByKey(String value) {
    private String getNameSexByKey(String value,JSONObject return1) {
        DecimalFormat df   = new DecimalFormat("######0.00");
        String message="根据区域性别分布比例来看，{sex}性{disease}患病几率较高，分别是男性患糖尿病比例为{arg1}%，女性患糖尿病比例为{arg2}%。";
        Double boy=return1.getDouble("男");
        Double girl=return1.getDouble("女");
        message=message.replace("{arg1}",df.format(boy*100));
        message=message.replace("{arg2}",df.format(girl*100));
        if(boy>girl){
            message=message.replace("{sex}","男");
        }else{
            message=message.replace("{sex}","女");
        }
        switch (value){
            case "高血压":{
                return "SEX_GXY";
                message=message.replace("{disease}","高血压");
                return message;
            }
            case "糖尿病":{
                return "SEX_TNB";
                message=message.replace("{disease}","糖尿病");
                return message;
            }
        }
        return "";
@@ -221,7 +316,7 @@ public class PortraitController extends BaseController {
                if (!one.getKey().equals("allSize")) {
                    JSONObject return2 = new JSONObject();
                    return2.put("count", one.getValue());
                    return2.put("scale ", round(one.getValue(), data.get("allSize"), 2) + "");
                    return2.put("scale", round(one.getValue(), data.get("allSize"), 4) + "");
                    return1.put(one.getKey(), return2);
                }
            }
@@ -229,12 +324,12 @@ public class PortraitController extends BaseController {
            returnjo.put("data",return1);//数据
            String name=getNameByKey(key);
            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
            if(systemDicts!=null&&systemDicts.size()==1){
                returnjo.put("message",systemDicts.get(0).getValue());//文字
            }
            String name=getNameByKey(key,return1);
//            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
//            if(systemDicts!=null&&systemDicts.size()==1){
//                returnjo.put("message",systemDicts.get(0).getValue());//文字
//            }
            returnjo.put("message",name);
            return write(200, "获取成功！", "data", returnjo);
        } catch (Exception e) {
            error(e);
@@ -242,13 +337,34 @@ public class PortraitController extends BaseController {
        }
    }
    private String getNameByKey(String key) {
    private String getNameByKey(String key,JSONObject return1) {
        switch (key){
            case "1":{
                return "DISEASE_MESSAGE";
                return "从居民近期疾病分析来看，高血压和糖尿病占比较高，需加强高血压和糖尿病人群健康预防和教育。";
            }
            case "2":{
                return "HEALTH_MESSAGE";
                String message=" 根据市区内居民健康状况分布情况，患病人群占比{huanbing}%，" +
                        " 恢复期人群占比{huifu}%，健康人群占比{jiankang}%。" +
                        " 从区域健康情况看{disease}占比较高，需加强{disease}健康管理和服务。";
                DecimalFormat df   = new DecimalFormat("######0.00");
                Double huanbing=return1.getJSONObject("患病人群").getDouble("scale");
                Double huifu=return1.getJSONObject("恢复期人群").getDouble("scale");
                Double jiankang=return1.getJSONObject("健康人群").getDouble("scale");
                message= message.replace("{huanbing}",df.format(huanbing*100));
                message=message.replace("{huifu}",df.format(huifu*100));
                message=message.replace("{jiankang}",df.format(jiankang*100));
                if(huanbing>huifu&&huanbing>jiankang){
                    message=message.replace("{disease}","患病人群");
                }else if(huifu>huanbing&&huifu>jiankang){
                    message=message.replace("{disease}","恢复期人群");
                }else if(jiankang>huanbing&&jiankang>huifu){
                    message=message.replace("{disease}","健康人群");
                }
                return message;
            }
        }
        return "";
@@ -270,7 +386,6 @@ public class PortraitController extends BaseController {
            }
            BigDecimal upB = new BigDecimal(up);
            BigDecimal downB = new BigDecimal(down);
            return upB.divide(downB, scale, BigDecimal.ROUND_HALF_UP).doubleValue();
        } catch (Exception e) {
            return 0;

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

@@ -248,8 +248,8 @@ public class CurrentDayAllQuotaJob implements Job {
        //得到医生的id
        Map<String, String> ids = new HashMap<>();
        ims.parallelStream().forEach(map -> {
            if (map.containsKey("id")) {
                ids.put(String.valueOf(map.get("id")), String.valueOf(map.get("id")));
            if (map.containsKey("consultId")) {
                ids.put(String.valueOf(map.get("consultId")), String.valueOf(map.get("consultId")));
            }
        });
        return ids;

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

@@ -141,7 +141,7 @@ public class NoReyConsultJob implements Job {
     * @return
     */
    public Map<String, String> getConsultIdsByIm() {
        String sql = "SELECT  t.id consultId" +
        String sql = "SELECT  t.id consultId " +
                " FROM " +
                " topics t, " +
                " participants p, " +
@@ -156,10 +156,12 @@ public class NoReyConsultJob implements Job {
        //得到医生的id
        Map<String, String> ids = new HashMap<>();
        ims.parallelStream().forEach(map -> {
            if (map.containsKey("id")) {
                ids.put(String.valueOf(map.get("id")), String.valueOf(map.get("id")));
            if (map.containsKey("consultId")) {
                ids.put(String.valueOf(map.get("consultId")), String.valueOf(map.get("consultId")));
            }
        });
        System.out.println("sql:"+sql);
        System.out.println("im num:"+ids.size());
        return ids;
    }
}