代码修改

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/article/ArticleEndpoint.java

@@ -344,6 +344,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
    @ApiOperation(value = "发送文章/问卷")
    public ListEnvelop sendArticleToUser(
            @ApiParam(name = "json", value = "发送文章/问卷") @RequestParam(value = "json", required = false) String json
    ) throws Exception {
        try {
            System.out.println("sendArticleToUser==>"+json);
@@ -442,10 +443,11 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "flag", value = "1收藏2阅读3点赞4分享") @RequestParam(value = "flag", required = true) Integer flag,
            @ApiParam(name = "status", value = "收藏（1收藏0未收藏）/阅读（1已读0未读）/点赞（1已赞0未赞）分享（1已分享0未分享）") @RequestParam(value = "status", required = true) Integer status,
            @ApiParam(name = "user", value = "用户code") @RequestParam(value = "user", required = true) String user,
            @ApiParam(name = "userType", value = "用户类型（1患者2医生）") @RequestParam(value = "userType", required = true) String userType
            @ApiParam(name = "userType", value = "用户类型（1患者2医生）") @RequestParam(value = "userType", required = true) String userType,
            @ApiParam(name = "relationType", value = "文章类型 1、文章 2、问卷  3、指导  4、im咨询") @RequestParam(value = "relationType", required = true) String relationType
    ) throws Exception {
        try {
            return success(patientBusinessService.setCollectionById(id, flag, status, user, userType));
            return success(patientBusinessService.setCollectionById(id, flag, status, user, userType,relationType));
        } catch (Exception e) {
            return failedObjEnvelopException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/BasePatientBusinessService.java

@@ -55,14 +55,15 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
	 * @param status
	 * @return
	 */
	public KnowledgeArticleDictDO setCollectionById(String id,Integer flag,Integer status,String user,String userType){
	public KnowledgeArticleDictDO setCollectionById(String id,Integer flag,Integer status,String user,String userType,String relationType){
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(id);
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,user);
		if (knowledgeArticleUserDO==null){
			knowledgeArticleUserDO = new KnowledgeArticleUserDO();
			knowledgeArticleUserDO.setRelationCode(id);
			knowledgeArticleUserDO.setRelationName(knowledgeArticleDO.getTitle());
			knowledgeArticleUserDO.setRelationType(1);
			//1、文章 2、问卷  3、指导  4、im咨询
			knowledgeArticleUserDO.setRelationType(Integer.parseInt(relationType));
			knowledgeArticleUserDO.setDel(1);
			knowledgeArticleUserDO.setUser(user);
			if (StringUtils.isNoneBlank(userType)&&userType.equalsIgnoreCase("1")){

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleUserService.java

@@ -1,12 +1,15 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
@@ -21,16 +24,38 @@ public class KnowledgeArticleUserService extends BaseJpaService<KnowledgeArticle
    @Autowired
    private KnowledgeArticleUserDao knowledgeArticleUserDao;
    @Autowired
    BasePatientBusinessDao basePatientBusinessDao;
    /**
     * 用户和文章的关系
     * -- 1医生给患者发   2医生给自己发
     */
    public List<KnowledgeArticleUserDO> sendArticleToUser(List<KnowledgeArticleUserDO> knowledgeArticleUserDOList) {
        ArrayList<KnowledgeArticleUserDO> list = new ArrayList<>();
        if (knowledgeArticleUserDOList != null && knowledgeArticleUserDOList.size() > 0) {
            for (KnowledgeArticleUserDO articleUserDO : knowledgeArticleUserDOList) {
                KnowledgeArticleUserDO userDO = knowledgeArticleUserDao.save(articleUserDO);
                list.add(userDO);
                KnowledgeArticleUserDO knowledgeArticleUserDO = knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleUserDO.getRelationCode(), articleUserDO.getUser());
                if (knowledgeArticleUserDO == null) {
                    KnowledgeArticleUserDO userDO = knowledgeArticleUserDao.save(articleUserDO);
                    list.add(userDO);
                } else {
                    list.add(knowledgeArticleUserDO);
                }
                BasePatientBusinessDO businessDO = new BasePatientBusinessDO();
                businessDO.setPatient(articleUserDO.getUser());
                businessDO.setPatientName(articleUserDO.getUserName());
                businessDO.setDoctor(articleUserDO.getCreateUser());
                businessDO.setDoctorName(articleUserDO.getCreateUserName());
                businessDO.setRelationType(articleUserDO.getRelationType());
                businessDO.setDel(1);
                businessDO.setCreateTime(new Date());
                businessDO.setUpdateTime(new Date());
                basePatientBusinessDao.save(businessDO);
            }
        }
        System.out.println("保存数量==>"+list.size());
        System.out.println("保存数量==>" + list.size());
        return list;
    }
}