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

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

@@ -188,7 +188,9 @@ public class PortraitController extends BaseController {
            returnjo.put("data",return1);
            String name=getNameAgeByKey(value,return1);
            System.out.println("name==="+name);
            returnjo.put("message",name);
            System.out.println("returnjo==="+returnjo.toString());
//            List<SystemDict> systemDicts = systemDictService.getDictByDictName(name);
//            if(systemDicts!=null&&systemDicts.size()==1){
//                returnjo.put("message",systemDicts.get(0).getValue());//文字
@@ -204,7 +206,7 @@ public class PortraitController extends BaseController {
    private String getNameAgeByKey(String value,JSONObject return1) {
//        DecimalFormat df   = new DecimalFormat("######0.00");
//
//        String message="针对全市区域高血压患者年龄段分布情况来看，高血压患者主要集中在{big}，" +
        String message="针对全市区域{disease}患者年龄段分布情况来看，{disease}患者主要集中在{big}岁。" ;
//                "{Big65}%{disease}患者在65岁以上，" +
//                "{between40_65}%{disease}患者在40-65岁，" +
//                "{between20_40}%{disease}患者在20-40岁，" +
@@ -231,12 +233,14 @@ public class PortraitController extends BaseController {
//        }
        switch (value){
            case "高血压":{
//                message=message.replace("{disease}","高血压");
                return "针对全市区域高血压患者年龄段分布情况来看,高血压患者主要集中在40-65岁。根据区域性别分布比例来看，女性高血压患病几率较高。";
                message=message.replace("{disease}","高血压");
                message=message.replace("{big}","65岁以上");
                return message;
            }
            case "糖尿病":{
//                message=message.replace("{disease}","糖尿病");
                return "针对全市区域糖尿病患者年龄段分布情况来看,糖尿病患者主要集中在40-65岁。根据区域性别分布比例来看，女性糖尿病患病几率较高。";
                message=message.replace("{disease}","糖尿病");
                message=message.replace("{big}","40-65岁");
                return message;
            }
        }
        return "";
@@ -276,11 +280,12 @@ public class PortraitController extends BaseController {
    private String getNameSexByKey(String value,JSONObject return1) {
        DecimalFormat df   = new DecimalFormat("######0.00");
        String message="根据区域性别分布比例来看，{sex}性{disease}患病几率较高，分别是男性患糖尿病比例为{arg1}%，女性患糖尿病比例为{arg2}%。";
//        String message="根据区域性别分布比例来看，{sex}性{disease}患病几率较高，分别是男性患糖尿病比例为{arg1}%，女性患糖尿病比例为{arg2}%。";
        String message="根据区域性别分布比例来看，{sex}性{disease}患病几率较高。";
        Double boy=return1.getDouble("男");
        Double girl=return1.getDouble("女");
        message=message.replace("{arg1}",df.format(boy*100));
        message=message.replace("{arg2}",df.format(girl*100));
//        message=message.replace("{arg1}",df.format(boy*100));
//        message=message.replace("{arg2}",df.format(girl*100));
        if(boy>girl){
            message=message.replace("{sex}","男");
        }else{