|  | @ -4,23 +4,20 @@ package com.yihu.jw.hospital.prescription.service.entrance;
 | 
												
													
														
															|  | import com.fasterxml.jackson.core.type.TypeReference;
 |  | import com.fasterxml.jackson.core.type.TypeReference;
 | 
												
													
														
															|  | import com.fasterxml.jackson.databind.ObjectMapper;
 |  | import com.fasterxml.jackson.databind.ObjectMapper;
 | 
												
													
														
															|  | import com.yihu.jw.dict.dao.DictHospitalDeptDao;
 |  | import com.yihu.jw.dict.dao.DictHospitalDeptDao;
 | 
												
													
														
															|  | import com.yihu.jw.dict.service.DictHospitalDeptService;
 |  | 
 | 
												
													
														
															|  | import com.yihu.jw.doctor.dao.BaseDoctorDao;
 |  | import com.yihu.jw.doctor.dao.BaseDoctorDao;
 | 
												
													
														
															|  | import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
 |  | import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
 | 
												
													
														
															|  | import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
 |  | import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
 | 
												
													
														
															|  | import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
 |  | import com.yihu.jw.entity.hospital.dict.WlyyChargeDictDO;
 | 
												
													
														
															|  | import com.yihu.jw.entity.hospital.mapping.HospitalDeptMappingDO;
 |  | 
 | 
												
													
														
															|  | import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
 |  | import com.yihu.jw.entity.hospital.mapping.PatientMappingDO;
 | 
												
													
														
															|  | import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
 |  | import com.yihu.jw.hospital.dict.WlyyChargeDictDao;
 | 
												
													
														
															|  | import com.yihu.jw.hospital.mapping.dao.HospitalDeptMappingDao;
 |  | 
 | 
												
													
														
															|  | import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
 |  | import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
 | 
												
													
														
															|  | import com.yihu.jw.hospital.prescription.service.entrance.util.ConvertUtil;
 |  | import com.yihu.jw.hospital.prescription.service.entrance.util.ConvertUtil;
 | 
												
													
														
															|  | import com.yihu.jw.hospital.prescription.service.entrance.util.MqSdkUtil;
 |  | import com.yihu.jw.hospital.prescription.service.entrance.util.MqSdkUtil;
 | 
												
													
														
															|  | import com.yihu.jw.hospital.prescription.service.entrance.util.WebserviceUtil;
 |  | import com.yihu.jw.hospital.prescription.service.entrance.util.WebserviceUtil;
 | 
												
													
														
															|  | import com.yihu.jw.restmodel.hospital.prescription.*;
 |  | import com.yihu.jw.restmodel.hospital.prescription.*;
 | 
												
													
														
															|  | 
 |  | import com.yihu.jw.util.common.PwdUtil;
 | 
												
													
														
															|  | import com.yihu.jw.util.date.DateUtil;
 |  | import com.yihu.jw.util.date.DateUtil;
 | 
												
													
														
															|  | import com.yihu.jw.util.idcard.IdCardUtil;
 |  | import com.yihu.jw.util.idcard.IdCardUtil;
 | 
												
													
														
															|  | import com.yihu.jw.util.security.MD5;
 |  | 
 | 
												
													
														
															|  | import net.sf.json.JSON;
 |  | import net.sf.json.JSON;
 | 
												
													
														
															|  | import net.sf.json.JSONArray;
 |  | import net.sf.json.JSONArray;
 | 
												
													
														
															|  | import net.sf.json.xml.XMLSerializer;
 |  | import net.sf.json.xml.XMLSerializer;
 | 
												
											
												
													
														
															|  | @ -1382,10 +1379,8 @@ public class EntranceService {
 | 
												
													
														
															|  |                     baseDoctorDO.setName(null==jsonObjectBody.get("Emp_Name")?"":jsonObjectBody.get("Emp_Name").toString());
 |  |                     baseDoctorDO.setName(null==jsonObjectBody.get("Emp_Name")?"":jsonObjectBody.get("Emp_Name").toString());
 | 
												
													
														
															|  | //                    baseDoctorDO.setch
 |  | //                    baseDoctorDO.setch
 | 
												
													
														
															|  |                     if(StringUtils.isNotBlank(idCard)){
 |  |                     if(StringUtils.isNotBlank(idCard)){
 | 
												
													
														
															|  |                         String salt = UUID.randomUUID().toString().replaceAll("-","");
 |  | 
 | 
												
													
														
															|  |                         baseDoctorDO.setSalt(salt);
 |  | 
 | 
												
													
														
															|  |                         String password = MD5.GetMD5Code(idCard.substring(idCard.length()-6) + salt);
 |  | 
 | 
												
													
														
															|  |                         baseDoctorDO.setPassword(password);
 |  | 
 | 
												
													
														
															|  | 
 |  |                         baseDoctorDO.setSalt(PwdUtil.randomString(5));
 | 
												
													
														
															|  | 
 |  |                         baseDoctorDO.setPassword(com.yihu.utils.security.MD5.md5Hex(baseDoctorDO.getIdcard().substring(12, 18) + "{" + baseDoctorDO.getSalt() + "}"));
 | 
												
													
														
															|  |                     }
 |  |                     }
 | 
												
													
														
															|  |                     baseDoctorDao.save(baseDoctorDO);
 |  |                     baseDoctorDao.save(baseDoctorDO);
 | 
												
													
														
															|  |                 }
 |  |                 }
 |