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/patient/dao/BasePatientBusinessDao.java

@@ -12,4 +12,5 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface BasePatientBusinessDao extends PagingAndSortingRepository<BasePatientBusinessDO, String>, JpaSpecificationExecutor<BasePatientBusinessDO> {
    @Query("select a from BasePatientBusinessDO a where a.del=1 and a.id=?1")
    BasePatientBusinessDO findByIdAndDel(String id);
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientBusinessDO.java

@@ -61,6 +61,21 @@ public class BasePatientBusinessDO extends UuidIdentityEntityWithOperator {
     */
    private Integer collection;
    /**
     * 1已读0未读
     */
    private Integer isRead;
    /**
     * 1已赞,0未赞
     */
    private Integer fabulous;
    /**
     * 1分享0未分享
     */
    private Integer share;
    /**
     * 状态1正常0删除
     */
@@ -162,4 +177,29 @@ public class BasePatientBusinessDO extends UuidIdentityEntityWithOperator {
    public void setWlyySurveyTemplateDO(WlyySurveyTemplateDO wlyySurveyTemplateDO) {
        this.wlyySurveyTemplateDO = wlyySurveyTemplateDO;
    }
    public Integer getFabulous() {
        return fabulous;
    }
    public void setFabulous(Integer fabulous) {
        this.fabulous = fabulous;
    }
    public Integer getShare() {
        return share;
    }
    public void setShare(Integer share) {
        this.share = share;
    }
    public Integer getIsRead() {
        return isRead;
    }
    public void setIsRead(Integer isRead) {
        this.isRead = isRead;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/article/KnowledgeArticleDO.java

@@ -37,9 +37,15 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	private Integer status;// 0未审核 1已审核
	private String cancelReason;//退回理由
	private Integer used;//1常用0不常用
	private Integer readCount;//已读数
	private Integer collection;//收藏数量
	private Integer fabulous;//点赞数量
	private Integer share;//分享 数量
	@Transient
	private String deptName;
	@Transient
	private String hospitalName;
	
	
	public String getCreateUser() {
@@ -194,4 +200,45 @@ public class KnowledgeArticleDO extends UuidIdentityEntity {
	public void setDeptName(String deptName) {
		this.deptName = deptName;
	}
	@Transient
	public String getHospitalName() {
		return hospitalName;
	}
	public void setHospitalName(String hospitalName) {
		this.hospitalName = hospitalName;
	}
	public Integer getCollection() {
		return collection;
	}
	public void setCollection(Integer collection) {
		this.collection = collection;
	}
	public Integer getFabulous() {
		return fabulous;
	}
	public void setFabulous(Integer fabulous) {
		this.fabulous = fabulous;
	}
	public Integer getShare() {
		return share;
	}
	public void setShare(Integer share) {
		this.share = share;
	}
	public Integer getReadCount() {
		return readCount;
	}
	public void setReadCount(Integer readCount) {
		this.readCount = readCount;
	}
}

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

@@ -1069,7 +1069,7 @@ public class BaseHospitalRequestMapping {
        //获取患者文章列表
        public static final String searchPatientArticle  = "/searchPatientArticle";
        //设置为常用/不常用
        //设置文章状态
        public static final String setArticleCollection  = "/setArticleCollection";
        
    }

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

@@ -85,6 +85,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
				BaseDoctorHospitalDO doctorHospitalDO = doctorHospitalDOS.get(0);
				knowledgeArticleDO.setDeptName(doctorHospitalDO.getDeptName());
				knowledgeArticleDO.setHospitalName(doctorHospitalDO.getOrgName());
			}
		}
		List<KnowledgeArticleDO> totals  = knowledgeArticleService.search(fields,filters,sorts);
@@ -268,6 +269,13 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			Integer type = patientBusinessDO.getRelationType();
			if (type==1){
				KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleService.selectById(patientBusinessDO.getRelationCode());
				if (knowledgeArticleDO!=null){
					List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(knowledgeArticleDO.getCreateUser());
					if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
						knowledgeArticleDO.setDeptName(doctorHospitalDOS.get(0).getDeptName());
						knowledgeArticleDO.setHospitalName(doctorHospitalDOS.get(0).getOrgName());
					}
				}
				patientBusinessDO.setKnowledgeArticleDO(knowledgeArticleDO);
			}
		}
@@ -282,11 +290,13 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	@PostMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.setArticleCollection)
	@ApiOperation(value = "设置文章为收藏/未收藏")
	@ApiOperation(value = "设置文章状态")
	public ObjEnvelop setArticleCollection(@ApiParam(name = "id", value = "文章id")
									 @RequestParam(value = "id",required = true)String id,
									 @ApiParam(name = "collection", value = "收藏（1收藏0未收藏）")
									 @RequestParam(value = "collection",required = false)Integer collection)throws Exception {
		return success(patientBusinessService.setCollectionById(id,collection));
									 @ApiParam(name = "flag", value = "1收藏2阅读3点赞4分享")
									 @RequestParam(value = "flag",required = false)Integer flag,
									 @ApiParam(name = "status", value = "收藏（1收藏0未收藏）/阅读（1已读0未读）/点赞（1已赞0未赞）分享（1已分享0未分享）")
									 @RequestParam(value = "status",required = false)Integer status)throws Exception {
		return success(patientBusinessService.setCollectionById(id,flag,status));
	}
}

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

