Merge branch 'dev' of zd_123/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/questionnaire/QuestionnaireUsersService.java

@@ -63,19 +63,29 @@ public class QuestionnaireUsersService extends BaseService {
    public Map<String,Object> saveUpdateUser(String code,String name,String idcard,String openid, String mobile,String census,String address)throws Exception{
        QuestionnaireUsers questionnaireUsers = new QuestionnaireUsers();
        Map<String,Object> resultMap = new HashMap<>();
        IdcardValidator idcardValidator = new IdcardValidator();
        boolean id18Flag = true;
        boolean id15Flag = true;
        // 校验身份证号
        boolean idFlag = true;
        IdcardValidator validator = new IdcardValidator();
        if (validator.isValidatedAllIdcard(idcard)) {
            if (idcard.length() == 15) {
                idcard = validator.convertIdcarBy15bit(idcard);
                if (org.apache.commons.lang3.StringUtils.isEmpty(idcard)) {
                    idFlag = false;
                }
            }
        } else {
           idFlag = false;
        }
        /*IdcardValidator idcardValidator = new IdcardValidator();
        if (idcard.length()==18){
            id18Flag = idcardValidator.is18Idcard(idcard);
        }else if (idcard.length()==15){
            id15Flag = idcardValidator.is15Idcard(idcard);
        }
        }*/
        if (!StringUtils.isEmpty(idcard) && "3502".equals(idcard.substring(0,4))){
            idFlag = false;
        }
        if (!id15Flag || !id18Flag || !idFlag){
        if (!idFlag){
            resultMap.put("flag",false);
            resultMap.put("msg","您的身份证不符合规定或者您是厦门户口，无法参加抽奖！");
            return  resultMap;