代码修改

business/base-service/src/main/java/com/yihu/jw/article/dao/KnowledgeArticleDictDao.java

@@ -14,16 +14,15 @@ import java.util.List;
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleDictDao extends JpaRepository<KnowledgeArticleDictDO, String>, JpaSpecificationExecutor<KnowledgeArticleDictDO> {
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and (categoryFirst = ?1 or categorySecond=?1)")
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and (a.categoryFirst = ?1 or a.categorySecond=?1)")
	List<KnowledgeArticleDictDO> findByCategory(String category);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and categoryFirst = ?1 ")
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and a.categoryFirst = ?1 ")
	List<KnowledgeArticleDictDO> findByCategoryFirst(String category);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  categorySecond=?1")
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond=?1")
	List<KnowledgeArticleDictDO> findByCategorySecond(String category);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and a.id=?1")
	KnowledgeArticleDictDO findByIdAndDel(String id);
@@ -36,11 +35,5 @@ public interface KnowledgeArticleDictDao extends JpaRepository<KnowledgeArticleD
	@Query(" select count(*) from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN (?1) and a.releaseStatus=1 and a.title like %?2%")
	Integer getCountByCategorySecond(List<String> category,String title);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN ( ?1 ) and a.releaseStatus=1 order by  a.releaseTime desc,a.createTime desc ")
	List<KnowledgeArticleDictDO> findByCategorySecondAndPage(List<String> category,Pageable pageRequest);
	@Query("select a from KnowledgeArticleDictDO a where a.del=1 and  a.categorySecond IN ( ?1 ) and a.releaseStatus=1 and a.title like %?2% order by  a.releaseTime desc,a.createTime desc ")
	List<KnowledgeArticleDictDO> findByCategorySecondAndPage(List<String> category,String title,Pageable pageRequest);
}

business/base-service/src/main/java/com/yihu/jw/article/service/BaseMenuManageService.java

