家人关系代码修改

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/family/FamilyMemberService.java

@@ -233,6 +233,14 @@ public class FamilyMemberService extends BaseService {
            return -3;
        }
        if (relation>0&&relation < 5) {
            List<PatientFamilyMember> familyMembers = memberDao.findByPatientAndFamilyRelation(patient, relation);
            if (familyMembers != null && familyMembers.size() > 0) {
                return -5;
            }
        }
        fm.setFamilyRelation(relation);
        fm.setCzrq(new Date());
@@ -1078,6 +1086,7 @@ public class FamilyMemberService extends BaseService {
        }
        fm.setFamilyRelation(relation);
        fm.setCzrq(new Date());
        fm.setIsAuthorize(1);//默认授权
        // 添加对方与自己的关系
        PatientFamilyMember fmt = memberDao.findByPatientAndFamilyMember(member, patient);
@@ -1093,6 +1102,7 @@ public class FamilyMemberService extends BaseService {
        int relationTrans = familyRelationTrans(p, relation);
        fmt.setFamilyRelation(relationTrans);
        fmt.setCzrq(new Date());
        fmt.setIsAuthorize(1);//默认授权
        memberDao.save(fm);
        memberDao.save(fmt);
@@ -1101,7 +1111,7 @@ public class FamilyMemberService extends BaseService {
    }
    @Transactional
    public int sendWXTemp(String patient, String member, String access_token, int relation) {
    public int sendWXTemp(String patient, String member, String access_token, int relation, String reAdd) {
        Patient p = patientDao.findByCode(patient);
        Patient m = patientDao.findByCode(member);
@@ -1114,17 +1124,28 @@ public class FamilyMemberService extends BaseService {
            return -2;
        }
        if(StringUtils.isEmpty(reAdd)){
        List<PatientFamilyTemp> temps =  patientFamilyTempDao.findByDealerAndPatientAndState(member,patient,"0");
            List<PatientFamilyTemp> temps =  patientFamilyTempDao.findByDealerAndPatientAndState(member,patient,"0");
            if(temps!=null&&temps.size()>0){
                return -3;
            }
            // 添加自己与对方的关系
            PatientFamilyMember fm = memberDao.findByPatientAndFamilyMember(patient, member);
            // 家庭关系已存在时，不重复添加
            if (fm != null) {
                return -4;
            }
            if (relation>0&&relation < 5) {
                List<PatientFamilyMember> familyMembers = memberDao.findByPatientAndFamilyRelation(patient, relation);
                if (familyMembers != null && familyMembers.size() > 0) {
                    return -5;
                }
            }
        if(temps!=null&&temps.size()>0){
            return -3;
//            for(PatientFamilyTemp temp : temps){
//                temp.setUpdateTime(new Date());
//                temp.setState("0");
//                patientFamilyTempDao.save(temp);
//            }
        }else{
            PatientFamilyTemp temp = new PatientFamilyTemp();
            temp.setState("0");
            temp.setCzrq(new Date());
@@ -1135,8 +1156,8 @@ public class FamilyMemberService extends BaseService {
            temp.setFamilyRelation(relation);
            //
            patientFamilyTempDao.save(temp);
        }
        }
        JSONObject json = new JSONObject();
        json.put("first", m.getName() + ",您好！" + p.getName() + "向您发起添加家人申请，添加成功后，对方可使用您的账号，为您处理各类健康服务。");
        json.put("keyword1", "添加家人申请");

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -1,5 +1,7 @@
package com.yihu.wlyy.web.patient.family;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.repository.patient.PatientFamilyMemberDao;
import com.yihu.wlyy.service.app.family.FamilyMemberService;
import com.yihu.wlyy.util.MD5;
@@ -27,6 +29,8 @@ public class FamilyMemberController extends WeixinBaseController {
    FamilyMemberService familyMemberService;
    @Autowired
    PatientFamilyMemberDao familyMemberDao;
    @Autowired
    PatientDao patientDao;
    /**
     * 添加成员
@@ -103,6 +107,8 @@ public class FamilyMemberController extends WeixinBaseController {
                return error(-1, "该成员未注册");
            } else if (result == -3) {
                return error(-1, "与该成员的关系不存在");
            } else if(result==-5){
                return error(-1, "该家庭关系已存在成员");
            } else {
                return write(200, "更新成功");
            }
@@ -229,7 +235,11 @@ public class FamilyMemberController extends WeixinBaseController {
            }
            JSONObject json = familyMemberService.isAuthorize(patient,familyMember);
            if(json==null){
                return error(-1,"未授权");
                Patient member = patientDao.findByCode(familyMember);
                JSONObject jsonObject = new JSONObject();
                jsonObject.put("code", member.getCode());
                jsonObject.put("name", member.getName());
                return write(1,"未授权","data", json);
            }
            return write(200, "查询成功", "data", json);
@@ -396,11 +406,19 @@ public class FamilyMemberController extends WeixinBaseController {
        }
    }
    /**
     *
     * @param member
     * @param relation
     * @param reAdd 重新添加标志
     * @return
     */
    @RequestMapping(value = "/sendWXTemp", method = RequestMethod.POST)
    @ApiOperation(value = "发送微信模板")
    public String sendWXTemp(@RequestParam("member")String member,@RequestParam("relation")int relation){
    public String sendWXTemp(@RequestParam("member")String member,@RequestParam("relation")int relation
                ,@RequestParam(value = "reAdd", required = false) String reAdd){
        try {
            int result = familyMemberService.sendWXTemp(getUID(),member,getAccessToken(),relation);
            int result = familyMemberService.sendWXTemp(getUID(),member,getAccessToken(),relation,reAdd);
            //int result = familyMemberService.sendWXTemp("d682497b7552459797145b6cd63f0ef5",member,getAccessToken(),relation);
            if(result==-1){
                return error(-1, "居民信息查询失败");
@@ -408,6 +426,10 @@ public class FamilyMemberController extends WeixinBaseController {
                return error(-1, "该成员未注册");
            }else if(result ==-3){
                return error(-1, "申请已经提交");
            }else if (result == -4) {
                return error(-1, "该家庭成员已存在");
            }else if(result==-5){
                return error(-1, "该家庭关系已存在成员");
            }else {
                return write(200, "发送成功");
            }