家庭关系修改

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

@@ -191,10 +191,15 @@ public class FamilyMemberService extends BaseService {
     * @param idcard 身份证号
     * @return
     */
    public JSONObject isRegister(String idcard) {
    public JSONObject isRegister(String idcard, String patient) {
        JSONObject result = new JSONObject();
        Patient p = patientDao.findByIdcard(idcard);
        if (p.getCode().equals(patient)) {
            result.put("isRegister", -1); //不能添加自己
            return result;
        }
        if (p == null) {
            result.put("isRegister", 0);
        } else {
@@ -310,7 +315,7 @@ public class FamilyMemberService extends BaseService {
                } else {
                    relationTrans = 0;
                }
                if(relationTrans == 0) {
                if (relationTrans == 0) {
                    if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("1")) {
                        relationTrans = 6;
                    } else if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("2")) {
@@ -333,7 +338,7 @@ public class FamilyMemberService extends BaseService {
                } else {
                    relationTrans = 0;
                }
                if(relationTrans == 0) {
                if (relationTrans == 0) {
                    if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("1")) {
                        relationTrans = 2;
                    } else if (IdCardUtil.getSexForIdcard(StringUtils.isEmpty(patient.getIdcard()) ? "" : patient.getIdcard()).equals("2")) {

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

@@ -35,12 +35,12 @@ public class FamilyMemberController extends BaseController {
     * @param relation 关系
     * @return
     */
    @RequestMapping(value = "/member_add",method = RequestMethod.POST)
    @RequestMapping(value = "/member_add", method = RequestMethod.POST)
    @ApiOperation(value = "添加成员")
    public String addFamilyMember(@RequestParam("member")String member,
                                  @RequestParam(value = "captcha",required = false) String captcha,
                                  @RequestParam(value = "password",required = false) String password,
                                  @RequestParam("relation")int relation) {
    public String addFamilyMember(@RequestParam("member") String member,
                                  @RequestParam(value = "captcha", required = false) String captcha,
                                  @RequestParam(value = "password", required = false) String password,
                                  @RequestParam("relation") int relation) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "添加成员不能为空");
@@ -80,9 +80,9 @@ public class FamilyMemberController extends BaseController {
     * @param relation 家庭关系
     * @return
     */
    @RequestMapping(value = "/relation_update",method = RequestMethod.POST)
    @RequestMapping(value = "/relation_update", method = RequestMethod.POST)
    @ApiOperation(value = "家庭成员关系修改")
    public String modifyFamilyRelation(@RequestParam("member")String member, @RequestParam("relation")int relation) {
    public String modifyFamilyRelation(@RequestParam("member") String member, @RequestParam("relation") int relation) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "添加成员不能为空");
@@ -114,9 +114,9 @@ public class FamilyMemberController extends BaseController {
     * @param member
     * @return
     */
    @RequestMapping(value = "/member_delete",method = RequestMethod.POST)
    @RequestMapping(value = "/member_delete", method = RequestMethod.POST)
    @ApiOperation(value = "家庭成员删除")
    public String deleteMember(@RequestParam("member")String member) {
    public String deleteMember(@RequestParam("member") String member) {
        try {
            if (StringUtils.isEmpty(member)) {
                return error(-1, "成员不能为空");
@@ -144,7 +144,7 @@ public class FamilyMemberController extends BaseController {
    @ApiOperation(value = "家庭成员查询")
    public String getPatientFamilyMembers() {
        try {
            JSONArray result = familyMemberService.getPatientFamilyMembers(getUID(),"");
            JSONArray result = familyMemberService.getPatientFamilyMembers(getUID(), "");
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
@@ -161,13 +161,13 @@ public class FamilyMemberController extends BaseController {
     */
    @RequestMapping(value = "/is_register", method = RequestMethod.GET)
    @ApiOperation(value = "家庭成员查询")
    public String isRegister(@RequestParam("idcard")String idcard) {
    public String isRegister(@RequestParam("idcard") String idcard) {
        try {
            if (StringUtils.isEmpty(idcard)) {
                return error(-1, "身份证号不能为空");
            }
            JSONObject result = familyMemberService.isRegister(idcard);
            JSONObject result = familyMemberService.isRegister(idcard, getUID());
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {