Merge branch 'dev' of wangjun/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/family/service/WlyyFamilyMemberService.java

@@ -66,12 +66,26 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
        }
        //获取his家属数据
        JSONArray jsonArray = entranceService.BS10008(idCard,"","","","","",demo);
        if(jsonArray.size()>0){
        if(jsonArray!=null&&jsonArray.size()>0){
            net.sf.json.JSONObject jsonObject= net.sf.json.JSONObject.fromObject(jsonArray.get(0).toString());
            String familyId="";
            //如果病人id为空则没有就诊记录
            if (null!=jsonObject.get("Patient_Id")){
                familyId = jsonObject.getString("Patient_Id");
                String Pat_name = jsonObject.getString("Pat_name");
                if (null!=jsonObject.get("Next_Of_Kin_Phone")){
                    String Next_Of_Kin_Phone = jsonObject.get("Next_Of_Kin_Phone").toString();
                    if(!Next_Of_Kin_Phone.equalsIgnoreCase(phoneNum)){
                        mixEnvelop.setStatus(408);
                        mixEnvelop.setMessage("您所添加的家属的电话有误，无法添加");
                        return mixEnvelop;
                    }
                }
                if(!Pat_name.equalsIgnoreCase(familyName)){
                    mixEnvelop.setStatus(408);
                    mixEnvelop.setMessage("您所添加的家属的名称有误，无法添加");
                    return mixEnvelop;
                }
                result.setFamilyRelation(dictId);
                result.setFamilyRelationName(dictName);
                result.setIsDel(1);