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

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

@@ -46,8 +46,8 @@ public class DiseaseController extends BaseController {
            diseaseService.getResidentEventListJson(strSSID,patientCode);
            return success("成功");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
@@ -67,8 +67,8 @@ public class DiseaseController extends BaseController {
            diseaseService.GetRecordListByCatalogcodesJson(strSSID,patientCode);
            return success("成功");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
@@ -91,8 +91,8 @@ public class DiseaseController extends BaseController {
            });
            return write(200, "获取列表成功！", "list", ja);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
@@ -113,8 +113,8 @@ public class DiseaseController extends BaseController {
            });
            return write(200, "获取列表成功！", "list", ja);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
}

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

@@ -33,8 +33,8 @@ public class SuggestController extends BaseController {
            Map<String, List<Suggest>> patientInfo = suggestService.getPatientSuggest(patientCode);
            return write(200, "获取成功！", "suggest", patientInfo);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
}

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

@@ -30,20 +30,20 @@ public class PatientController extends BaseController {
    public String getPatientInfo(
            @ApiParam(name = "patientCode", value = "患者code", required = true) @RequestParam(value = "patientCode", required = true) String patientCode) {
        try {
            PatientInfo patientInfo= patientInfoService.getPatientInfo(patientCode);
            JSONObject jsonObject=new JSONObject();
            jsonObject.put("name",patientInfo.getName());
            jsonObject.put("sex",patientInfo.getSex());
            PatientInfo patientInfo = patientInfoService.getPatientInfo(patientCode);
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("name", patientInfo.getName());
            jsonObject.put("code", patientInfo.getCode());
            jsonObject.put("sex", patientInfo.getSex());
            jsonObject.put("age", DateUtil.getAgeByBirthday(patientInfo.getBirthday()));
            jsonObject.put("userPortraits",patientInfo.getUserPortraits());
            jsonObject.put("suggests",patientInfo.getSuggests());
            jsonObject.put("userPortraits", patientInfo.getUserPortraits());
            jsonObject.put("suggests", patientInfo.getSuggests());
            return write(200, "获取成功！", "patient", jsonObject);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
}

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

@@ -46,20 +46,20 @@ public class PortraitController extends BaseController {
        }
    }
    @ApiOperation(value = " 根据标签ID查找标签信息")
    @RequestMapping(value = "findPortraitById", method = RequestMethod.GET)
    @RequestMapping(value = "/findPortraitById", method = RequestMethod.GET)
    public String findPortraitById(
            @ApiParam(name = "id", value = "标签id", required = true) @RequestParam(value = "id", required = true) Long id) {
        try {
            UserPortrait up= portraitService.findPortraitById(id);
            return success("成功");
            return write(200, "获取成功！", "data", up);
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
            e.printStackTrace();
            return error(-1, e.getMessage());
        }
    }
    @ApiOperation(value = "获取疾病-所在区域")
    @RequestMapping(value = "getPortraits1002001", method = RequestMethod.GET)
    @RequestMapping(value = "getPortraitsTown", method = RequestMethod.GET)
    public String getPortraits1002001(
            @ApiParam(name = "value", value = "疾病名称(糖尿病，高血压)", required = true) @RequestParam(value = "value", required = true) String value) {
        try {
@@ -79,7 +79,7 @@ public class PortraitController extends BaseController {
    }
    @ApiOperation(value = "获取疾病-所在年龄")
    @RequestMapping(value = "getPortraits1002003", method = RequestMethod.GET)
    @RequestMapping(value = "getPortraitsAge", method = RequestMethod.GET)
    public String getPortraits1002003(
            @ApiParam(name = "value", value = "疾病名称(糖尿病，高血压)", required = true) @RequestParam(value = "value", required = true) String value) {
        try {
@@ -99,7 +99,7 @@ public class PortraitController extends BaseController {
    }
    @ApiOperation(value = "获取疾病-所在性别")
    @RequestMapping(value = "getPortraits1001001", method = RequestMethod.GET)
    @RequestMapping(value = "getPortraitsSex", method = RequestMethod.GET)
    public String getPortraits1001001(
            @ApiParam(name = "value", value = "疾病名称(糖尿病，高血压)", required = true) @RequestParam(value = "value", required = true) String value) {
        try {