健康管理端

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

@@ -360,6 +360,18 @@ public class BaseMenuManageService {
                menuOld.setUpdateTime(new Date());
                menuOld.setIsDel("1");
                menuDO = baseMenuDictDao.save(menuOld);
                List<KnowledgeArticleDictDO> knowledgeArticleDictDOS = knowledgeArticleDictDao.findByCategory(menuDO.getId());
                for (KnowledgeArticleDictDO articleDictDO:knowledgeArticleDictDOS){
                    if (!menuDO.getParentId().equalsIgnoreCase("0")){
                        articleDictDO.setCategoryFirst(menuDO.getParentId());
                        BaseMenuDictDO menuDictDO =baseMenuDictDao.findOne(menuDO.getParentId());
                        articleDictDO.setCategoryFirstName(menuDictDO.getName());
                        articleDictDO.setCategorySecondName(menuDO.getName());
                    }else {
                        articleDictDO.setCategoryFirstName(menuDO.getName());
                    }
                    knowledgeArticleDictDao.save(articleDictDO);
                }
            }
        }else {
            if (!"0".equalsIgnoreCase(menuDO.getParentId())){
@@ -764,11 +776,11 @@ public class BaseMenuManageService {
        }
        List<KnowledgeArticleDictDO> listnew = new ArrayList<>();
        BeanUtils.copyProperties(listnew,list);
        if(!"1".equals(isContent)){
        /*if(!"1".equals(isContent)){
            for (KnowledgeArticleDictDO dictDO:list){
                dictDO.setContent(null);
            }
        }
        }*/
        MixEnvelop mixEnvelop = new MixEnvelop();
        mixEnvelop.setTotalCount(count);
@@ -955,7 +967,7 @@ public class BaseMenuManageService {
                "\tkad.category_second_name as categorySecondName \n" +
                "FROM\n" +
                "\twlyy_knowledge_article_user kau\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code and kad.del=1 \n" +
                "WHERE\n" +
                "\tkau.user_code = '"+userCode+"' AND kad.category_second IN(SELECT md.id from base_menu_dict md where md.status=1 and md.is_del= 1) AND kad.category_first IN(SELECT md.parent_id from base_menu_dict md where md.status=1 and md.is_del= 1) ";
        String condition = "";
@@ -974,7 +986,7 @@ public class BaseMenuManageService {
        if (flag==5){
            condition+=" and kau.is_read = "+status;
        }
        condition += "  GROUP BY kad.category_first ";
        condition += "  GROUP BY kad.category_first,kad.category_second ";
        List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql+condition);
        return mapList;
    }
@@ -1007,7 +1019,7 @@ public class BaseMenuManageService {
                "\tkad.source as source \n" +
                "FROM\n" +
                "\twlyy_knowledge_article_user kau\n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code  \n" +
                "LEFT JOIN wlyy_knowledge_article_dict kad ON kad.id = kau.relation_code and kad.del=1 \n" +
                "WHERE\n" +
                "\tkau.user_code = '"+userCode+"' AND kad.category_second IN(SELECT md.id from base_menu_dict md where md.status=1 and md.is_del= 1) AND kad.category_first IN(SELECT md.parent_id from base_menu_dict md where md.status=1 and md.is_del= 1)  ";
        String condition = "";

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

@@ -582,7 +582,8 @@ public class PrescriptionExpressageService extends BaseJpaService<WlyyPrescripti
            for (WlyyPrescriptionExpressageLogDO pushlog: pushSFLogs) {
                //判断是否有已收件的路由节点
                if("80".equals(pushlog.getOpCode())||"8000".equals(pushlog.getOpCode())||"130".equals(pushlog.getOpCode())){
                if("80".equals(pushlog.getOpCode())||"8000".equals(pushlog.getOpCode())||"130".equals(pushlog.getOpCode())
                        ||"44".equals(pushlog.getOpCode())){
                    isContainEndRoutInfo = true;
                }

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

@@ -70,13 +70,13 @@ public class ArticleDictEndpoint extends EnvelopRestEndpoint {
			}
			if (queryAll){
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1";
					filters="del=1";
				}else{
					filters=filters+";del=1";
				}
			}else {
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1"+";createUser="+userId+"";
					filters="del=1"+";createUser="+userId+"";
				}else{
					filters=filters+";del=1"+";createUser="+userId+"";
				}