|
@ -188,7 +188,7 @@ public class WechatController extends WeixinBaseController {
|
|
|
@ResponseBody
|
|
|
public String regist(@RequestParam(value = "name", required = true) String name,
|
|
|
@RequestParam(value = "idcard", required = true) String idcard,
|
|
|
@RequestParam(value = "ssc", required = true) String ssc,
|
|
|
@RequestParam(value = "ssc", required = false) String ssc,
|
|
|
@RequestParam(value = "mobile", required = true) String mobile,
|
|
|
@RequestParam(value = "captcha", required = true) String captcha,
|
|
|
@RequestParam(value = "openid", required = true) String openid,
|
|
@ -200,9 +200,9 @@ public class WechatController extends WeixinBaseController {
|
|
|
if (StringUtils.isEmpty(idcard)) {
|
|
|
return error(-1, "身份证号不允许为空!");
|
|
|
}
|
|
|
if (StringUtils.isEmpty(ssc)) {
|
|
|
return error(-1, "社保卡号不允许为空!");
|
|
|
}
|
|
|
// if (StringUtils.isEmpty(ssc)) {
|
|
|
// return error(-1, "社保卡号不允许为空!");
|
|
|
// }
|
|
|
if (StringUtils.isEmpty(mobile)) {
|
|
|
return error(-1, "手机号不允许为空!");
|
|
|
}
|
|
@ -241,22 +241,22 @@ public class WechatController extends WeixinBaseController {
|
|
|
return error(-1, "请输入正确的身份证号!");
|
|
|
}
|
|
|
|
|
|
SocialSecurityInfo socialSecurityInfo = socialSecurityInfoDao.findBySfzh18Max(idcard);
|
|
|
|
|
|
if (socialSecurityInfo != null) {
|
|
|
if (name.compareTo(socialSecurityInfo.getXming0() == null ? "" : socialSecurityInfo.getXming0()) != 0) {
|
|
|
return error(-1, "身份证号与姓名不一致<br/>请检查后重新输入");
|
|
|
}
|
|
|
if (ssc.compareTo(socialSecurityInfo.getCardno() == null ? "" : socialSecurityInfo.getCardno()) != 0) {
|
|
|
if (ssc.compareTo(socialSecurityInfo.getCard16() == null ? "" : socialSecurityInfo.getCard16()) != 0) {
|
|
|
return error(-1, "身份证号与医保卡号不一致,请检查后重新输入");
|
|
|
} else {
|
|
|
ssc = socialSecurityInfo.getCardno();//统一只存英文字母开头的医保卡
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
return error(-1, "对不起,暂不支持16年6月份之后办理的医保卡注册");
|
|
|
}
|
|
|
// SocialSecurityInfo socialSecurityInfo = socialSecurityInfoDao.findBySfzh18Max(idcard);
|
|
|
//
|
|
|
// if (socialSecurityInfo != null) {
|
|
|
// if (name.compareTo(socialSecurityInfo.getXming0() == null ? "" : socialSecurityInfo.getXming0()) != 0) {
|
|
|
// return error(-1, "身份证号与姓名不一致<br/>请检查后重新输入");
|
|
|
// }
|
|
|
// if (ssc.compareTo(socialSecurityInfo.getCardno() == null ? "" : socialSecurityInfo.getCardno()) != 0) {
|
|
|
// if (ssc.compareTo(socialSecurityInfo.getCard16() == null ? "" : socialSecurityInfo.getCard16()) != 0) {
|
|
|
// return error(-1, "身份证号与医保卡号不一致,请检查后重新输入");
|
|
|
// } else {
|
|
|
// ssc = socialSecurityInfo.getCardno();//统一只存英文字母开头的医保卡
|
|
|
// }
|
|
|
// }
|
|
|
// } else {
|
|
|
// return error(-1, "对不起,暂不支持16年6月份之后办理的医保卡注册");
|
|
|
// }
|
|
|
|
|
|
Patient patient = patientDao.findByIdcard(idcard);
|
|
|
|