@@ -1,6 +1,8 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDao;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.mysql.query.BaseJpaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -14,18 +16,100 @@ public class BasePatientBusinessService extends BaseJpaService<BasePatientBusine
	@Autowired
	private BasePatientBusinessDao patientBusinessDao;
	@Autowired
	private KnowledgeArticleDao knowledgeArticleDao;
	/**
	 *
	 * @param id
	 * @param collection
	 * @param flag 1收藏2阅读3点赞4分享
	 * @param status
	 * @return
	 */
	public BasePatientBusinessDO setCollectionById(String id,Integer collection){
	public BasePatientBusinessDO setCollectionById(String id,Integer flag,Integer status){
		BasePatientBusinessDO patientBusinessDO = patientBusinessDao.findByIdAndDel(id);
		if (patientBusinessDO!=null){
			patientBusinessDO.setCollection(collection);
			patientBusinessDao.save(patientBusinessDO);
			if (flag!=null&&flag==1){
				patientBusinessDO.setCollection(status);
				patientBusinessDao.save(patientBusinessDO);
				KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
				if (knowledgeArticleDO!=null){
					if (knowledgeArticleDO.getCollection()!=null){
						if (status==1){
							knowledgeArticleDO.setCollection(knowledgeArticleDO.getCollection()+1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}else {
							knowledgeArticleDO.setCollection(knowledgeArticleDO.getCollection()-1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}else {
						if (status==1){
							knowledgeArticleDO.setCollection(1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}
				}
			}else if (flag!=null&&flag==2){
				patientBusinessDO.setIsRead(status);
				patientBusinessDao.save(patientBusinessDO);
				KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
				if (knowledgeArticleDO!=null){
					if (knowledgeArticleDO.getReadCount()!=null){
						if (status==1){
							knowledgeArticleDO.setReadCount(knowledgeArticleDO.getReadCount()+1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}else {
							knowledgeArticleDO.setReadCount(knowledgeArticleDO.getReadCount()-1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}else {
						if (status==1){
							knowledgeArticleDO.setReadCount(1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}
				}
			}else if (flag!=null&&flag==3){
				patientBusinessDO.setFabulous(status);
				patientBusinessDao.save(patientBusinessDO);
				KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
				if (knowledgeArticleDO!=null){
					if (knowledgeArticleDO.getFabulous()!=null){
						if (status==1){
							knowledgeArticleDO.setFabulous(knowledgeArticleDO.getFabulous()+1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}else {
							knowledgeArticleDO.setFabulous(knowledgeArticleDO.getFabulous()-1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}else {
						if (status==1){
							knowledgeArticleDO.setFabulous(1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}
				}
			}else if (flag!=null&&flag==4){
				patientBusinessDO.setShare(status);
				patientBusinessDao.save(patientBusinessDO);
				KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
				if (knowledgeArticleDO!=null){
					if (knowledgeArticleDO.getShare()!=null){
						if (status==1){
							knowledgeArticleDO.setShare(knowledgeArticleDO.getShare()+1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}else {
							knowledgeArticleDO.setShare(knowledgeArticleDO.getShare()-1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}else {
						if (status==1){
							knowledgeArticleDO.setShare(1);
							knowledgeArticleDao.save(knowledgeArticleDO);
						}
					}
				}
			}
		}
		return patientBusinessDO;
	}

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

@@ -222,7 +222,9 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
	 */
	public KnowledgeArticleDO setUsed(String id,Integer used){
		KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(id);
		knowledgeArticleDO.setUsed(used);
        if (knowledgeArticleDO!=null){
            knowledgeArticleDO.setUsed(used);
        }
		return knowledgeArticleDao.save(knowledgeArticleDO);
	}
@@ -231,4 +233,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		return knowledgeArticleDao.findByIdAndDel(id);
	}
}