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

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

@@ -65,7 +65,7 @@ public class WlyyFamilyMemberService extends BaseJpaService<WlyyPatientFamilyMem
            dictName = basePatientMemberDictDO.getRelationName();
        }
        //获取his家属数据
        JSONArray jsonArray = entranceService.BS10008(idCard,familyName,phoneNum,null,null,null,demo);
        JSONArray jsonArray = entranceService.BS10008(idCard,"","","","","",demo);
        if(jsonArray.size()>0){
            net.sf.json.JSONObject jsonObject= net.sf.json.JSONObject.fromObject(jsonArray.get(0).toString());
            String familyId="";

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/hospital/WlyyFamilyMemberController.java

@@ -67,7 +67,7 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
        String username = obj.getString("phoneNum");
        String idCard = obj.getString("idCard");
        String familyName = obj.getString("familyName");
        JSONArray jsonArray = entranceService.BS10008(idCard, familyName, username, null, null, null, false);
        //JSONArray jsonArray = entranceService.BS10008(idCard, "", "", "", "", "", false);
        if (StringUtils.isEmpty(client_id)) {
            mixEnvelop.setStatus(468);
            mixEnvelop.setMessage("client_id不能为空");
@@ -92,8 +92,8 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
        if("xm_ykyy_wx".equalsIgnoreCase(wxId)){
            System.out.println("发送眼科验证码开始");
            ResultMsg result= null;
            if (jsonArray.size() > 0) {
                result = ykyySMSService.ykyySendSMS(username, "您好，您的此次操作的验证码是：" + captcha + "，2分钟内有效。");
            /*if (jsonArray.size() > 0) {*/
                result = ykyySMSService.ykyySendSMS(username, "您好，您的此次操作的验证码是：" + captcha + "，2分钟内有效。如非本人操作，请忽略");
                if (result.isSuccess()){
                    this.store(client_id, username, captcha, 120);
                    mixEnvelop.setMessage("验证码发送成功");
@@ -101,26 +101,26 @@ public class WlyyFamilyMemberController extends EnvelopRestEndpoint {
                    mixEnvelop.setMessage("验证码发送失败");
                    mixEnvelop.setStatus(500);
                }
            }else {
            /*}else {
                mixEnvelop.setStatus(408);
                mixEnvelop.setMessage("您所添加的家属无就诊记录，无法发送验证码");
            }
            }*/
        }else {
            System.out.println("发送中山验证码开始");
            int result = 1;
            if (jsonArray.size() > 0) {
                result = zhongShanSMSService.ZhongShangSendSMS(username, "您好，您当前操作的验证码是：" + captcha + "，2分钟内有效。");
            } else {
            /*if (jsonArray.size() > 0) {*/
                result = zhongShanSMSService.ZhongShangSendSMS(username, "您好，您当前操作的验证码是：" + captcha + "，2分钟内有效。如非本人操作，请忽略");
           /* } else {
                result = 2;
            }
            }*/
            if (0 == result) {
                this.store(client_id, username, captcha, 120);
                mixEnvelop.setMessage("验证码发送成功");
            } else if (2 == result) {
            } /*else if (2 == result) {
                mixEnvelop.setStatus(408);
                mixEnvelop.setMessage("您所添加的家属无就诊记录，无法发送验证码");
            } else {
            }*/ else {
                mixEnvelop.setMessage("验证码发送失败");
                mixEnvelop.setStatus(500);
            }