|
|
@ -1,18 +1,18 @@
|
|
|
package com.yihu.jw.security.service;
|
|
|
package com.yihu.jw.base.service.util;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorDao;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
|
|
|
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
|
|
|
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
|
|
|
import com.yihu.jw.entity.base.patient.BasePatientDO;
|
|
|
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
|
|
|
import com.yihu.jw.security.dao.doctor.BaseDoctorDao;
|
|
|
import com.yihu.jw.security.dao.doctor.BaseDoctorHospitalDao;
|
|
|
import com.yihu.jw.security.dao.doctor.BaseDoctorRoleDao;
|
|
|
import com.yihu.jw.security.dao.doctor.DoctorMappingDao;
|
|
|
import com.yihu.jw.security.dao.patient.BasePatientDao;
|
|
|
import com.yihu.jw.hospital.mapping.dao.DoctorMappingDao;
|
|
|
import com.yihu.jw.patient.dao.BasePatientDao;
|
|
|
import com.yihu.jw.util.date.DateUtil;
|
|
|
import com.yihu.jw.util.http.HttpClientUtil;
|
|
|
import com.yihu.jw.util.idcard.IdCardUtil;
|
|
|
@ -40,9 +40,9 @@ import static com.yihu.jw.util.common.PwdUtil.randomString;
|
|
|
* @author yeshijie.
|
|
|
*/
|
|
|
@Service
|
|
|
public class YkyyService {
|
|
|
public class YkyyBaseService {
|
|
|
|
|
|
private Logger logger = LoggerFactory.getLogger(YkyyService.class);
|
|
|
private Logger logger = LoggerFactory.getLogger(YkyyBaseService.class);
|
|
|
|
|
|
@Autowired
|
|
|
private HttpClientUtil httpClientUtil;
|
|
|
@ -424,7 +424,7 @@ public class YkyyService {
|
|
|
//过滤身份证脏数据
|
|
|
if(idcard.length()>=15){
|
|
|
|
|
|
BaseDoctorDO doctorDOs = baseDoctorDao.findByIdcard(idcard);
|
|
|
BaseDoctorDO doctorDOs = baseDoctorDao.findByIdcardAndId(idcard);
|
|
|
|
|
|
if(doctorDOs!=null){
|
|
|
|
