Merge branch 'dev' of zengmengkang/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -193,13 +193,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        String outpatientType = jsonObject.get("outpatientType").toString();
        String newSpecialDisease = jsonObject.get("specialDisease").toString();
        String newSpecialDiseaseCode = jsonObject.get("specialDiseaseCode").toString();
        //医生简介、擅长不为空
        if (null == introduce || null == expertise){
            return false;
        }
        baseDoctorDao.update(doctorId,introduce,expertise,photo,outpatientType);
        //删除医生旧专病门诊，保存新专病门诊
        //List<DoctorSpecialDiseaseDo> oldSpecialDisease = specialDiseaseDao.findByDoctorCode(doctorId);
        Map<String,Object> params = new HashedMap();
        String sqlTotal ="SELECT " +
                " COUNT(1) AS \"total\" " +
@@ -216,15 +211,16 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        if (count > 0){
            specialDiseaseDao.deleteByDoctorCode(doctorId);
        }
        String[] split = newSpecialDisease.split(",");
        String[] splitCode = newSpecialDiseaseCode.split(",");
        for (int i=0;i<split.length;i++ ){
            DoctorSpecialDiseaseDo specialDiseaseDo = new DoctorSpecialDiseaseDo();
            specialDiseaseDo.setDoctorCode(doctorId);
            specialDiseaseDo.setDiseaseName(split[i]);
            specialDiseaseDo.setDiseaseCode(splitCode[i]);
            specialDiseaseDao.save(specialDiseaseDo);
        if(StringUtils.isNotBlank(newSpecialDisease) && StringUtils.isNotBlank(newSpecialDiseaseCode)){
            String[] split = newSpecialDisease.split(",");
            String[] splitCode = newSpecialDiseaseCode.split(",");
            for (int i=0;i<split.length;i++ ){
                DoctorSpecialDiseaseDo specialDiseaseDo = new DoctorSpecialDiseaseDo();
                specialDiseaseDo.setDoctorCode(doctorId);
                specialDiseaseDo.setDiseaseName(split[i]);
                specialDiseaseDo.setDiseaseCode(splitCode[i]);
                specialDiseaseDao.save(specialDiseaseDo);
            }
        }
        return true;