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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/family/FamilyMemberEndpoint.java

@@ -99,13 +99,22 @@ public class FamilyMemberEndpoint extends EnvelopRestEndpoint {
            @RequestParam("name") String name,
            @ApiParam(name = "idcard",value = "老人身份证")
            @RequestParam("idcard") String idcard,
            @RequestParam(value = "relation",defaultValue = "0") Integer relation) {
            @RequestParam(value = "relation",defaultValue = "0") Integer relation,
            /**********注册流程绑定监护老人时传  补充当前家属信息************/
            @ApiParam(name = "relativesName",value = "家属本人姓名")
            @RequestParam(value = "relativesName",required = false) String relativesName,
            @ApiParam(name = "relativesIdcard",value = "家属本人身份证")
            @RequestParam(value = "relativesIdcard",required = false) String relativesIdcard,
            @ApiParam(name = "relativesSex",value = "家属本人性别")
            @RequestParam(value = "relativesSex",required = false) String relativesSex
            /**********************/) {
        try {
            if (StringUtils.isEmpty(relatives)) {
                return failed("当前用户信息错误",-1);
            }
            JSONObject result = familyMemberService.addOlderByRelatives(relatives,name,idcard,relation);
            JSONObject result = familyMemberService.addOlderByRelatives(relatives,name,idcard,relation,relativesName,relativesIdcard,relativesSex);
            if (result.getInteger(ResponseContant.resultFlag)==ResponseContant.success){
                return success("添加成功");
            }else {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/family/PatientFamilyMemberService.java

@@ -221,9 +221,33 @@ public class PatientFamilyMemberService extends BaseJpaService<BasePatientFamily
        return 1;
    }
    public JSONObject addOlderByRelatives(String relatives,String name,String idcard,Integer relation) throws Exception {
    public JSONObject addOlderByRelatives(String relatives,String name,String idcard,Integer relation,String relativesName,String relativesIdcard,String relativesSex) throws Exception {
        JSONObject result = new JSONObject();
        BasePatientDO patientDO = patientDao.findById(relatives);
        boolean register=false;
        if (StringUtils.isNotBlank(relativesName)){
            patientDO.setName(relativesName);
            register=true;
        }
        if (StringUtils.isNotBlank(relativesIdcard)){
            BasePatientDO tmp = patientDao.findByIdcard(relativesIdcard);
            if (null != tmp){
                result.put(ResponseContant.resultFlag,ResponseContant.fail);
                result.put(ResponseContant.resultMsg,"身份证已存在！");
                return result;
            }
            patientDO.setIdcard(relativesIdcard);
            register=true;
        }
        if (StringUtils.isNotBlank(relativesSex)){
            patientDO.setSex(Integer.parseInt(relativesSex));
            register=true;
        }
        if (register){
            patientDO = patientDao.save(patientDO);
        }
        if (null == patientDO){
            result.put(ResponseContant.resultFlag,ResponseContant.fail);
            result.put(ResponseContant.resultMsg,"当前用户信息不存在");