@@ -47,6 +47,8 @@ public class BaseMenuManageService {
    @Autowired
    private KnowledgeArticleDictDao knowledgeArticleDictDao;
    @Autowired
    private KnowledgeArticleDictService knowledgeArticleDictService;
    @Autowired
    private WlyyHospitalSysDictDao wlyyHospitalSysDictDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
@@ -899,7 +901,7 @@ public class BaseMenuManageService {
    public KnowledgeArticleUserDO updateArticleUser(Integer flag, String articleId, String userCode, Integer status){
        KnowledgeArticleUserDO knowledgeArticleUserDO = knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleId,userCode);
        BasePatientDO patientDO = patientDao.findByIdAndDel(userCode,"1");
        KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(articleId);
        KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictService.findByIdAndDel(articleId);
        if (knowledgeArticleUserDO!=null){
            if (flag==1){
                knowledgeArticleUserDO.setFabulous(status);
@@ -1214,19 +1216,24 @@ public class BaseMenuManageService {
     * @return
     */
    public JSONObject findArticleStaticsByArticleId(String articleId){
        List<KnowledgeArticleDoctorDO> knowledgeArticleDoctorDOS = knowledgeArticleDoctorDao.findByRelationCodeAndType(articleId,2);//获取点赞
        List<KnowledgeArticleDoctorDO> knowledgeArticleDoctorDOList = knowledgeArticleDoctorDao.findByRelationCodeAndType(articleId,3);//获取收藏
        List<KnowledgeArticleDoctorDO> knowledgeArticleDoctorDOList1 = knowledgeArticleDoctorDao.findByRelationCodeAndType(articleId,1);//获取评论
        List<KnowledgeArticleDoctorDO> knowledgeArticleDoctorDOList2 = knowledgeArticleDoctorDao.findByRelationCodeAndType(articleId,4);//获取评论
        Integer knowledgeArticleDoctorDOS = findByRelationCodeAndType(articleId,2);//获取点赞
        Integer knowledgeArticleDoctorDOList = findByRelationCodeAndType(articleId,3);//获取收藏
        Integer knowledgeArticleDoctorDOList1 = findByRelationCodeAndType(articleId,1);//获取评论
        Integer knowledgeArticleDoctorDOList2 = findByRelationCodeAndType(articleId,4);//获取评论
        JSONObject object = new JSONObject();
        object.put("eulogyTotal",knowledgeArticleDoctorDOS.size());//点赞数量
        object.put("collectTotal",knowledgeArticleDoctorDOList.size());//收藏数量
        object.put("commentTotal",knowledgeArticleDoctorDOList1.size());//评论数量
        object.put("browseTotal",knowledgeArticleDoctorDOList2.size());//浏览量
        object.put("eulogyTotal",knowledgeArticleDoctorDOS);//点赞数量
        object.put("collectTotal",knowledgeArticleDoctorDOList);//收藏数量
        object.put("commentTotal",knowledgeArticleDoctorDOList1);//评论数量
        object.put("browseTotal",knowledgeArticleDoctorDOList2);//浏览量
        return object;
    }
    public Integer findByRelationCodeAndType(String relationCode,Integer type){
        String sql = "select count(*) from base_knowledge_article_doctor where relation_code='"+relationCode+"' and type="+type;
        return jdbcTemplate.queryForObject(sql,Integer.class);
    }
    /**
     * 判断该文章/医生当前医生是否点赞或者收藏

business/base-service/src/main/java/com/yihu/jw/article/service/KnowledgeArticleDictService.java

@@ -29,6 +29,7 @@ import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -124,7 +125,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	public boolean delArticle(String id){
		String str[]= id.split(",");
		for (int i=0;i<str.length;i++){
			KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(str[i]);
			KnowledgeArticleDictDO knowledgeArticleDictDO = findByIdAndDel(str[i]);
			if (knowledgeArticleDictDO!=null){
				knowledgeArticleDictDO.setDel(0);
				knowledgeArticleDictDao.save(knowledgeArticleDictDO);
@@ -135,7 +136,21 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	public KnowledgeArticleDictDO findById(String id){
		return knowledgeArticleDictDao.findByIdAndDel(id);
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"'";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
	}
	public KnowledgeArticleDictDO findByIdAndDel(String id){
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"' and del=1";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
	}
	/**
@@ -185,7 +200,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
			knowledgeArticleDO = knowledgeArticleDictDao.save(knowledgeArticleDO);
			return knowledgeArticleDO;
		} else {
			KnowledgeArticleDictDO one = knowledgeArticleDictDao.findById(knowledgeArticleDO.getId()).orElse(null);;
			KnowledgeArticleDictDO one = findById(knowledgeArticleDO.getId());
			one.setTitle(knowledgeArticleDO.getTitle());
			one.setContent(knowledgeArticleDO.getContent());
			one.setImage(knowledgeArticleDO.getImage());
@@ -249,7 +264,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	//审核/退回文章
	public KnowledgeArticleDictDO reviewArticle(String articleId,Integer status,String reason) throws Exception{
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.findById(articleId).orElse(null);;
		KnowledgeArticleDictDO knowledgeArticleDO = findById(articleId);
		if (null == knowledgeArticleDO) {
			throw new Exception("该文章不存在");
		} else {
@@ -353,7 +368,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
		String ids[] = articleId.split(",");
		KnowledgeArticleDictDO knowledgeArticleDictDO = new KnowledgeArticleDictDO();
		for (int i=0;i<ids.length;i++){
			knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(ids[i]);
			knowledgeArticleDictDO = findByIdAndDel(ids[i]);
			if (null!=knowledgeArticleDictDO){
				knowledgeArticleDictDO.setReleaseStatus(releaseStatus);
				knowledgeArticleDictDao.save(knowledgeArticleDictDO);
@@ -383,7 +398,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
				patientBusinessDO.setDel(1);
				patientBusinessDO = patientBusinessDao.save(patientBusinessDO);
					if (patientBusinessDO.getRelationType()==1){
						KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.findByIdAndDel(patientBusinessDO.getRelationCode());
						KnowledgeArticleDictDO knowledgeArticleDO = findByIdAndDel(patientBusinessDO.getRelationCode());
					System.out.println("content:"+JSON.toJSONString(knowledgeArticleDO));
					JSONObject object = new JSONObject();
					object.put("id",knowledgeArticleDO.getId());
@@ -428,7 +443,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	 * @return
	 */
	public KnowledgeArticleDictDO setUsed(String id,Integer used,String doctor){
		KnowledgeArticleDictDO knowledgeArticleDO = knowledgeArticleDictDao.findByIdAndDel(id);
		KnowledgeArticleDictDO knowledgeArticleDO = findByIdAndDel(id);
		BaseDoctorDO doctorDO = doctorDao.findById(doctor).orElse(null);;
		KnowledgeArticleUserDO knowledgeArticleUserDO =knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(id,doctor);
		if (knowledgeArticleUserDO==null){
@@ -473,7 +488,7 @@ public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticle
	public KnowledgeArticleDictDO selectById(String id){
		return knowledgeArticleDictDao.findByIdAndDel(id);
		return findByIdAndDel(id);
	}
	//根据分类查询文章
	public MixEnvelop findArticleByCategoryAndName(String categoryFirst, String categorySecond, String keyWords, Integer page, Integer pageSize){

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

@@ -93,7 +93,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("?")[1]+"%'";
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";

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

@@ -16,7 +16,6 @@ import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -81,7 +80,7 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("?")[1]+"%'";
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";
@@ -138,7 +137,7 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "id", value = "id", required = true)
			@RequestParam(value = "id", required = true)String id){
		try {
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictDao.findById(id).orElse(null);
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictService.findById(id);
			return success(articleDO);
		}catch (Exception e){
			return failedException2(e);
@@ -235,16 +234,29 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			if(StringUtils.isBlank(filters)){
				filters=filters+"del=1;type=2;status=1";
			}else{
				filters=filters+";del=1;type=2;status=1";
			String sql = "select * ";
			String countSql = "select count(*) ";
			String filter = " from wlyy_knowledge_article_dict where type=2 and del=1 and status=1 ";
			if(org.apache.commons.lang3.StringUtils.isNotBlank(filters)){
				String fil[] = fields.split(";");
				for (String fi:fil){
					if(fi.contains("title?")){
						filter += " and title like '%"+fi.split("\\?")[1]+"%'";
					}
					if(fi.contains("categoryFirst=")){
						filter += " and category_first='"+fi.split("=")[1]+"'";
					}
					if(fi.contains("categorySecond=")){
						filter += " and category_second='"+fi.split("=")[1]+"'";
					}
				}
			}
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			String orderBy = " order by create_time desc limit "+(page-1)*pageSize+","+pageSize;
			List<KnowledgeArticleDictDO> list  = jdbcTemplate.query(sql+filter+orderBy,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
			long total  = jdbcTemplate.queryForObject(countSql+filter,Long.class);
			JSONObject result = new JSONObject();
			result.put("total",totals.size());
			result.put("total",total);
			result.put("detailModelList",list);
			return success(result);
@@ -253,13 +265,15 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
		}
	}
	@GetMapping(value = "open/queryById")
	@ApiOperation(value = "根据id查询文章")
	public Envelop queryByCodeOpen(
			@ApiParam(name = "id", value = "id", required = true)
			@RequestParam(value = "id", required = true)String id){
		try {
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictDao.findById(id).orElse(null);
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictService.findById(id);
			return success(articleDO);
		}catch (Exception e){
			return failedException2(e);

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

@@ -116,7 +116,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			try {
				KnowledgeArticleDO articleDO = knowledgeArticleDao.findById(id).orElse(null);
				if(articleDO==null){
					KnowledgeArticleDictDO articleDictDO = knowledgeArticleDictDao.findByIdAndDel(id);
					KnowledgeArticleDictDO articleDictDO = knowledgeArticleService.findByIdAndDel(id);
					KnowledgeArticleUserDO knowledgeArticleUserDO = knowledgeArticleUserDao.findByrelationCodeAndUserAndDel(articleDictDO.getId(),getUID());
					if (knowledgeArticleUserDO!=null){
						articleDictDO.setIsUsed(knowledgeArticleUserDO.getUsed());

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/patient/PatientNoLoginEndPoint.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.dict.service.BaseDictJobTitleService;
import com.yihu.jw.dict.service.HospitalDeptService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
@@ -259,11 +260,14 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    private WxEnterpriseDao wxEnterpriseDao;
    @Autowired
    private BaseOrgDao baseOrgDao;
    @Autowired
    private DictHospitalDeptDao dictHospitalDeptDao;
    @GetMapping(value = "orgInfo")
    @ApiOperation(value = "机构详情", notes = "机构详情")
    public ObjEnvelop orgInfo(@ApiParam(name = "orgCode", value = "机构编码")
                              @RequestParam(value = "orgCode", required = false)String orgCode
                              @RequestParam(value = "orgCode", required = true)String orgCode
    ) {
        try {
            BaseOrgDO orgDO = baseOrgDao.findByCode(orgCode);
@@ -274,6 +278,20 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "deptInfo")
    @ApiOperation(value = "科室详情", notes = "科室详情")
    public ObjEnvelop deptInfo(@ApiParam(name = "deptId", value = "科室id")
                              @RequestParam(value = "deptId", required = true)Integer deptId
    ) {
        try {
            DictHospitalDeptDO orgDO = dictHospitalDeptDao.findById(deptId).orElse(null);
            return ObjEnvelop.getSuccess("查询成功",orgDO);
        } catch (Exception e){
            e.printStackTrace();
            return ObjEnvelop.getError("查询失败");
        }
    }
    @GetMapping(value = BaseHospitalRequestMapping.PatientNoLogin.findDoctorByHospitalAndDiseaseAndDept)
    @ApiOperation(value = "根据疾病名称，热门部门查询医生", notes = "根据疾病名称，热门部门查询医生")

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

@@ -29,6 +29,7 @@ import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.stereotype.Service;
import java.util.Date;
@@ -242,6 +243,14 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
		return true;
	}
	public KnowledgeArticleDictDO findByIdAndDel(String id){
		String sql = "select * from wlyy_knowledge_article_dict where id ='"+id+"' and del=1";
		List<KnowledgeArticleDictDO> dictDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(KnowledgeArticleDictDO.class));
		if(dictDOS.size()>0){
			return dictDOS.get(0);
		}
		return null;
	}
	/**
	 *	患者接收问卷/文章
@@ -268,7 +277,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
					KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
					JSONObject object = new JSONObject();
					if(knowledgeArticleDO==null){
						KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(patientBusinessDO.getRelationCode());
						KnowledgeArticleDictDO knowledgeArticleDictDO = findByIdAndDel(patientBusinessDO.getRelationCode());
						object.put("id",knowledgeArticleDictDO.getId());
						object.put("title",knowledgeArticleDictDO.getTitle());
						object.put("content",knowledgeArticleDictDO.getIntro());