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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/device/PatientDeviceService.java

@@ -827,30 +827,33 @@ public class PatientDeviceService extends BaseService {
            json.put("labelType",labelInfo.getLabelType());
            jsonArray.add(json);
        });
        switch (patient.getDiseaseCondition()){
            case 0:
                com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject();
                json1.put("label","0");
                json1.put("labelName","绿标");
                json1.put("labelType","99");
                jsonArray.add(json1);
                break;
            case 1:
                com.alibaba.fastjson.JSONObject json2 = new com.alibaba.fastjson.JSONObject();
                json2.put("label",1);
                json2.put("labelName","黄标");
                json2.put("labelType","99");
                jsonArray.add(json2);
                break;
            case 2:
                com.alibaba.fastjson.JSONObject json3 = new com.alibaba.fastjson.JSONObject();
                json3.put("label",2);
                json3.put("labelName","红标");
                json3.put("labelType","99");
                jsonArray.add(json3);
                break;
            default:break;
        if(patient.getDiseaseCondition()!=null){
            switch (patient.getDiseaseCondition()){
                case 0:
                    com.alibaba.fastjson.JSONObject json1 = new com.alibaba.fastjson.JSONObject();
                    json1.put("label","0");
                    json1.put("labelName","绿标");
                    json1.put("labelType","99");
                    jsonArray.add(json1);
                    break;
                case 1:
                    com.alibaba.fastjson.JSONObject json2 = new com.alibaba.fastjson.JSONObject();
                    json2.put("label",1);
                    json2.put("labelName","黄标");
                    json2.put("labelType","99");
                    jsonArray.add(json2);
                    break;
                case 2:
                    com.alibaba.fastjson.JSONObject json3 = new com.alibaba.fastjson.JSONObject();
                    json3.put("label",2);
                    json3.put("labelName","红标");
                    json3.put("labelType","99");
                    jsonArray.add(json3);
                    break;
                default:break;
            }
        }
        jsonObject.put("labelList",jsonArray);
        //个人信息
        jsonObject.put("sex",patient.getSex());//性別，1男，2女