修改锦旗查询接口，新增评论功能，以及医生评论查询展示功能

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/BaseBannerDoctorDao.java

@@ -6,6 +6,9 @@ import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
import java.util.Map;
/**
 * @author wangzhinan
 * @vsrsion 2.0
@@ -16,5 +19,4 @@ public interface BaseBannerDoctorDao extends PagingAndSortingRepository<BaseBann
    @Query( value = "SELECT COUNT(1) AS \"total\"  FROM base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id where a.doctor = ?1",nativeQuery = true)
    Integer getTotalBannerCount(String doctor);
}

business/base-service/src/main/java/com/yihu/jw/hospital/message/dao/BaseUserMessageDao.java

@@ -3,14 +3,18 @@ package com.yihu.jw.hospital.message.dao;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * @author wangzhinan
 * @vsrsion 2.0
 * Created at 2020.07.08
 */
public interface BaseUserMessageDao extends PagingAndSortingRepository<BaseUserMessageDO, String>, JpaSpecificationExecutor<BaseUserMessageDO> {
    @Query(value = "select * from base_user_message t where t.relation_code = ?1 order by t.update_time asc limit 0,1",nativeQuery = true)
    List<BaseUserMessageDO> getMessageByCode(String relationCode);
}

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerDoctorService.java

@@ -3,8 +3,10 @@ package com.yihu.jw.hospital.message.service;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseBannerDoctorDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.xmlbeans.impl.xb.xsdschema.Public;
@@ -25,6 +27,8 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
    private BaseBannerDoctorDao baseBannerDoctorDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private BaseUserMessageDao baseUserMessageDao;
    //批量新增锦旗
    @Transactional
    public void bannerGive(String patientId,String patientName, List<String> list,String content,
@@ -43,14 +47,25 @@ public class BaseBannerDoctorService extends BaseJpaService<BaseBannerDoctorDO,
                baseBannerDoctorDO.setRelationCode("system");
                baseBannerDoctorDao.save(baseBannerDoctorDO);
            }
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setReceiver(doctor);
            baseUserMessageDO.setReceiverName(doctorName);
            baseUserMessageDO.setRelationCode("3");
            baseUserMessageDO.setSender(patientId);
            baseUserMessageDO.setSenderName(patientName);
            baseUserMessageDO.setRelationName("送锦旗留言");
            baseUserMessageDO.setRelationType(3);
            baseUserMessageDO.setStatus(1);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
    }
    //获取医生锦旗数量接口
    public JSONObject getDoctorBanners(String doctorID){
        StringBuffer sql = new StringBuffer();
        sql.append("SELECT COUNT(1) AS \"total\",b.name  FROM base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id\n" +
        sql.append("SELECT COUNT(1) AS \"total\",b.name,b.img FROM base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id\n" +
                "where 1=1 ");
        sql.append("and a.doctor = "+doctorID);
        sql.append("and a.doctor = '"+doctorID+"'");
        sql.append( " GROUP BY a.banner_id");
        //获取每个锦旗数量
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql.toString());

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseBannerService.java

@@ -108,8 +108,10 @@ public class BaseBannerService extends BaseJpaService<BaseBannerDO, BaseBannerDa
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        Map<String,Object> map = list.get(0);
        int sort = 0;
        if(null!=map){
            sort = Integer.valueOf(map.get("sort").toString());
        if (null!=map.get("sort")){
            if(null!=map){
                sort = Integer.valueOf(map.get("sort").toString());
            }
        }
        baseBannerDO.setSort(sort+1);
        baseBannerDO.setUpdateTime(new Date());

business/base-service/src/main/java/com/yihu/jw/hospital/message/service/BaseUserMsgService.java

@@ -0,0 +1,284 @@
package com.yihu.jw.hospital.message.service;
import com.yihu.jw.entity.hospital.message.BaseBannerDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.hospital.message.dao.BaseBannerDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
import com.yihu.mysql.query.URLQueryParser;
import org.apache.commons.lang.StringUtils;
import org.checkerframework.checker.units.qual.A;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.jpa.provider.HibernateUtils;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import javax.swing.plaf.PanelUI;
import javax.transaction.Transactional;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
public class BaseUserMsgService extends BaseJpaService<BaseUserMessageDO, BaseUserMessageDao> {
    @Autowired
    private BaseUserMessageDao baseUserMessageDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private HibenateUtils hibenateUtils;
    @Value("${wechat.id}")
    private String wxId;
    @Value("${wechat.flag}")
    private boolean flag;
    //患者给医生自身留言接口
    public void leaveMessage(String content, String reciverId, String reciverName, String senderId, String senderName, String relationCode) {
        List<BaseUserMessageDO> baseUserMessageDOS = baseUserMessageDao.getMessageByCode(relationCode);
        if (baseUserMessageDOS.size()>0){
        BaseUserMessageDO peiviousMessage = baseUserMessageDOS.get(0);
        peiviousMessage.setStatus(2);
        baseUserMessageDao.save(peiviousMessage);
        BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
        baseUserMessageDO.setContent(content);
        baseUserMessageDO.setSender(senderId);
        baseUserMessageDO.setSenderName(senderName);
        baseUserMessageDO.setReceiver(reciverId);
        baseUserMessageDO.setReceiverName(reciverName);
        baseUserMessageDO.setRelationCode(relationCode);
        baseUserMessageDO.setRelationName("自身留言");
        baseUserMessageDO.setRelationType(1);
        baseUserMessageDO.setStatus(2);
        baseUserMessageDO.setDel(1);
        baseUserMessageDao.save(baseUserMessageDO);
        }
        else{
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setSender(senderId);
            baseUserMessageDO.setSenderName(senderName);
            baseUserMessageDO.setReceiver(reciverId);
            baseUserMessageDO.setReceiverName(reciverName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setRelationName("自身留言");
            baseUserMessageDO.setRelationType(1);
            baseUserMessageDO.setStatus(1);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
    }
    //回复留言接口
    @Transactional
    public void responseMessage(String content, String reciverId, String reciverName, String senderId, String senderName, String relationCode) {
        List<BaseUserMessageDO> baseUserMessageDOS = baseUserMessageDao.getMessageByCode(relationCode);
        BaseUserMessageDO peiviousMessage = baseUserMessageDOS.get(0);
        peiviousMessage.setStatus(2);
        baseUserMessageDao.save(peiviousMessage);
        BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
        baseUserMessageDO.setContent(content);
        baseUserMessageDO.setSender(senderId);
        baseUserMessageDO.setSenderName(senderName);
        baseUserMessageDO.setReceiver(reciverId);
        baseUserMessageDO.setReceiverName(reciverName);
        baseUserMessageDO.setRelationCode(relationCode);
        baseUserMessageDO.setRelationName("自身留言");
        baseUserMessageDO.setRelationType(1);
        baseUserMessageDO.setStatus(2);
        baseUserMessageDO.setDel(1);
        baseUserMessageDao.save(baseUserMessageDO);
    }
    //评论留言展示
    public List<Map<String,Object>> getMessage(String doctor, String showAll, String showAllType, String beginTime,String endTime) {
        StringBuffer sql = new StringBuffer();
        sql.append("select t.id as \"id\" ,t.content as \"content\"," +
                "t.sender as \"sender\",t.sender_name as \"sender_name\",t.receiver as \"receiver\"," +
                "t.receiver_name as \"receiver_name\",t.relation_type as \"relation_type\"," +
                "t.relation_code as \"relation_code\",t.status as \"status\",t.update_time as \"update_time\"");
        /*if("xm_ykyy_wx".equals(wxId)){
            flag = true;
            if (flag){
               sql.append(",date_format(t.update_time,'%Y-%m-%d %H:%i:%S' )  AS \"update_time\"");
            }else {
                sql.append(",to_char(t.update_time,'YYYY-MM-DD hh24:mi:ss')  AS \"update_time\"");
            }
        }else{
            sql.append("date_format(t.update_time,'%Y-%m-%d %H:%i:%S' )  AS \"update_time\"");
        }*/
        sql.append(" from base_user_message t where 1 = 1");
        if (StringUtils.isNotEmpty(doctor)) {
            sql.append(" and t.receiver = '" + doctor + "'");
        }
        if (StringUtils.isNotEmpty(showAll)) {
            sql.append(" and t.status = " + showAll);
        }
        if (StringUtils.isNotEmpty(showAllType)) {
            sql.append(" and t.relation_type = " + showAllType);
        }
        if (StringUtils.isNotEmpty(beginTime)) {
            sql.append(" and t.update_time > '" + beginTime+"'");//DateUtil.stringToDate(beginTime,"yyyy-MM-dd HH:mm:ss")
        }
        if (StringUtils.isNotEmpty(endTime)) {
            sql.append(" and t.update_time < '" + endTime+"'");//DateUtil.stringToDate(endTime,"yyyy-MM-dd HH:mm:ss")
        }
        sql.append(" GROUP BY t.relation_code ORDER BY t.update_time ASC");
        System.out.println(sql.toString());
        List<Map<String, Object>> list = hibenateUtils.createSQLQuery(sql.toString());
        List<Map<String, Object>> returnList = new ArrayList<>();
        for (Map<String, Object> map : list) {
            String relationCode = map.get("relation_code").toString();
            String updateTime = map.get("update_time").toString();
            map.put("update_time",DateUtil.dateToStrLong(DateUtil.strToDateLong(updateTime)));
            List<Map<String,Object>> scoreList = this.getListByRelationCode(relationCode);
            if(null!=scoreList){
                map.put("scoreList",scoreList);
            }
            returnList.add(map);
        }
        return returnList;
    }
    public List<Map<String,Object>> getListByRelationCode(String relationCode){
        //查询评价明细
        String sqlScoreList = "SELECT " +
                "a.score as \"score\"," +
                "a.score_type as \"score_type\"," +
                "a.content as \"content\",";
        if("xm_ykyy_wx".equals(wxId)){
            if (flag){
                sqlScoreList +=  "date_format(b.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"create_time\",";
            }else {
                sqlScoreList +=  "to_char(b.create_time,'YYYY-MM-DD hh24:mi:ss')  AS \"create_time\",";
            }
        }else{
            sqlScoreList +=  "date_format(b.create_time,'%Y-%m-%d %H:%i:%S' )  AS \"create_time\",";
        }
        sqlScoreList +=	"c.type as \"type\"," +
                "c.name as \"patientname\"," +
                "b.id as \"id\"," +
                "c.photo as \"patientphoto\"," +
                "b.type as \"niming\" " +
                "FROM " +
                "base_evaluate a " +
                "LEFT JOIN base_evaluate_score b ON b.id=a.relation_code " +
                "LEFT JOIN wlyy_consult_team c ON c.consult=b.relation_code " +
                "WHERE a.relation_code=b.id "+
                "AND c.consult='"+relationCode+"'";
        System.out.println(sqlScoreList);
        List<Map<String,Object>> scoreList = hibenateUtils.createSQLQuery(sqlScoreList);
        if(scoreList.isEmpty()){
            return null;
        }
        return scoreList;
    }
    //获取单条评论详细信息
    public List<Map<String,Object>> getSingle(String id){
        BaseUserMessageDO baseUserMessageDO=baseUserMessageDao.findOne(id);
        String relationCode= baseUserMessageDO.getRelationCode();
        List<Map<String,Object>> returnResult = new ArrayList<>();
        List<Map<String,Object>> scoreList = this.getListByRelationCode(relationCode);
        Map<String,Object> map = new HashMap<>();
        map.put("scoreList",scoreList);
        map.put("sender",baseUserMessageDO.getSender());
        map.put("senderName",baseUserMessageDO.getSenderName());
        map.put("content",baseUserMessageDO.getContent());
        map.put("receiver",baseUserMessageDO.getReceiver());
        map.put("receiverName",baseUserMessageDO.getReceiverName());
        map.put("relationCode",baseUserMessageDO.getRelationCode());
        map.put("relationType",baseUserMessageDO.getRelationType());
        map.put("status",baseUserMessageDO.getStatus());
        map.put("updateTime",DateUtil.dateToStrLong(DateUtil.strToDateLong(baseUserMessageDO.getUpdateUserName())));
        map.put("relationName",baseUserMessageDO.getRelationName());
        returnResult.add(map);
        return returnResult;
    }
    //专家咨询留言
    public void expertMessage(String content, String reciverId, String reciverName, String senderId, String senderName, String relationCode) {
        List<BaseUserMessageDO> baseUserMessageDOS = baseUserMessageDao.getMessageByCode(relationCode);
        if (baseUserMessageDOS.size()>0){
            BaseUserMessageDO peiviousMessage = baseUserMessageDOS.get(0);
            peiviousMessage.setStatus(2);
            baseUserMessageDao.save(peiviousMessage);
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setSender(senderId);
            baseUserMessageDO.setSenderName(senderName);
            baseUserMessageDO.setReceiver(reciverId);
            baseUserMessageDO.setReceiverName(reciverName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setRelationName("专家咨询");
            baseUserMessageDO.setRelationType(3);
            baseUserMessageDO.setStatus(2);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
        else{
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setSender(senderId);
            baseUserMessageDO.setSenderName(senderName);
            baseUserMessageDO.setReceiver(reciverId);
            baseUserMessageDO.setReceiverName(reciverName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setRelationName("专家咨询");
            baseUserMessageDO.setRelationType(3);
            baseUserMessageDO.setStatus(1);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
    }
    //在线复诊留言
    public void onlineVisitMessage(String content, String reciverId, String reciverName, String senderId, String senderName, String relationCode) {
        List<BaseUserMessageDO> baseUserMessageDOS = baseUserMessageDao.getMessageByCode(relationCode);
        if (baseUserMessageDOS.size()>0){
            BaseUserMessageDO peiviousMessage = baseUserMessageDOS.get(0);
            peiviousMessage.setStatus(2);
            baseUserMessageDao.save(peiviousMessage);
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setSender(senderId);
            baseUserMessageDO.setSenderName(senderName);
            baseUserMessageDO.setReceiver(reciverId);
            baseUserMessageDO.setReceiverName(reciverName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setRelationName("在线复诊");
            baseUserMessageDO.setRelationType(4);
            baseUserMessageDO.setStatus(2);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
        else{
            BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
            baseUserMessageDO.setContent(content);
            baseUserMessageDO.setSender(senderId);
            baseUserMessageDO.setSenderName(senderName);
            baseUserMessageDO.setReceiver(reciverId);
            baseUserMessageDO.setReceiverName(reciverName);
            baseUserMessageDO.setRelationCode(relationCode);
            baseUserMessageDO.setRelationName("在线复诊");
            baseUserMessageDO.setRelationType(4);
            baseUserMessageDO.setStatus(1);
            baseUserMessageDO.setDel(1);
            baseUserMessageDao.save(baseUserMessageDO);
        }
    }
}

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

@@ -44,6 +44,7 @@ import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.mapping.dao.PatientMappingDao;
import com.yihu.jw.hospital.mapping.service.DoctorMappingService;
import com.yihu.jw.hospital.mapping.service.PatientMappingService;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.hospital.prescription.dao.*;
import com.yihu.jw.hospital.prescription.service.entrance.EntranceService;
@@ -240,6 +241,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
    @Autowired
    private BaseSensitiveFilterWordsService baseSensitiveFilterWordsService;
    @Autowired
    private BaseBannerDoctorDao baseBannerDoctorDao;
@@ -3181,6 +3184,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            } else {
                rs.put("scoreDoctor", null);
            }
            int count = baseBannerDoctorDao.getTotalBannerCount(doctor);
            rs.put("bannerCount",count);
            //查询评价明细
            String sqlScoreList = "SELECT " +

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -23,6 +23,7 @@ import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateDao;
import com.yihu.jw.evaluate.score.dao.BaseEvaluateScoreDao;
import com.yihu.jw.hospital.consult.dao.HospitalWaitingRoomDao;
import com.yihu.jw.hospital.message.dao.BaseBannerDoctorDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
@@ -114,6 +115,8 @@ public class ImService {
	@Autowired
	private PrescriptionService prescriptionService;
	@Autowired
	private BaseBannerDoctorDao baseBannerDoctorDao;
	
	@Value("${im.data_base_name}")
	private String data_base_name;
@@ -1658,25 +1661,38 @@ public class ImService {
			for(BaseEvaluateDO baseEvaluateDO :baseEvaluateDOS){
				baseEvaluateDO.setRelationCode(evaluateScoreDO.getId());
				baseEvaluateDO = baseEvaluateDao.save(baseEvaluateDO);
				BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
				baseUserMessageDO.setCreateTime(new Date());
				baseUserMessageDO.setReceiver(consultTeamDo.getDoctor());
				baseUserMessageDO.setReceiverName(consultTeamDo.getDoctorName());
				baseUserMessageDO.setSender(consultTeamDo.getPatient());
				baseUserMessageDO.setSenderName(consultTeamDo.getName());
				baseUserMessageDO.setRelationCode(baseEvaluateDO.getId());
				baseUserMessageDO.setRelationType(2);
				baseUserMessageDO.setRelationName("评价留言");
				baseUserMessageDO.setUpdateTime(new Date());
				userMessageDao.save(baseUserMessageDO);
				if (org.apache.commons.lang3.StringUtils.isNoneBlank(bannerList)){
					String str[]=bannerList.split(",");
					for (int i=0;i<bannerList.length();i++){
						BaseBannerDoctorDO bannerDoctorDO = new BaseBannerDoctorDO();
						bannerDoctorDO.setCreateTime(new Date());
						bannerDoctorDO.setUpdateTime(new Date());
				if("4".equalsIgnoreCase(baseEvaluateDO.getScoreType())){
					BaseUserMessageDO baseUserMessageDO = new BaseUserMessageDO();
					baseUserMessageDO.setCreateTime(new Date());
					baseUserMessageDO.setReceiver(consultTeamDo.getDoctor());
					baseUserMessageDO.setReceiverName(consultTeamDo.getDoctorName());
					baseUserMessageDO.setSender(consultTeamDo.getPatient());
					baseUserMessageDO.setSenderName(consultTeamDo.getName());
					baseUserMessageDO.setRelationCode(baseEvaluateDO.getRelationCode());
					baseUserMessageDO.setRelationType(3);
					baseUserMessageDO.setRelationName("专家咨询");
					baseUserMessageDO.setUpdateTime(new Date());
					userMessageDao.save(baseUserMessageDO);
					if (org.apache.commons.lang3.StringUtils.isNoneBlank(bannerList)){
						String str[]=bannerList.split(",");
						for (int i=0;i<bannerList.length();i++){
							BaseBannerDoctorDO bannerDoctorDO = new BaseBannerDoctorDO();
							bannerDoctorDO.setCreateTime(new Date());
							bannerDoctorDO.setUpdateTime(new Date());
							bannerDoctorDO.setPatientId(baseUserMessageDO.getSender());
							bannerDoctorDO.setRerelationName(baseUserMessageDO.getSenderName());
							bannerDoctorDO.setDoctor(baseUserMessageDO.getReceiver());
							bannerDoctorDO.setDoctorName(baseUserMessageDO.getReceiverName());
							bannerDoctorDO.setBannerId(str[i]);
							bannerDoctorDO.setRelationCode(baseEvaluateDO.getRelationCode());
							bannerDoctorDO.setRelationType(3);
							bannerDoctorDO.setRerelationName("专家咨询");
							bannerDoctorDO.setContent(baseEvaluateDO.getContent());
							baseBannerDoctorDao.save(bannerDoctorDO);
						}
					}
				}
			}
			
			consultTeamDo.setEvaluate(1);//保存已评价标识
@@ -1735,10 +1751,16 @@ public class ImService {
				"LEFT JOIN wlyy_consult_team c ON c.consult=b.relation_code " +
				"WHERE a.relation_code=b.id "+
				"AND c.consult='"+consult+"'";
		System.out.println(sqlScoreList);
		List<Map<String,Object>> scoreList = hibenateUtils.createSQLQuery(sqlScoreList);
		if(scoreList.isEmpty()){
			return null;
		}else{
			Map<String,Object> map = new HashMap<>();
			String sql = "select b.name AS \"name\",b.img AS \"img\" from base_banner_doctor a LEFT JOIN base_banner b on a.banner_id= b.id where a.relation_code = '"+consult+"'";
			List<Map<String,Object>> bannerlist=hibenateUtils.createSQLQuery(sql);
			map.put("bannerList",bannerlist);
			scoreList.add(map);
			return scoreList;
		}
	}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/message/BaseUserMessageDO.java

@@ -18,6 +18,10 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
     *发送者code
     */
    private String sender;
    /**
     *发送内容
     */
    private String content;
    /**
     * 发送者名字
@@ -60,6 +64,14 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
     */
    private Integer del;
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public void setRelationType(Integer relationType) {
        this.relationType = relationType;
    }

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -1114,7 +1114,7 @@ public class BaseHospitalRequestMapping {
    }
    /**
     * 医生礼物管理
     * 医生锦旗管理
     */
    public static class BaseBannerssage extends Basic{
        public static final String baseBanner  = "/baseBanner";
@@ -1127,13 +1127,26 @@ public class BaseHospitalRequestMapping {
        public static final String onOff = "/onOff";
    }
    /**
     * 医生礼物管理
     * 医生锦旗展示
     */
    public static class DoctorBanner extends Basic{
        public static final String doctorBanner  = "/doctorBanner";
        public static final String giveBanner  = "/giveBanner";
        public static final String getBanner  = "/getBanner";
    }
    /**
     * 留言展示
     */
    public static class UserMessage extends Basic{
        public static final String userMessage  = "/userMessage";
        public static final String leaveMessage  = "/leaveMessage";
        public static final String responseMessage  = "/responseMessage";
        public static final String showMessage  = "/showMessage";
        public static final String getSingleMessage  = "/getSingleMessage";
        public static final String expertMessage  = "/expertMessage";
        public static final String onlineVisitMessage  = "/onlineVisitMessage";
    }
    /**
     * 医生分析总览

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/BaseUserMsgController.java

@@ -0,0 +1,116 @@
package com.yihu.jw.hospital.endpoint.message;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.hospital.message.service.BaseUserMsgService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.UserMessage.userMessage)
@Api(value = "评论管理接口", description = "评论管理接口", tags = {"互联网医院 - 评论管理接口"})
public class BaseUserMsgController extends EnvelopRestEndpoint {
    @Autowired
    private BaseUserMsgService baseUserMsgService;
    /*@ApiOperation("评论留言")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.leaveMessage)
    public Envelop leaveMessage(@ApiParam(name = "doctor", value = "doctor", required = false)
                              @RequestParam(value = "doctor", required = false)String doctor,
                              @ApiParam(name = "doctorName", value = "doctorName", required = false)
                              @RequestParam(value = "doctorName", required = false)String doctorName,
                              @ApiParam(name = "content", value = "content", required = false)
                                  @RequestParam(value = "content", required = false)String content,
                                          @ApiParam(name = "relationCode", value = "relationCode", required = false)
                                          @RequestParam(value = "relationCode", required = false)String relationCode){
        String patient = getUID();
        String patinetName = getUNAME();
        baseUserMsgService.leaveMessage(content,doctor,doctorName,patient,patinetName,relationCode);
        return success("评论成功" );
    }*/
    @ApiOperation("自身评论")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.responseMessage)
    public Envelop responseMessage(@ApiParam(name = "reciverId", value = "reciverId", required = false)
                              @RequestParam(value = "reciverId", required = false)String reciverId,
                              @ApiParam(name = "reciverName", value = "reciverName", required = false)
                              @RequestParam(value = "reciverName", required = false)String reciverName,
                              @ApiParam(name = "content", value = "content", required = false)
                              @RequestParam(value = "content", required = false)String content,
                              @ApiParam(name = "relationCode", value = "relationCode", required = false)
                              @RequestParam(value = "relationCode", required = false)String relationCode){
        String senderId = getUID();
        String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId,senderName,relationCode);
        return success("留言成功" );
    }
    @ApiOperation("医生评论展示")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.showMessage)
    public Envelop showMessage(@ApiParam(name = "doctor", value = "doctor", required = false)
                                   @RequestParam(value = "doctor", required = false)String doctor,
                               @ApiParam(name = "showAll", value = "showAll", required = false)
                               @RequestParam(value = "showAll", required = false)String showAll,
                               @ApiParam(name = "showAllType", value = "showAllType", required = false)
                                   @RequestParam(value = "showAllType", required = false)String showAllType,
                               @ApiParam(name = "beginTime", value = "beginTime", required = false)
                                   @RequestParam(value = "beginTime", required = false)String beginTime,
                               @ApiParam(name = "endTime", value = "endTime", required = false)
                                   @RequestParam(value = "endTime", required = false)String endTime){
        List<Map<String,Object>> list = baseUserMsgService.getMessage(doctor,showAll,showAllType,beginTime,endTime);
        if (list.size()>=0){
            return success(list);
        }else {
            return failed("查询失败");
        }
    }
    @ApiOperation("医生评论展示")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.getSingleMessage)
    public Envelop getSingleMessage(@ApiParam(name = "id", value = "id", required = false)
                               @RequestParam(value = "id", required = false)String id){
        List<Map<String,Object>> list = baseUserMsgService.getSingle(id);
        if (list.size()>=0){
            return success(list);
        }else {
            return failed("查询失败");
        }
    }
    @ApiOperation("在线复诊")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.onlineVisitMessage)
    public Envelop onlineVisitMessage(@ApiParam(name = "reciverId", value = "reciverId", required = false)
                                   @RequestParam(value = "reciverId", required = false)String reciverId,
                                   @ApiParam(name = "reciverName", value = "reciverName", required = false)
                                   @RequestParam(value = "reciverName", required = false)String reciverName,
                                   @ApiParam(name = "content", value = "content", required = false)
                                   @RequestParam(value = "content", required = false)String content,
                                   @ApiParam(name = "relationCode", value = "relationCode", required = false)
                                   @RequestParam(value = "relationCode", required = false)String relationCode){
        String senderId = getUID();
        String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId,senderName,relationCode);
        return success("留言成功" );
    }
    @ApiOperation("专家咨询")
    @PostMapping(value= BaseHospitalRequestMapping.UserMessage.expertMessage)
    public Envelop expertMessage(@ApiParam(name = "reciverId", value = "reciverId", required = false)
                                   @RequestParam(value = "reciverId", required = false)String reciverId,
                                   @ApiParam(name = "reciverName", value = "reciverName", required = false)
                                   @RequestParam(value = "reciverName", required = false)String reciverName,
                                   @ApiParam(name = "content", value = "content", required = false)
                                   @RequestParam(value = "content", required = false)String content,
                                   @ApiParam(name = "relationCode", value = "relationCode", required = false)
                                   @RequestParam(value = "relationCode", required = false)String relationCode){
        String senderId = getUID();
        String senderName = getUNAME();
        baseUserMsgService.leaveMessage(content,reciverId,reciverName,senderId,senderName,relationCode);
        return success("留言成功" );
    }
}