类名修改

common/common-entity/src/main/java/com/yihu/wlyy/entity/doctor/profile/Doctor.java

@@ -1,16 +1,13 @@
package com.yihu.wlyy.entity.doctor.profile;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.wlyy.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
import com.yihu.wlyy.entity.IdEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
/**
 * 医生信息
@@ -71,7 +68,9 @@ public class Doctor extends IdEntity {
    private String certificateNum;     //CA证书编号
    private String openid; //医生微信openID
    private  Integer concernNum;//关注人数
    private Integer concernNum;//关注人数
    private Integer consultNum;//咨询数
    private Integer articleNum;//发表的文章数
    //=====================非hibernate字段=========================
    private String concernCode;//关注code
@@ -459,4 +458,20 @@ public class Doctor extends IdEntity {
    public void setConcernNum(Integer concernNum) {
        this.concernNum = concernNum;
    }
    public Integer getConsultNum() {
        return consultNum;
    }
    public void setConsultNum(Integer consultNum) {
        this.consultNum = consultNum;
    }
    public Integer getArticleNum() {
        return articleNum;
    }
    public void setArticleNum(Integer articleNum) {
        this.articleNum = articleNum;
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -138,6 +138,48 @@ public class DoctorInfoService extends BaseService {
    @Autowired
    private WechatTemplateConfigDao templateConfigDao;
    /**
     * 增加文章数
     * @param doctorCode
     */
    public void addArticleNum(String doctorCode){
        Doctor doctor = doctorDao.findByCodeWithLock(doctorCode);
        if(doctor.getArticleNum()==null){
            doctor.setArticleNum(0);
        }
        doctor.setArticleNum(doctor.getArticleNum()+1);
        doctorDao.save(doctor);
    }
    /**
     * 减少文章数（删除文章）
     * @param doctorCode
     */
    public void subArticleNum(String doctorCode){
        Doctor doctor = doctorDao.findByCodeWithLock(doctorCode);
        if(doctor.getArticleNum()==null){
            doctor.setArticleNum(0);
        }
        doctor.setArticleNum(doctor.getArticleNum()-1);
        if(doctor.getArticleNum()<0){
            doctor.setArticleNum(0);
        }
        doctorDao.save(doctor);
    }
    /**
     * 增加咨询数
     * @param doctorCode
     */
    public void addConsultNum(String doctorCode){
        Doctor doctor = doctorDao.findByCodeWithLock(doctorCode);
        if(doctor.getConsultNum()==null){
            doctor.setConsultNum(0);
        }
        doctor.setConsultNum(doctor.getConsultNum()+1);
        doctorDao.save(doctor);
    }
    /**
     * 获取医生的签约病人
     *

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -33,6 +33,7 @@ import com.yihu.wlyy.repository.patient.PatientFamilyMemberDao;
import com.yihu.wlyy.repository.patient.SignFamilyDao;
import com.yihu.wlyy.repository.prescription.*;
import com.yihu.wlyy.repository.wechat.WechatTemplateConfigDao;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.app.concern.ConcernService;
import com.yihu.wlyy.service.app.health.HealthEduArticleService;
import com.yihu.wlyy.service.app.health.PatientHealthGuidanceService;
@@ -181,6 +182,8 @@ public class ConsultTeamService extends ConsultService {
    private ConcernService concernService;
    @Autowired
    private ConcernDao concernDao;
    @Autowired
    private DoctorInfoService doctorInfoService;
    @PostConstruct
    public void init() {
@@ -824,6 +827,9 @@ public class ConsultTeamService extends ConsultService {
        consultTeamDao.save(ct);
        consultDao.save(consult);
        //新增咨询数
        doctorInfoService.addConsultNum(ct.getDoctor());
        JSONArray doctor = new JSONArray();
        for (String key : users.keySet()) {
            if (patient.equals(key)) {

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

@@ -1142,6 +1142,8 @@ public class JMJkEduArticleService extends BaseService {
            List<Map<String, Object>> list = doctorInfoService.getDoctorManagerRole(userCode,"Manage_Article_Authentication");
            if(list.size()>0&&!StringUtils.isEmpty(list.get(0).get("code"))){
                isAuthentication = 1;
                //发表的文章数+1
                doctorInfoService.addArticleNum(userCode);
            }
        }
        thirdJkEduArticleService.saveArticle(userCode,articleTitle,articleType,articlelevel,secondLevelCategoryId,image,
@@ -1251,6 +1253,9 @@ public class JMJkEduArticleService extends BaseService {
        String[] str = articleId.split(",");
        for(String one: str){
            //发表的文章数+1
            JSONObject obj = thirdJkEduArticleService.getArticalById(one,null,"");
            doctorInfoService.addArticleNum(obj.getString("operatorId"));
            thirdJkEduArticleService.authenticationArticle(one,isAuthentication,firstLevelCategoryId,firstLevelCategoryName,secondLevelCategoryId,secondLevelCategoryName);
        }
    }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -3,11 +3,9 @@ package com.yihu.wlyy.service.third.jkEduArticle;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.es.entity.HealthEduArticlePatient;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.profile.DoctorRole;
import com.yihu.wlyy.entity.organization.Hospital;
import com.yihu.wlyy.entity.organization.HospitalMapping;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.doctor.DoctorRoleDao;
@@ -15,24 +13,23 @@ import com.yihu.wlyy.repository.organization.HospitalDao;
import com.yihu.wlyy.repository.organization.HospitalMappingDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.app.account.DoctorInfoService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.ElasticsearchUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import com.yihu.wlyy.web.third.gateway.service.GcLabelService;
import com.yihu.wlyy.web.third.gateway.vo.DictModel;
import com.yihu.wlyy.web.third.gateway.vo.HealthEduArticlePatientModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import springfox.documentation.spring.web.json.Json;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
/**
 * 福州总部-健康教育医生APP接口文档
@@ -72,6 +69,8 @@ public class ThirdJkEduArticleService extends BaseService {
    private DoctorRoleDao doctorRoleDao;
    @Autowired
    private HospitalDao hospitalDao;
    @Autowired
    private DoctorInfoService doctorInfoService;
    //    private String baseUrl = "http://service.yihu.com:8085/WsPlatform/rest";
//    private String baseUrl = "http://172.17.110.230:83/WsPlatform/rest";
@@ -687,6 +686,18 @@ public class ThirdJkEduArticleService extends BaseService {
        if (!"10000".equals(json.getString("Code"))) {
            throw new Exception(json.getString("Message"));
        }
        try {
            //文章数-1
            String[] str = ids.split(",");
            for(String one: str){
                //发表的文章数+1
                JSONObject obj = getArticalById(one,null,"");
                doctorInfoService.addArticleNum(obj.getString("operatorId"));
            }
        }catch (Exception e){
            e.printStackTrace();
        }
    }