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

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

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

@@ -0,0 +1,15 @@
package com.yihu.jw.message.service;
import com.yihu.jw.entity.base.message.BaseMessageDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.message.dao.MessageDao;
import com.yihu.mysql.query.BaseJpaService;
/**
 * Created by wangzhinan on 2020/7/9.
 */
public class UserMessageService extends BaseJpaService<BaseUserMessageDO, BaseUserMessageDao> {
}

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

@@ -14,19 +14,15 @@ import com.yihu.jw.entity.base.im.ConsultTeamLogDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.score.BaseEvaluateDO;
import com.yihu.jw.entity.base.score.BaseEvaluateScoreDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalWaitingRoomDO;
import com.yihu.jw.entity.hospital.httplog.WlyyHttpLogDO;
import com.yihu.jw.entity.hospital.mapping.DoctorMappingDO;
import com.yihu.jw.entity.hospital.message.BaseUserMessageDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.entity.hospital.prescription.WlyyOutpatientDO;
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.httplog.dao.WlyyHttpLogDao;
import com.yihu.jw.hospital.mapping.service.DoctorMappingService;
import com.yihu.jw.hospital.message.dao.SystemMessageDao;
import com.yihu.jw.hospital.message.dao.BaseUserMessageDao;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.hospital.prescription.dao.OutpatientDao;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
@@ -36,35 +32,23 @@ import com.yihu.jw.im.dao.ConsultDao;
import com.yihu.jw.im.dao.ConsultTeamDao;
import com.yihu.jw.im.dao.ConsultTeamDoctorDao;
import com.yihu.jw.im.dao.ConsultTeamLogDao;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.im.util.ImageCompress;
import com.yihu.jw.order.dao.BusinessOrderDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.hospital.consult.WlyyHospitalSysDictVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionDiagnosisVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionInfoVO;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.im.ConsultVO;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.rm.base.BaseRequestMapping;
import com.yihu.jw.util.common.FileUtil;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.wechat.service.WxAccessTokenService;
import com.ylzinfo.onepay.sdk.utils.StringUtil;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -78,8 +62,6 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
/**
 * IM接口业务类
@@ -155,31 +137,22 @@ public class ImService {
	
	@Autowired
	private JdbcTemplate jdbcTemplate;
	
	@Autowired
	private BaseDoctorDao baseDoctorDao;
	
	@Autowired
	private OutpatientDao outpatientDao;
	
	@Autowired
	private EntranceService entranceService;
	@Autowired
	private DoctorMappingService doctorMappingService;
	@Autowired
	private WlyyHttpLogDao wlyyHttpLogDao;
	
	@Autowired
	private BaseDoctorRoleDao baseDoctorRoleDao;
	
	@Autowired
	private StringRedisTemplate redisTemplate;
	@Autowired
	private HibenateUtils hibenateUtils;
	@Autowired
	private SystemMessageService systemMessageService;
	@Autowired
	private BaseUserMessageDao userMessageDao;
	
	@Value("${wechat.id}")
	private String wxId;
@@ -1631,7 +1604,7 @@ public class ImService {
	 * @param scoreContent
	 * @param type
	 */
	public void evaluationByConsultCode(String consult, String scoreContent, Integer type,String pennantList) throws Exception{
	public void evaluationByConsultCode(String consult, String scoreContent, Integer type,String bannerList) throws Exception{
		JSONArray jsonArray =  JSONArray.parseArray(scoreContent);
		
		Integer totalScore = 0;
@@ -1678,7 +1651,24 @@ public class ImService {
			
			for(BaseEvaluateDO baseEvaluateDO :baseEvaluateDOS){
				baseEvaluateDO.setRelationCode(evaluateScoreDO.getId());
				baseEvaluateDao.save(baseEvaluateDO);
				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++){
					}
				}
			}
			
			consultTeamDo.setEvaluate(1);//保存已评价标识

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

@@ -40,15 +40,46 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
    private String relationCode;
    /**
     * 业务类型
     * 业务类型 1自身留言，2评论留言，3、锦旗留言，4、专家咨询，5、在线复诊
     */
    private String relationType;
    private Integer relationType;
    /**
     * 业务名称
     */
    private String relationName;
    /**
     *1居民发起留言2回复
     */
    private Integer status;
    /**
     * 删除状态（1正常0删除）
     */
    private Integer del;
    public void setRelationType(Integer relationType) {
        this.relationType = relationType;
    }
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    public Integer getDel() {
        return del;
    }
    public void setDel(Integer del) {
        this.del = del;
    }
    public String getSender() {
        return sender;
    }
@@ -89,14 +120,6 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
        this.relationCode = relationCode;
    }
    public String getRelationType() {
        return relationType;
    }
    public void setRelationType(String relationType) {
        this.relationType = relationType;
    }
    public String getRelationName() {
        return relationName;
    }
@@ -104,4 +127,8 @@ public class BaseUserMessageDO extends UuidIdentityEntityWithOperator {
    public void setRelationName(String relationName) {
        this.relationName = relationName;
    }
    public Integer getRelationType() {
        return relationType;
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

@@ -629,12 +629,12 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "scoreContent",required = false) String scoreContent,
			@ApiParam(name = "type", value = "1、实名，2、匿名")
			@RequestParam(value = "type",required = true) Integer type,
			@ApiParam(name = "pennantList",value = "锦旗")
			@RequestParam(value = "pennantList",required = false) String pennantList)throws Exception{
			@ApiParam(name = "bannerList",value = "锦旗")
			@RequestParam(value = "bannerList",required = false) String bannerList)throws Exception{
//		if(StringUtils.isEmpty(scoreContent)){
//			scoreContent= "[{\"scoreType\":\"1\",\"score\":100,\"content\":\"\"},{\"scoreType\":\"2\",\"score\":80,\"content\":\"\"},{\"scoreType\":\"3\",\"score\":80,\"content\":\"\"},{\"scoreType\":\"4\",\"score\":0,\"content\":\"测试评语。。。。123123\"}]";
//		}
		imService.evaluationByConsultCode(consult,scoreContent,type,pennantList);
		imService.evaluationByConsultCode(consult,scoreContent,type,bannerList);
		return success("请求成功");
	}