每日推送接口BUG修改

common/common-entity/src/main/java/com/yihu/es/entity/HealthEduArticleES.java

@@ -61,6 +61,8 @@ public class HealthEduArticleES {
    @Transient
    private Boolean newArricleFlag;//新版文章推送标志
    private Integer userType; // 1、患者，2医生
    public String getId() {
        return id;
    }
@@ -356,4 +358,12 @@ public class HealthEduArticleES {
    public void setNewArricleFlag(Boolean newArricleFlag) {
        this.newArricleFlag = newArricleFlag;
    }
    public Integer getUserType() {
        return userType;
    }
    public void setUserType(Integer userType) {
        this.userType = userType;
    }
}

edu-article/JkEdu/src/com/yihu/jk/api/ArticleApiTest.java

@@ -68,11 +68,11 @@ public class ArticleApiTest {
//		obj.put("articlelevel","1");
//		obj.put("articleTitle","1");
//		obj.put("userCode","0de7295862dd11e69faffa163e8aee56");
		//obj.put("roleType",1);
		obj.put("currentUserRole","3502110400");
		//obj.put("userCode","0de7295862dd11e69faffa163e8aee56");//ylp201703150222
		obj.put("currentUserRole","3502110400");
		obj.put("userCode","37959ddf86f211e6b394fa163e424525");//ylp201703150222
		obj.put("roleType",1);
		obj.put("isMyArticle",true);
		obj.put("page","0");
		obj.put("pageSize","9");
@@ -83,8 +83,8 @@ public class ArticleApiTest {
		initDB();
		try{
//			api.authenticationArticle(im);
//			System.out.println(api.authenArticlePCList(im));//initArticleStatistic
			api.initArticleStatistic();
			System.out.println(api.queryArticlePcList(im));//initArticleStatistic
//W			api.initArticleStatistic();
		}catch(Exception e){
			e.printStackTrace();
		}

edu-article/JkEdu/src/com/yihu/jk/api/BehaviorApi.java

@@ -92,11 +92,22 @@ public class BehaviorApi {
		try {
			subDao.saveArticleCollection(vo);
			if (userType == 2) {
//			if (userType == 2) {
				int behaviorAction = 6;
				int number = 1;
				ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
			}
//			}
			Behavior behavior = new Behavior();
			behavior.setArticleId(articleId);
			behavior.setBehaviorAction(behaviorAction);
			behavior.setcName(cName);
			behavior.setUserId(userId);
//			ArticleStatistic arvo = new ArticleStatistic();
			arvo.setArticleId(articleId);
			subDao.saveBehavior(behavior);
			ArticleApi.updateArticleStatistic(articleId, behaviorAction, number);
			return ApiUtil.getRespJSON(10000, "成功").toString();
		} catch (SQLException e) {
			e.printStackTrace();

edu-article/JkEdu/src/com/yihu/jk/api/CategoryApiTest.java

@@ -26,16 +26,20 @@ public class CategoryApiTest {
	// 获取系统配置 认证 评论开关
	public static void addCategory()throws Exception{
		CategoryApi api = new CategoryApi();
		BehaviorApi api = new BehaviorApi();//
		InterfaceMessage im = new InterfaceMessage();
		JSONObject obj = new JSONObject();
		obj.put("categoryName","内部通知");
		obj.put("articleId","内部通知");
		obj.put("cName","2");
		obj.put("userId","2");
		obj.put("userType","2");
		obj.put("categoryLevel","2");
		obj.put("categoryLevel","2");
		im.setParam(obj.toString());
		initDB();
		System.out.println(api.checkCategory(im));
		System.out.println(api.saveArticleCollection(im));
	}

edu-article/JkEdu/src/com/yihu/jk/dao/ArticleDao.java

@@ -297,7 +297,7 @@ public class ArticleDao {
	public void insertArticleStatistic(String articleId) throws SQLException {
		Sql sql = DB.me().createSql(ArticleSqlNameEnum.insertArticleStatistic);
		sql.addParamValue(articleId);
//		sql.addParamValue(articleId);
		sql.addParamValue(articleId);
//		System.out.println(sql.toString());
		DB.me().insert(MyDatabaseEnum.JkEduDB, sql);
	}
@@ -586,9 +586,8 @@ public class ArticleDao {
		}else if("4".equals(vo.getOperatorRoleLevel())){//社区、机构
			param.append(" and OperatorRoleCode = '"+vo.getOperatorRoleCode()+"' ");
		}
		param.append(" and UserScope <= ? ");
		if(StringUtil.isNotEmpty(vo.getOperatorRoleLevel())){
			param.append(" and UserScope <= ? ");
            sql.addParamValue(Integer.valueOf(vo.getOperatorRoleLevel())-1);
        }else{
            sql.addParamValue(3);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -3954,6 +3954,48 @@ public class StatisticsService extends BaseService {
        return new JSONArray(list);
    }
    /**
     * 从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param type
     * @param doctor
     * @return
     */
    public JSONArray getTeamDoctorEduLineFromEs(String teamCode, String startDate, String endDate, String type, String doctor) {
        String startDateStr = changeDate(DateUtil.getNextDay(startDate,-1));
        String endDateStr = changeDate(endDate);
        List<Map<String,Object>> list = new ArrayList<>();
        String sql;
        if ("0".equals(type)) {
            //按周统计
            sql = "SELECT " +
                    " COUNT(*) AS articleCount,count(DISTINCT batchNo) batchCount " +
                    " FROM " + esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
            list = getGZBGDataWeekLineForEsFrom(startDate,endDate,sql);
        } else {
            sql = "SELECT COUNT(*) AS articleCount,count(DISTINCT batchNo) batchCount " +
                    " FROM " +esType+
                    " WHERE " +
                    " adminTeamCode =" + teamCode +
                    " AND doctorCode ='" + doctor + "'" +
                    " AND createTime >= '?1' " +
                    " AND createTime <= '?2' ";
            list = getGZBGDataMonthLineForEsFrom(startDate,endDate,startDateStr,sql);
        }
        return new JSONArray(list);
    }
    public JSONArray getTeamDoctorEduLine(String teamCode, String startDate, String endDate, String type, String doctor) {
        String startDateStr = DateUtil.getNextDay(startDate,-1)+" 17:00:00";
        endDate = endDate + " 17:00:00";
@@ -4128,7 +4170,15 @@ public class StatisticsService extends BaseService {
        }
    }
    /**
     * 直接从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param sort
     * @param sortType
     * @return
     */
    public JSONArray getTeamEduListFromEs(String teamCode, String startDate, String endDate, String sort, String sortType) {
        startDate = changeDate(DateUtil.getNextDay(startDate,-1));
        endDate = changeDate(endDate);
@@ -4210,33 +4260,41 @@ public class StatisticsService extends BaseService {
        return  new JSONArray(doctorList);
    }
    /**
     * 直接从es查询
     * @param teamCode
     * @param startDate
     * @param endDate
     * @param doctor
     * @return
     */
    public JSONObject getTeamDoctorEduTitleFromEs(String teamCode, String startDate, String endDate, String doctor) {
        startDate = changeDate(DateUtil.getNextDay(startDate,-1));
        endDate = changeDate(endDate);
        String totalSql = "select count(*) AS articleCount,count(DISTINCT batchNo) AS batchCount " +
        String totalSql = "select count(*) as articleCount,count(DISTINCT batchNo) as batchCount " +
                " from " +esType+
                " where adminTeamCode="+teamCode+" and doctorCode='"+doctor+"' and createTime <='"+endDate+"'";
        String addSql = "SELECT " +
                " COUNT(*) AS addCount, " +
                " COUNT(DISTINCT batchNo) addBatchno " +
                " FROM " + esType +
                " WHERE " +
                " count(*) as addCount, " +
                " count(DISTINCT batchNo) as addBatchno " +
                " from " + esType +
                " where " +
                " adminTeamCode =" + teamCode +
                " AND doctorCode ='" + doctor + "'" +
                " AND createTime <= '" + endDate + "' " +
                " AND createTime >= '" + startDate + "'";
        List<HealthEduArticleESResult> totalList = elasticsearchUtil.excute(totalSql,HealthEduArticleESResult.class,esType,esIndex);
        List<HealthEduArticleESResult> addList = elasticsearchUtil.excute(addSql,HealthEduArticleESResult.class,esType,esIndex);
                " and doctorCode ='" + doctor + "'" +
                " and createTime <= '" + endDate + "' " +
                " and createTime >= '" + startDate + "'";
        List<HealthEduArticleESResult> totalHealthEduArticleESResult = elasticsearchUtil.excute(totalSql,HealthEduArticleESResult.class,esType,esIndex);
        List<HealthEduArticleESResult> addHealthEduArticleESResult = elasticsearchUtil.excute(addSql,HealthEduArticleESResult.class,esType,esIndex);
        JSONObject rs = new JSONObject();
        //转换到map
        List<Map<String,Object>> totalMapList = new ArrayList<>();
        Map<String,Object> totalMap = new HashedMap();
        totalMap.put("batchno","0");
        totalMap.put("articleCount","0");
        if (totalList!=null && totalList.size()>0){
            totalMap.put("batchno",totalList.get(0).getBatchCount());
            totalMap.put("articleCount",totalList.get(0).getArticleCount());
        if (totalHealthEduArticleESResult!=null && totalHealthEduArticleESResult.size()>0){
            totalMap.put("batchno",totalHealthEduArticleESResult.get(0).getBatchCount());
            totalMap.put("articleCount",totalHealthEduArticleESResult.get(0).getArticleCount());
        }
        totalMapList.add(totalMap);
        //转换到map
@@ -4244,9 +4302,9 @@ public class StatisticsService extends BaseService {
        Map<String,Object> addMap = new HashedMap();
        addMap.put("addCount","0");
        addMap.put("addBatchno","0");
        if (addList!=null && addList.size()>0){
            totalMap.put("addCount",addList.get(0).getAddCount());
            totalMap.put("addBatchno",addList.get(0).getAddBatchno());
        if (addHealthEduArticleESResult!=null && addHealthEduArticleESResult.size()>0){
            addMap.put("addCount",addHealthEduArticleESResult.get(0).getAddCount());
            addMap.put("addBatchno",addHealthEduArticleESResult.get(0).getAddBatchno());
        }
        addMapList.add(addMap);
        rs.put("totalList", totalMapList);
@@ -7043,6 +7101,55 @@ public class StatisticsService extends BaseService {
        return resultList;
    }
    /**
     * 从es查询
     * @param startDate
     * @param endDate
     * @param startDateStr
     * @param sql
     * @return
     */
    public List<Map<String,Object>> getGZBGDataMonthLineForEsFrom(String startDate,String endDate,String startDateStr,String sql){
        List<Map<String, Object>> resultList  = new ArrayList<>();
        List<Map<String,Object>> dateList = DateUtil.findDateASWeeks(DateUtil.strToDate(startDate),DateUtil.strToDate(endDate));
        String firstWeekMonday = DateUtil.getMondayOfThisDate(DateUtil.strToDate(startDate,"yyyy-MM-dd"));
        if (DateUtil.strToDate(firstWeekMonday).before(DateUtil.strToDate(startDate))){
            Map<String,Object> map = new HashedMap();
            map.put("date",firstWeekMonday);
            dateList.add(0,map);
        }
        //以每天的17:00:00为时间的边界设置每周的起始时间和结束时间查询数据库
        if (dateList!=null && dateList.size()>0) {
            for (Map<String, Object> map : dateList) {
                String resultSql = sql;
                String mondayDate = String.valueOf(map.get("date"));
                String sundayDate = DateUtil.getSundayOfThisDate(DateUtil.strToDate(mondayDate));
                if (DateUtil.strToDate(mondayDate).before(DateUtil.strToDate(startDate))) {
                    mondayDate = startDateStr;
                } else {
                    mondayDate = changeDate(DateUtil.getNextDay(mondayDate, -1));
                }
                sundayDate = changeDate(sundayDate);
                resultSql = resultSql.replace("?1",mondayDate);
                resultSql = resultSql.replace("?2",sundayDate);
                List<HealthEduArticleESResult> list = elasticsearchUtil.excute(resultSql,HealthEduArticleESResult.class,esType,esIndex);
                //放入结果集
                if (list!=null && list.size()>0){
                    for(HealthEduArticleESResult healthEduArticleESResult : list){
                        if (healthEduArticleESResult!=null){
                            Map<String,Object> resMap = new HashedMap();
                            resMap.put("articleCount",healthEduArticleESResult.getArticleCount());
                            resMap.put("batchCount",healthEduArticleESResult.getBatchCount());
                            resMap.put("weekOfMonth",DateUtil.getWeekOfMonth(String.valueOf(map.get("date"))));
                            resultList.add(resMap);
                        }
                    }
                }
            }
        }
        return resultList;
    }
    /**
     * 工作报告医生个人详情折线图--按照周的公用方法（为了解决与es的数据冲突）
     * @param startDate
@@ -7078,6 +7185,44 @@ public class StatisticsService extends BaseService {
        return resultList;
    }
    /**
     * 从es查询
     * @param startDate
     * @param endDate
     * @param sql
     * @return
     */
    public List<Map<String,Object>> getGZBGDataWeekLineForEsFrom(String startDate,String endDate,String sql){
        List<Map<String, Object>> resultList  = new ArrayList<>();
        List<Map<String,Object>> dateList = DateUtil.findDates(DateUtil.strToDate(startDate),DateUtil.strToDate(endDate));
        //以每天的17:00:00为时间的边界设置每天的起始时间和结束时间查询数据库
        if (dateList!=null && dateList.size()>0) {
            for (Map<String, Object> map : dateList) {
                String resultSql = sql;
                String endTime = changeDate(String.valueOf(map.get("date")));
                String startTime = changeDate(DateUtil.getNextDay(DateUtil.strToDate(String.valueOf(map.get("date"))),-1));
                resultSql = resultSql.replace("?1",startTime);
                resultSql = resultSql.replace("?2",endTime);
                List<HealthEduArticleESResult> list = elasticsearchUtil.excute(resultSql,HealthEduArticleESResult.class,esType,esIndex);
                //放入结果集
                if (list!=null && list.size()>0){
                    for(HealthEduArticleESResult healthEduArticleESResult : list){
                        if (healthEduArticleESResult!=null){
                            Map<String,Object> resMap = new HashedMap();
                            resMap.put("articleCount",healthEduArticleESResult.getArticleCount());
                            resMap.put("batchCount",healthEduArticleESResult.getBatchCount());
                            resMap.put("dateNo",String.valueOf(map.get("date")));
                            resultList.add(resMap);
                        }
                    }
                }
            }
        }
        return resultList;
    }
    private String changeDate(String quotaDate) {
        return quotaDate + "T17:00:00+0800";
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -2,11 +2,7 @@ package com.yihu.wlyy.service.jimeiJkEdu;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.JSONPObject;
import com.yihu.edu.entity.RoleWithAuthorityCheck;
import com.yihu.es.entity.FollowupContentESDO;
import com.yihu.es.entity.HealthEduArticleES;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.es.entity.RoleVo;
import com.yihu.wlyy.config.es.ElasticFactory;
import com.yihu.wlyy.config.es.ElastricSearchSave;
@@ -44,8 +40,6 @@ import org.springframework.util.StringUtils;
import java.util.*;
import static org.bouncycastle.asn1.x509.X509ObjectIdentifiers.id;
/**
 * Created by liuwenbin on 2017/8/12.
 * 集美健教
@@ -562,9 +556,13 @@ public class JMJkEduArticleService extends BaseService {
            roleVoLists.add(roleVo);
        }
        JSONObject article = thirdJkEduArticleService.getArticalById(articleId,"");
        Date createTime = new Date();
        for (String patient : patientSet) {
            one = patientDao.findByCode(patient);
            if(one==null){
                continue;
            }
            HealthEduArticleES healthEduArticleES = new HealthEduArticleES();
            healthEduArticleES.setDoctorCode(doctor.getCode());
            healthEduArticleES.setDoctorName(doctor.getName());
@@ -592,7 +590,7 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setHospitalName(doctor.getHospitalName());
            healthEduArticleES.setTown(doctor.getTown());
            healthEduArticleES.setTownName(doctor.getTownName());
            healthEduArticleES.setCreateTime(new Date());
            healthEduArticleES.setCreateTime(createTime);
            healthEduArticleES.setSendType(sendType);
            healthEduArticleES.setArticleId(article.get("articleId") + "");
@@ -613,11 +611,18 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setCurrentUserRoleLevel(currentUserRoleLevel);
//            healthEduArticleES.setSendSource();
            healthEduArticleES.setAllCount(patientSet.size());
            healthEduArticleES.setUserType(1);
            healthEduArticleESList.add(healthEduArticleES);
        }
        //保存到ES中
        elastricSearchSave.save(healthEduArticleESList, esIndex, esType);
        HealthEduArticleES e = healthEduArticleESList.get(0);
        e.setUserType(2);
        e.setPatientCode(null);
        e.setPatientName(null);
        elastricSearchSave.save(e, esIndex, esType);
        return healthEduArticleESList;
    }
    public JSONObject pushArticleConfirm(String articleId, String labelUnit, String labelSex, String labelServe, String labelDisease, String labelHealth,String userCode,String currentUserRole, String currentUserRoleLevel) throws Exception {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ElasticsearchUtil.java

@@ -86,7 +86,7 @@ public class ElasticsearchUtil {
            }
            SearchResponse response = (SearchResponse) requestBuilder.get();
            Object queryResult = null;
            if (sql.toUpperCase().indexOf("GROUP") != -1 || sql.toUpperCase().indexOf("SUM") != -1) {
            if (sql.toUpperCase().indexOf("GROUP") != -1 || sql.toUpperCase().indexOf("SUM") != -1 || select.isAgg) {
                queryResult = response.getAggregations();
            } else {
                queryResult = response.getHits();

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/FileUploadController.java

@@ -580,7 +580,8 @@ public class FileUploadController extends BaseController {
                    InputStream inputStream  = mf.getInputStream();
                    String fileName = mf.getOriginalFilename().substring(0,mf.getOriginalFilename().lastIndexOf("."));
                    ObjectNode imgNode = FastDFSUtil.upload(inputStream,"png",fileName);
                    tempPaths.add(imgNode.get("fid").toString());
                    com.alibaba.fastjson.JSONObject json = com.alibaba.fastjson.JSONObject.parseObject(imgNode.toString());
                    tempPaths.add(json.getString("fid"));
                }
                String urls = "";
                for (String image : tempPaths) {

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEdu/DoctorJMJkEduArticleController.java

@@ -2,16 +2,9 @@ package com.yihu.wlyy.web.doctor.jimeiJkEdu;
import com.alibaba.fastjson.JSONObject;
import com.yihu.es.entity.HealthEduArticleES;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.wlyy.aop.ObserverRequired;
import com.yihu.wlyy.entity.education.HealthEduArticle;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.label.SignPatientLabelInfoService;
import com.yihu.wlyy.service.call.CustomerService;
import com.yihu.wlyy.service.jimeiJkEdu.JMJkEduArticleService;
import com.yihu.wlyy.service.third.jkEduArticle.ThirdJkEduArticleService;
import com.yihu.wlyy.web.BaseController;
import com.yihu.wlyy.web.third.gateway.service.GcEduArticleService;
import com.yihu.wlyy.web.third.gateway.vo.HealthEduArticlePatientModel;
import com.yihu.wlyy.web.third.gateway.vo.base.BaseResultModel;
import com.yihu.wlyy.web.third.gateway.vo.base.ResultPageListModel;
@@ -19,7 +12,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.json.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.MediaType;
@@ -31,7 +23,9 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.Session;
import javax.jms.TextMessage;
import java.util.*;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
/**
 * Created by Trick on 2017/11/14.
@@ -158,6 +152,7 @@ public class DoctorJMJkEduArticleController extends BaseController {
            }).start();
            return new BaseResultModel();
        }catch (Exception e) {
            e.printStackTrace();
            return new BaseResultModel(BaseResultModel.statusEm.opera_error.getCode(), BaseResultModel.statusEm.opera_error.getMessage() + ":" + e.getMessage());
        }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -822,6 +822,44 @@ public class PatientController extends WeixinBaseController {
        }
    }
    /**
     * 居民手机号变更
     *
     * @param mobile  新手机号
     * @param captcha 验证码
     * @param type    1:变更手机号  2:绑定手机号
     * @return
     */
    @RequestMapping(value = "/mobileUpdate", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("居民手机号变更")
    public String changePatientMobile2(String mobile, String captcha, int type) {
        try {
            if (StringUtils.isEmpty(mobile)) {
                return error(-1, "请填写新手机号码");
            }
            if (StringUtils.isEmpty(captcha)) {
                return error(-1, "请输入验证码");
            }
            int smsCheck = smsService.check(mobile, type, captcha);
            if (smsCheck != 1) {
                return error(-1, "验证码错误");
            }
//            int result = patientInfoService.changeMobile(getUID(), mobile, captcha, type);
            int result = patientInfoService.changeMobile(getRepUID(), mobile, captcha, type);
            if (result == -1) {
                return error(-1, "居民信息查找失败");
            } else if (result == 1) {
                return write(200, "手机号更新成功");
            } else {
                return write(-1, "手机号更新失败");
            }
        } catch (Exception e) {
            return error(-1, "手机号更新失败");
        }
    }
    /**
     * 手机号是否注册
     *

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/EsStatisticsController.java

@@ -1391,7 +1391,7 @@ public class EsStatisticsController extends BaseController {
                                       @RequestParam(required = true) String type,
                                       @RequestParam(required = true) String doctor) {
        try {
            return write(200, "查询成功", "data", statisticsService.getTeamDoctorEduLine(teamCode, startDate, endDate, type, doctor));
            return write(200, "查询成功", "data", statisticsService.getTeamDoctorEduLineFromEs(teamCode, startDate, endDate, type, doctor));
        } catch (Exception e) {
            error(e);
            return error(-1, "查询失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/service/EduArticleService.java

@@ -353,7 +353,7 @@ public class EduArticleService {
                            healthEduArticleES = setDateToObj(healthEduArticleES,doctorMap,articleMap,wjwCode);
                            if (StringUtils.isEmpty(healthEduArticleES.getDoctorName())){
                                healthEduArticleES.setDoctorCode(wjwCode);
//                                healthEduArticleES.setSendCode(wjwCode);
                                //healthEduArticleES.setSendCode(wjwCode);
                                healthEduArticleES.setSendName("厦门市卫生与计划生育委员会");
                                healthEduArticleES.setDoctorName("厦门市卫生与计划生育委员会");
                            }
@@ -379,7 +379,7 @@ public class EduArticleService {
                Doctor doctor = doctorEntry.getValue();
                healthEduArticleES.setDoctorCode(doctor.getCode());
                healthEduArticleES.setDoctorName(doctor.getName());
//                healthEduArticleES.setSendCode(doctor.getCode());
                //healthEduArticleES.setSendCode(doctor.getCode());
                healthEduArticleES.setSendName(doctor.getCode());
                healthEduArticleES.setSendPic(doctor.getPhoto());
                healthEduArticleES.setSendSex(doctor.getSex() != null ? String.valueOf(doctor.getSex()) : "");
@@ -428,7 +428,7 @@ public class EduArticleService {
        if (doctor!=null){
            healthEduArticleES.setDoctorCode(doctor.getCode());
            healthEduArticleES.setDoctorName(doctor.getName());
//            healthEduArticleES.setSendCode(doctor.getCode());
            //healthEduArticleES.setSendCode(doctor.getCode());
            healthEduArticleES.setSendName(doctor.getCode());
            healthEduArticleES.setSendPic(doctor.getPhoto());
            healthEduArticleES.setSendSex(doctor.getSex() != null ? String.valueOf(doctor.getSex()) : "");