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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -1317,12 +1317,8 @@ public class DoctorInfoService extends BaseService {
            int status = responseObject.getInt("status");
            if (status == 200) {
                data = responseObject.getString("data");
                if (!StringUtils.isEmpty(data) && data.startsWith("error")) {
                    throw new Exception(data);
                }else{
                    if("0".equals(data)){
                        return true;
                    }
                if("0".equals(data)){
                    return true;
                }
            }
        }else {
@@ -1383,26 +1379,22 @@ public class DoctorInfoService extends BaseService {
            int status = responseObject.getInt("status");
            if (status == 200) {
                data = responseObject.getString("data");
                if (!StringUtils.isEmpty(data) && data.startsWith("error")) {
                    throw new Exception(data);
                } else {
                    //1、线上未认证，有证书，并有效，2、线上未认证，有证书，已过期，3、线上未认证，无证书，4、线上已认证，并有效
                    if(StringUtils.isNotEmpty(data)){
                        Date CertifiedOvertime = simpleDateFormat.parse(data);
                        doctor.setCertifiedOvertime(CertifiedOvertime);
                        doctorDao.save(doctor);
                        long times = CertifiedOvertime.getTime();
                        if(System.currentTimeMillis()<=times){
                            jsonObject.put("type",1);
                        }else{
                            jsonObject.put("type",2);
                        }
                //1、线上未认证，有证书，并有效，2、线上未认证，有证书，已过期，3、线上未认证，无证书，4、线上已认证，并有效
                if(StringUtils.isNotEmpty(data)){
                    Date CertifiedOvertime = simpleDateFormat.parse(data);
                    doctor.setCertifiedOvertime(CertifiedOvertime);
                    doctorDao.save(doctor);
                    long times = CertifiedOvertime.getTime();
                    if(System.currentTimeMillis()<=times){
                        jsonObject.put("type",1);
                    }else{
//                        jsonObject.put("type",3);
                        throw new Exception("null data.");
                        jsonObject.put("type",2);
                    }
                }else{
//                        jsonObject.put("type",3);
                    throw new Exception("null data.");
                }
            } else {
                jsonObject.put("type",3);
            }
@@ -1431,16 +1423,12 @@ public class DoctorInfoService extends BaseService {
            String msg = responseObject.getString("msg");
            if (status == 200) {
                String data = responseObject.getString("data");
                if (!StringUtils.isEmpty(data) && data.startsWith("error")) {
                    throw new Exception(data);
                }else{
                    if("0".equals(data)){
                        Doctor doctor = findDoctorByCode(doctorCode);
                        doctor.setCheckPassword(strNewCalledPasswd);//保存密码，以便忘记密码时候使用
                        doctor.setIscertified(1);//说明已经（线上认证，已修改密码）
                        doctorDao.save(doctor);
                        return true;
                    }
                if("0".equals(data)){
                    Doctor doctor = findDoctorByCode(doctorCode);
                    doctor.setCheckPassword(strNewCalledPasswd);//保存密码，以便忘记密码时候使用
                    doctor.setIscertified(1);//说明已经（线上认证，已修改密码）
                    doctorDao.save(doctor);
                    return true;
                }
            }else{
                String error = msg.split(":")[2];
@@ -1478,8 +1466,8 @@ public class DoctorInfoService extends BaseService {
            String msg = responseObject.getString("msg");
            if (status == 200) {
                String data = responseObject.getString("data");
                if (!StringUtils.isEmpty(data) && data.startsWith("error")) {
                    throw new Exception(data);
                if (StringUtils.isEmpty(data)) {
                    throw new Exception("null data");
                }else{
                    String[] str = data.split("\\|\\|");
//                    String strSignData = str[0];
@@ -1524,12 +1512,8 @@ public class DoctorInfoService extends BaseService {
            String msg = responseObject.getString("msg");
            if (status == 200) {
                String data = responseObject.getString("data");
                if (!StringUtils.isEmpty(data) && data.startsWith("error")) {
                    throw new Exception(data);
                }else{
                    if("0".equals(data)){
                        return true;
                    }
                if("0".equals(data)){
                    return true;
                }
            }else{
                throw new Exception(responseObject.getString("msg"));