Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

business/base-service/src/main/java/com/yihu/jw/dict/dao/DictDoctorDutyDao.java

@@ -1,9 +1,12 @@
package com.yihu.jw.dict.dao;
import com.yihu.jw.entity.base.dict.DictDoctorDutyDO;
import org.hibernate.validator.constraints.EAN;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * 
@@ -22,4 +25,6 @@ public interface DictDoctorDutyDao extends PagingAndSortingRepository<DictDoctor
    boolean existsByCode(String code);
    DictDoctorDutyDO findByCode(String code);
    List<DictDoctorDutyDO> findByName(String name);
}

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/entrance/YkyyEntranceService.java

@@ -5,10 +5,12 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.sun.webkit.dom.CSSStyleRuleImpl;
import com.yihu.jw.dict.dao.DictDoctorDutyDao;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
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.dict.DictDoctorDutyDO;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.dict.DictIcd10DO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -131,6 +133,8 @@ public class YkyyEntranceService {
    private PrescriptionInfoDao prescriptionInfoDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private DictDoctorDutyDao dictDoctorDutyDao;
    public List<Map<String, Object>> createSQLQuery(String sql, Map<String, Object> params, Integer page, Integer size){
@@ -473,6 +477,16 @@ public class YkyyEntranceService {
                    String mappingCode = jsonObject.getString("DOCTORCODE");
                    doctorMappingDO.setMappingCode(mappingCode);
                    doctorMappingDao.save(doctorMappingDO);
                    baseDoctorDO.setIntroduce(jsonObject.getString("DETAIL"));
                    baseDoctorDO.setExpertise(jsonObject.getString("MAJOR"));
                    String jobTitle = jsonObject.getString("LEVELNAME");
                    baseDoctorDO.setJobTitleName(jobTitle);
                    List<DictDoctorDutyDO> dictDoctorDutyDOS = dictDoctorDutyDao.findByName(jobTitle);
                    if (dictDoctorDutyDOS!=null&&dictDoctorDutyDOS.size()!=0){
                        DictDoctorDutyDO dutyDO = dictDoctorDutyDOS.get(0);
                        baseDoctorDO.setJobTitleCode(dutyDO.getCode());
                    }
                    baseDoctorDao.save(baseDoctorDO);
                }else {
                    baseDoctorDO.setDel("0");
                    baseDoctorDao.save(baseDoctorDO);