代码修改

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleDeptDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.base.dao.article;
package com.yihu.jw.article.dao;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import org.springframework.data.jpa.repository.JpaRepository;

svr/svr-base/src/main/java/com/yihu/jw/base/dao/article/KnowledgeArticleUserDao.java

@@ -1,9 +1,9 @@
package com.yihu.jw.base.dao.article;
package com.yihu.jw.article.dao;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 健康文章中间库DAO

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

@@ -62,7 +62,7 @@ public class BaseMenuManageService {
        }
    }
    //菜单词典查询
    public List<Map<String,Object>> findMenuDictByKey(String parentId, String name,Integer status){
    public List<Map<String,Object>> findMenuDictByKey(String parentId, String name,Integer status,Integer type){
        String sql = "select t.id as \"id\", " +
                " t.parent_id as \"parentId\", " +
                " t.name as \"name\", " +
@@ -80,7 +80,7 @@ public class BaseMenuManageService {
                " t.menu_title as \"menuTitle\", " +
                " t.describtion as \"describtion\", " +
                " t.menu_img as \"menuImg\"  " +
                "from base_menu_dict t  where 1=1 and t.is_del ='1' ";
                "from base_menu_dict t  where 1=1 and t.is_del ='1' and t.type="+type;
        String sqlParent ="select t.id as \"id\", " +
                " t.parent_id as \"parentId\", " +
                " t.name as \"name\", " +
@@ -98,7 +98,7 @@ public class BaseMenuManageService {
                " t.describtion as \"describtion\", " +
                " t.menu_location as \"menuLocation\", " +
                " t.menu_img as \"menuImg\"  " +
                "from base_menu_dict t   where 1=1 and t.is_del ='1' ";
                "from base_menu_dict t   where 1=1 and t.is_del ='1' and t.type="+type;
        if (StringUtils.isNoneBlank(parentId)){
            sql+=" and t.parent_id = '"+parentId+"'";
            sqlParent+=" and t.id = '"+parentId+"'";
@@ -261,7 +261,7 @@ public class BaseMenuManageService {
        baseMenuDictDao.updateStatus(id,status);
    }
    //新增修改菜单
    public BaseMenuDictDO createOrUpdateMenu(String json) throws  Exception{
    public BaseMenuDictDO createOrUpdateMenu(String json,Integer type) throws  Exception{
        BaseMenuDictDO menuDO = objectMapper.readValue(json,BaseMenuDictDO.class);
        if (StringUtils.isNoneBlank(menuDO.getId())){
            BaseMenuDictDO menuOld = baseMenuDictDao.findById(menuDO.getId()).orElse(null);;
@@ -270,6 +270,7 @@ public class BaseMenuManageService {
                menuOld.setName(menuDO.getName());
                menuOld.setMenuLocation(menuDO.getMenuLocation());
                menuOld.setFunctionType(menuDO.getFunctionType());
                menuOld.setType(type);
                //menuOld.setIsShow(menuDO.getIsShow());
                menuOld.setMenuImg(menuDO.getMenuImg());
                menuOld.setDescribtion(menuDO.getDescribtion());
@@ -290,6 +291,7 @@ public class BaseMenuManageService {
                menuDO.setIsShow(menuDO.getStatus()==1?"1":"0");
                menuDO.setMenuSort(1);
            }
            menuDO.setType(type);
            menuDO = baseMenuDictDao.save(menuDO);
        }
        return menuDO;

svr/svr-base/src/main/java/com/yihu/jw/base/service/article/KnowledgeArticleService.java

@@ -1,12 +1,11 @@
package com.yihu.jw.base.service.article;
package com.yihu.jw.article.service;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.BaseMenuDictDao;
import com.yihu.jw.article.dao.KnowledgeArticleDeptDao;
import com.yihu.jw.article.dao.KnowledgeArticleDictDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleDeptDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleUserDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -26,6 +25,7 @@ import com.yihu.jw.hospital.survey.dao.SurveyUserDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.user.UserDao;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.lang.StringUtils;
@@ -43,7 +43,7 @@ import java.util.UUID;
 * @date 2019/9/10 13:54
 */
@Service
public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDictDO, KnowledgeArticleDictDao> {
public class KnowledgeArticleDictService extends BaseJpaService<KnowledgeArticleDictDO, KnowledgeArticleDictDao> {
	
	@Autowired
	private KnowledgeArticleDictDao knowledgeArticleDictDao;
@@ -71,7 +71,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	@Autowired
	private UserDao userDao;
	//查询文章列表
	public List<Map<String,Object>> findArticleList(String first,String second ,String key,Integer page ,Integer pageSize){
	public List<Map<String,Object>> findArticleList(String first,String second,Integer type ,String key,Integer page ,Integer pageSize){
		String sql ="select b.id as \"id\", " +
				" b.title as \"title\"," +
				" b.intro as \"intro\"," +
@@ -89,9 +89,9 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
				" t.menu_id as \"menuId\"," +
				" t.parent_id as \"parentId\"," +
				" t.menu_name as \"menuName\"  " +
				" from wlyy_knowledge_article_menu t left join wlyy_knowledge_article b" +
				" from wlyy_knowledge_article_menu t left join wlyy_knowledge_article_dict b" +
				" on t.article_id=b.id left join base_menu_dict c " +
				" on c.id= t.menu_id where t.del=1";
				" on c.id= t.menu_id where t.del=1 and b.type="+type;
		if (StringUtils.isNotBlank(first)){
			sql+=" and t.category_first ='"+first+"'";
		}
@@ -114,25 +114,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
		}
		return list;
	}
	
	/**
	 * 删除，支持批量
	 * @param id
	 */
	public boolean delArticle1(String id){
		String[] split = id.split(",|，");
		String ids = StringUtils.join(split, ",");
		String sql = "update wlyy_knowledge_article a set a.del = 0 where a.id in(" + ids + ")";
		String sqlUser = "update wlyy_knowledge_article_user a set a.del = 0 where a.relation_code in(" + ids + ")";
		String sqlBussiness = "update base_patient_business a set a.del = 0 where a.relation_code in(" + ids + ")";
		int update = jdbcTemplate.update(sql);
		int updateUser = jdbcTemplate.update(sqlUser);
		int updateBussiness  = jdbcTemplate.update(sqlBussiness);
		if (update > 0||updateUser>0||updateBussiness>0) {
			return true;
		}
		return false;
	}
	public boolean delArticle(String id){
		KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(id);
		if (knowledgeArticleDictDO!=null){
@@ -153,7 +135,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	 * @return
	 * @throws Exception
	 */
	public KnowledgeArticleDictDO saveArticle(String jsonData) throws  Exception {
	public KnowledgeArticleDictDO saveArticle(String jsonData,Integer type) throws  Exception {
		KnowledgeArticleDictDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDictDO.class);
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("articleNeedCheck").orElse(null);;
		Boolean articleNeedCheck= true;
@@ -169,10 +151,19 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
			knowledgeArticleDO.setStatus(0);
			knowledgeArticleDO.setReleaseStatus(0);
			knowledgeArticleDO.setDel(1);
			UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);;
			if (userDO!=null){
				knowledgeArticleDO.setCreateUserName(userDO.getName());
			knowledgeArticleDO.setType(type);
			if(type==1){
				UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);;
				if (userDO!=null){
					knowledgeArticleDO.setCreateUserName(userDO.getName());
				}
			}else {
				UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser()).orElse(null);;
				if (userDO!=null){
					knowledgeArticleDO.setCreateUserName(userDO.getName());
				}
			}
			if (!articleNeedCheck){
				knowledgeArticleDO.setStatus(1);
				knowledgeArticleDO.setReleaseStatus(1);

business/base-service/src/main/java/com/yihu/jw/contant/CommonContant.java

@@ -17,6 +17,26 @@ public class CommonContant {
    //是否必选0-表示非必选，1-表示必选
    public static final String IS_MUST = "1";
    /**
     * 接口返回通用提示消息
     */
    public static class Message {
        public static final String GET_SUCCESS = "获取成功";
        public static final String GET_ERROR = "获取失败";
        public static final String SAVE_SUCCESS ="保存成功";
        public static final String SAVE_ERROR ="保存失败";
        public static final String OPERATE_SUCCESS ="操作成功";
        public static final String OPERATE_ERROR ="操作失败";
        public static final String CREATE =  "/create";
        public static final String DELETE = "/delete";
        public static final String UPDATE = "/update";
        public static final String PAGE = "/page";
        public static final String LIST = "/list";
        public static final String FINDBYID = "/findById";
        public static final String FIND_MODULE_BY_SAASID = "/findModuleBySaasId";
        public static final String STATUS = "/status";
    }
    /**
     * DR 开头表示医生角色
     */
@@ -25,5 +45,8 @@ public class CommonContant {
     */
    public static final String DR_INPATIENTAREA = "inpatientArea";
    /**
     * 文章审核员
     */
    public static final String DR_ARTICLEREVIEWER = "articleReviewer";
}

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorInfoService.java

@@ -79,7 +79,7 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
    public Map<String,Integer> findTipNum(String doctorId){
        Map<String,Integer> map = new HashMap<>();
        //入院登记数量
        map.put("inpatientRegistration",inpatientRegistrationService.countByStatus("0"));
        map.put("inpatientRegistration",inpatientRegistrationService.countByStatus("1"));
        //住院陪护审核员 才展示数量
        if(doctorRoleService.getDoctorRole(doctorId, CommonContant.DR_INPATIENTAREA).get(CommonContant.DR_INPATIENTAREA)){

business/base-service/src/main/java/com/yihu/jw/hospital/record/dao/HospitalPatientInpatientRecordDao.java

@@ -3,10 +3,14 @@ package com.yihu.jw.hospital.record.dao;
import com.yihu.jw.entity.hospital.record.HospitalPatientInpatientRecordDO;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
/**
 * Created by yeshijie on 2022/11/28.
 */
public interface HospitalPatientInpatientRecordDao extends JpaRepository<HospitalPatientInpatientRecordDO, String>,
        JpaSpecificationExecutor<HospitalPatientInpatientRecordDO> {
    @Query(value = "select d.* from hospital_patient_inpatient_record d where d.patient = ?1 order by d.create_time desc limit 1",nativeQuery = true)
    HospitalPatientInpatientRecordDO findByPatientRecently(String patient);
}

business/base-service/src/main/java/com/yihu/jw/hospital/record/service/HospitalPatientInpatientRecordService.java

@@ -5,10 +5,21 @@ import com.yihu.jw.hospital.record.dao.HospitalPatientInpatientRecordDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
/**
 * Created by yeshijie on 2022/11/28.
 */
@Service
public class HospitalPatientInpatientRecordService extends BaseJpaService<HospitalPatientInpatientRecordDO, HospitalPatientInpatientRecordDao> {
    @Resource
    private HospitalPatientInpatientRecordDao hospitalPatientInpatientRecordDao;
    /**
     * 查找最近一次住院记录
     */
    public HospitalPatientInpatientRecordDO findByPatientRecently(String patient){
        return hospitalPatientInpatientRecordDao.findByPatientRecently(patient);
    }
}

business/base-service/src/main/java/com/yihu/jw/nurse/service/BaseNursingCardService.java

@@ -94,6 +94,7 @@ public class BaseNursingCardService extends BaseJpaService<BaseNursingCardDO, Ba
        nursingCardDO.setPatient(patient);
        nursingCardDO.setInpatientAreaId(areaId);
        nursingCardDO.setBedNo(registrationDO.getBedNo());
        nursingCardDO.setInpatientAreaName(registrationDO.getInpatientAreaName());
        return nursingCardDO;
    }

svr/svr-base/src/main/java/com/yihu/jw/base/dao/user/UserDao.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.dao.user;
package com.yihu.jw.user;
import com.yihu.jw.entity.base.user.UserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import java.util.List;

common/common-entity/src/main/java/com/yihu/jw/entity/base/menu/BaseMenuDictDO.java

@@ -31,6 +31,8 @@ public class BaseMenuDictDO extends UuidIdentityEntityWithOperator {
    private String bgImg;
    private String menuTitle;
    private String describtion;
    private Integer type;//类型 1 官网菜单 2app文章菜单
    @Column(name = "bg_img")
    public String getBgImg() {
        return bgImg;
@@ -206,4 +208,13 @@ public class BaseMenuDictDO extends UuidIdentityEntityWithOperator {
    public void setMenuImg(String menuImg) {
        this.menuImg = menuImg;
    }
    @Column(name = "type")
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
}

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

@@ -10,9 +10,7 @@ import javax.persistence.Transient;
import java.util.Date;
/**
 * 健康文章
 * @author huangwenjie
 * @date 2019/9/10 13:58
 * 官网-文章
 */
@Entity
@Table(name = "wlyy_knowledge_article_dict")
@@ -24,6 +22,7 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	private String createUserDeptName; // 创建人科室名称
	private String title;   // 文章标题
	private String subtitle;   // 小标题
	private Integer type;//类型 1官网 2app文章
	private String categoryFirst;    // 1级分类标识
	private String categoryFirstName;    // 1级分类标识
	private String categorySecond;    // 2级分类标识
@@ -334,4 +333,12 @@ public class KnowledgeArticleDictDO extends UuidIdentityEntity {
	public void setImg(String img) {
		this.img = img;
	}
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/record/HospitalPatientInpatientRecordDO.java

@@ -5,6 +5,7 @@ import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
/**
 * 居民医院住院记录
@@ -19,6 +20,7 @@ public class HospitalPatientInpatientRecordDO extends UuidIdentityEntityWithCrea
    private Integer age;//年龄
    private String birthday;
    private String sex;//性别
    private Integer status;//状态 1住院中 2 已出院
    private String marriage;//婚姻状况
    private String patient;
    private String doctor;//主治医生
@@ -34,6 +36,8 @@ public class HospitalPatientInpatientRecordDO extends UuidIdentityEntityWithCrea
    private String admissionDiagnosis;//入院诊断
    private String dischargeDiagnosis;//出院诊断
    private String statusName;//状态说明
    @Column(name = "idcard")
    public String getIdcard() {
        return idcard;
@@ -195,4 +199,22 @@ public class HospitalPatientInpatientRecordDO extends UuidIdentityEntityWithCrea
    public void setDischargeDiagnosis(String dischargeDiagnosis) {
        this.dischargeDiagnosis = dischargeDiagnosis;
    }
    @Column(name = "status")
    public Integer getStatus() {
        return status;
    }
    public void setStatus(Integer status) {
        this.status = status;
    }
    @Transient
    public String getStatusName() {
        return statusName;
    }
    public void setStatusName(String statusName) {
        this.statusName = statusName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/ManageMessagePush/ManageSystemPushMessageController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.endpoint.ManageMessagePush;
import com.yihu.jw.base.service.ManageMessagePush.ManageSystemPushMessageService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -71,7 +72,7 @@ public class ManageSystemPushMessageController extends EnvelopRestEndpoint {
                                      @RequestParam(value = "page",required = true)Integer page,
                                      @RequestParam(value = "pageSize",required = true)Integer pageSize){
        try {
            return ObjEnvelop.getSuccess("获取成功!",mspmservice.pushMessageList(messageType,status,name,page,pageSize),200);
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,mspmservice.pushMessageList(messageType,status,name,page,pageSize),200);
        } catch (Exception e) {
            e.printStackTrace();
            return failedObjEnvelopException2(e);

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

@@ -3,9 +3,8 @@ package com.yihu.jw.base.endpoint.article;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.KnowledgeArticleDictDao;
import com.yihu.jw.article.service.KnowledgeArticleDictService;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.service.article.KnowledgeArticleService;
import com.yihu.jw.base.service.article.KnowledgeCategoryService;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.role.RoleDO;
@@ -18,6 +17,7 @@ import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.hospital.BaseHospitalRequestMapping;
import com.yihu.jw.user.UserDao;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -29,16 +29,16 @@ import java.util.ArrayList;
import java.util.List;
/**
 * 健康文章
 * 官网-文章
 * @author huangwenjie
 */
@RestController
@RequestMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.PREFIX)
@Api(value = "文章管理接口", description = "文章管理接口", tags = {"文章管理接口"})
@Api(value = "官网-文章管理接口",  tags = {"官网-文章管理接口"})
public class ArticleEndpoint extends EnvelopRestEndpoint {
	
	@Autowired
	private KnowledgeArticleService knowledgeArticleService;
	private KnowledgeArticleDictService knowledgeArticleDictService;
	
	@Autowired
	private KnowledgeCategoryService knowledgeCategoryService;
@@ -90,8 +90,9 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
					filters=filters+";del=1"+";createUser="+userId+"";
				}
			}
			List<KnowledgeArticleDictDO> list  = knowledgeArticleService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleService.search(fields,filters,sorts);
			filters += ";type=1";
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			JSONObject result = new JSONObject();
			result.put("total",totals.size());
@@ -117,7 +118,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			return success(knowledgeArticleService.findArticleList(first,second,key,page,pageSize));
			return success(knowledgeArticleDictService.findArticleList(first,second,1,key,page,pageSize));
		}catch (Exception e){
			return failedException(e);
		}
@@ -141,7 +142,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			@ApiParam(name = "id", value = "id，多个使用英文逗号分隔", required = true)
			@RequestParam(value = "id", required = true)String id)throws Exception {
			try {
				knowledgeArticleService.delArticle(id);
				knowledgeArticleDictService.delArticle(id);
				return success("操作成功");
			}catch (Exception e){
				return failedException(e);
@@ -155,7 +156,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			@RequestParam String jsonData)throws Exception {
		try {
			knowledgeArticleService.saveArticle(jsonData);
			knowledgeArticleDictService.saveArticle(jsonData,1);
			return success("操作成功");
		}catch (Exception e){
			e.printStackTrace();
@@ -174,7 +175,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
			@RequestParam(value = "reason", required = false) String reason
	)throws Exception {
		try {
			knowledgeArticleService.reviewArticle(articleId,status,reason);
			knowledgeArticleDictService.reviewArticle(articleId,status,reason);
			return success("操作成功");
		}catch (Exception e){
			return failedException(e);
@@ -250,7 +251,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	                                 @ApiParam(name = "sdJsons", value = "部门与科室关系json")
	                                 @RequestParam(value = "sdJsons",required = true)String sdJsons)throws Exception {
		try {
			return success(knowledgeArticleService.saveArticleDept(articleId,sdJsons));
			return success(knowledgeArticleDictService.saveArticleDept(articleId,sdJsons));
		}catch (Exception e){
			return failedObjEnvelopException(e);
		}
@@ -261,7 +262,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	public ListEnvelop findDeptByArticle(@ApiParam(name = "articleId", value = "文章ID")
	                                    @RequestParam(value = "articleId",required = true)String articleId)throws Exception {
		try {
			return success(knowledgeArticleService.findDeptByArticle(articleId));
			return success(knowledgeArticleDictService.findDeptByArticle(articleId));
		}catch (Exception e){
			return failedListEnvelopException(e);
@@ -273,7 +274,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	public ListEnvelop findArticleByDept(@ApiParam(name = "dept", value = "科室")
	                                    @RequestParam(value = "dept",required = true)String dept)throws Exception {
		try {
			return success(knowledgeArticleService.findArticleByDept(dept));
			return success(knowledgeArticleDictService.findArticleByDept(dept));
		}catch (Exception e){
			return failedListEnvelopException(e);
		}
@@ -287,7 +288,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
	                                 @RequestParam(value = "sdJsons",required = false)String sdJsons)throws Exception {
		try {
			return success(knowledgeArticleService.saveDeptArticle(dept,sdJsons));
			return success(knowledgeArticleDictService.saveDeptArticle(dept,sdJsons));
		}catch (Exception e){
			return failedObjEnvelopException(e);
		}
@@ -308,7 +309,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
				BasePatientBusinessDO patientBusinessDO = toEntity(jsonObject.toJSONString(),BasePatientBusinessDO.class);
				patientBusinessDOList.add(patientBusinessDO);
			}
			listEnvelop.setDetailModelList(knowledgeArticleService.sendBusinessToPatient(patientBusinessDOList));
			listEnvelop.setDetailModelList(knowledgeArticleDictService.sendBusinessToPatient(patientBusinessDOList));
			return  listEnvelop;
		}catch (Exception e){
			return failedListEnvelopException(e);
@@ -322,7 +323,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
									  @ApiParam(name = "status", value = "1发布0未发布")
									  @RequestParam(value = "status",required = false)Integer status)throws Exception {
		try {
			return success(knowledgeArticleService.releaseArticle(id,status));
			return success(knowledgeArticleDictService.releaseArticle(id,status));
		}catch (Exception e){
			return failedObjEnvelopException(e);
		}
@@ -341,7 +342,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
												   @ApiParam(name = "pageSize", value = "分页大小）")
										   @RequestParam(value = "pageSize",required = false)Integer pageSize)throws Exception {
		MixEnvelop mixEnvelop=knowledgeArticleService.findArticleByCategoryAndName(categoryFirst,categorySecond,keyWords,page,pageSize);
		MixEnvelop mixEnvelop=knowledgeArticleDictService.findArticleByCategoryAndName(categoryFirst,categorySecond,keyWords,page,pageSize);
		return mixEnvelop;
	}
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.getArticleGroup)
@@ -367,7 +368,7 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
												   @RequestParam(value = "pageSize",required = false)Integer pageSize)throws Exception {
		try {
			return success(knowledgeArticleService.findPatientFavorite(patient,page,pageSize));
			return success(knowledgeArticleDictService.findPatientFavorite(patient,page,pageSize));
		}catch (Exception e){
			return failedException(e);
		}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/childManage/ChildManageController.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.endpoint.childManage;
import com.yihu.jw.base.service.child.ChildManageService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
@@ -44,7 +45,7 @@ public class ChildManageController extends EnvelopRestEndpoint {
            return success(childManageService.getChildManageList(type,page,pageSize,title,orgCode,id));
        } catch (Exception e) {
            e.printStackTrace();
            return ObjEnvelop.getError("获取失败");
            return ObjEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -56,10 +57,10 @@ public class ChildManageController extends EnvelopRestEndpoint {
                                @RequestParam(value = "jsonData",required = false)String jsonData){
        try {
            childManageService.saveOrUpdate(jsonData);
            return success("保存成功!",200);
            return success(CommonContant.Message.SAVE_SUCCESS,200);
        } catch (Exception e) {
            e.printStackTrace();
            return Envelop.getError("保存失败!");
            return Envelop.getError(CommonContant.Message.SAVE_ERROR);
        }
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/TemplateManageEndpoint.java

@@ -2,22 +2,15 @@ package com.yihu.jw.base.endpoint.dict;
import com.yihu.jw.base.service.dict.*;
import com.yihu.jw.base.service.dict.importManage.*;
import com.yihu.jw.base.service.doctor.excelImport.BaseDoctorExcelDO;
import com.yihu.jw.base.service.doctor.excelImport.BaseDoctorExcelDOReader;
import com.yihu.jw.entity.base.dict.DictDiseaseDO;
import com.yihu.jw.entity.base.dict.DiseaseManageDO;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.exception.business.ManageException;
import com.yihu.jw.restmodel.base.dict.DictDiseaseVO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.ss.usermodel.Workbook;
@@ -222,7 +215,7 @@ public class TemplateManageEndpoint  extends EnvelopRestEndpoint {
            @RequestParam(value = "templateIds", required = false) String templateIds) throws Exception {
        try {
            templateManageService.saveUserTemplateRelation(orgCode,templateIds);
            return success("保存成功");
            return success(CommonContant.Message.SAVE_SUCCESS);
        }catch (Exception e){
            e.printStackTrace();
            return failedMixEnvelopException(e);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/doctor/BaseDoctorRoleEndpoint.java

@@ -53,7 +53,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
            String roleCode = json.getString("roleCode");
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                //住院病区审核员处理
                return ObjEnvelop.getSuccess("保存成功", inpatientAreaService.addAreaDoctor(json,roleCode));
                return ObjEnvelop.getSuccess(CommonContant.Message.SAVE_SUCCESS, inpatientAreaService.addAreaDoctor(json,roleCode));
            }else{
                BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
                baseDoctorRole.setDel(1);
@@ -63,7 +63,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "updDel")
@@ -127,7 +127,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = BaseRequestMapping.BaseDoctorRole.PAGE)
@@ -148,7 +148,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
 }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/gw/ZjxlGwEndpoint.java

@@ -2,7 +2,7 @@ package com.yihu.jw.base.endpoint.gw;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.article.KnowledgeArticleService;
import com.yihu.jw.article.service.KnowledgeArticleDictService;
import com.yihu.jw.base.service.gw.BaseHomePageService;
import com.yihu.jw.base.service.gw.BaseRulesService;
import com.yihu.jw.base.service.gw.BaseWebInfoService;
@@ -42,7 +42,7 @@ public class ZjxlGwEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseRulesService baseRulesService;
    @Autowired
    private KnowledgeArticleService knowledgeArticleService;
    private KnowledgeArticleDictService knowledgeArticleService;
    @GetMapping(value = "searchKnowledgePageList")
    @ApiOperation(value = "获取文章列表")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/gw/ZjxlGwOpenEndpoint.java

@@ -2,10 +2,9 @@ package com.yihu.jw.base.endpoint.gw;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.service.article.KnowledgeArticleService;
import com.yihu.jw.article.service.KnowledgeArticleDictService;
import com.yihu.jw.base.service.gw.BaseHomePageService;
import com.yihu.jw.base.service.gw.BaseRulesService;
import com.yihu.jw.base.service.gw.BaseWebInfoService;
import com.yihu.jw.base.service.gw.ZjxlGwService;
import com.yihu.jw.entity.base.gw.BaseHomePageDO;
import com.yihu.jw.entity.base.gw.BaseRulesDO;
@@ -19,9 +18,11 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.List;
/**
@@ -39,7 +40,7 @@ public class ZjxlGwOpenEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private BaseRulesService baseRulesService;
    @Autowired
    private KnowledgeArticleService knowledgeArticleService;
    private KnowledgeArticleDictService knowledgeArticleService;
    @GetMapping(value = "searchKnowledgePageList")
    @ApiOperation(value = "获取文章列表")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/login/LoginAppEndpoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.base.endpoint.login;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.login.BaseLoginAppDO;
import com.yihu.jw.entity.base.login.BaseLoginComponentDO;
import com.yihu.jw.login.service.BaseLoginAppService;
@@ -38,11 +39,11 @@ public class LoginAppEndpoint extends EnvelopRestEndpoint {
            @RequestParam String jsonData){
        try {
            BaseLoginAppDO loginAppDO = toEntity(jsonData, BaseLoginAppDO.class);
            return ObjEnvelop.getSuccess("保存成功",loginAppService.createLoginApp(loginAppDO));
            return ObjEnvelop.getSuccess(CommonContant.Message.SAVE_SUCCESS,loginAppService.createLoginApp(loginAppDO));
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return ObjEnvelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "loginAppStatus")
@@ -92,11 +93,11 @@ public class LoginAppEndpoint extends EnvelopRestEndpoint {
        try {
            List<BaseLoginAppDO> loginAppDOS = loginAppService.search(fields, filters, sorts, page, size);
            long count = loginAppService.getCount(filters);
            return PageEnvelop.getSuccessListWithPage("获取成功",loginAppDOS,page,size,count);
            return PageEnvelop.getSuccessListWithPage(CommonContant.Message.GET_SUCCESS,loginAppDOS,page,size,count);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
    @GetMapping(value = "findLoginCompoentList")
@@ -107,11 +108,11 @@ public class LoginAppEndpoint extends EnvelopRestEndpoint {
        try {
            String filters = "loginAppId="+loginAppId;
            List<BaseLoginComponentDO> componentDOList =loginAppService.findByLoginAppId(loginAppId);
            return ListEnvelop.getSuccess("获取成功", componentDOList);
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, componentDOList);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
@@ -129,11 +130,11 @@ public class LoginAppEndpoint extends EnvelopRestEndpoint {
                loginAppDO = loginAppService.createLoginCompoent(loginAppDO);
                list.add(loginAppDO);
            }
            return ListEnvelop.getSuccess("保存成功",list);
            return ListEnvelop.getSuccess(CommonContant.Message.SAVE_SUCCESS,list);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "loginComponentDelete")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/menu/BaseMenuManageEndpoint.java

@@ -43,7 +43,7 @@ public class BaseMenuManageEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            BaseMenuDictDO baseMenuDictDO = menuService.createOrUpdateMenu(jsonData);
            BaseMenuDictDO baseMenuDictDO = menuService.createOrUpdateMenu(jsonData,1);
            return success(baseMenuDictDO);
        } catch (Exception e) {
            return failedException(e);
@@ -111,7 +111,7 @@ public class BaseMenuManageEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "status", value = "status", required = false)
            @RequestParam(value = "status",required = false) Integer status) {
        try {
            return success(menuService.findMenuDictByKey(parentId, name,status));
            return success(menuService.findMenuDictByKey(parentId, name,status,1));
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/patient/BasePatientEndpoint.java

@@ -9,6 +9,7 @@ import com.yihu.jw.base.dao.sign.ArchiveDao;
import com.yihu.jw.base.dao.team.BaseTeamDao;
import com.yihu.jw.base.dao.team.WlyyPatientLabelDao;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientDO;
@@ -115,7 +116,7 @@ public class BasePatientEndpoint extends EnvelopRestEndpoint {
    public ObjEnvelop findPatientById(
            @ApiParam(name = "id", value = "居民id")
            @RequestParam(value = "id", required = true) String id) throws Exception {
        return ObjEnvelop.getSuccess("获取成功",basePatientService.findPatientById(id));
        return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,basePatientService.findPatientById(id));
    }
    @GetMapping(value = BaseRequestMapping.BasePatient.PAGE)
@@ -397,7 +398,7 @@ public class BasePatientEndpoint extends EnvelopRestEndpoint {
            map.put("failedNum", list.size() - correctLs.size() );
            map.put("errorData", JSON.toJSONString(errorMsgMap, SerializerFeature.WriteMapNullValue));
            System.out.println(map);
            return ObjEnvelop.getSuccess("获取成功",map);
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,map);
        } catch (Exception e) {
            e.printStackTrace();
            return failedObjEnvelopException(e);

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/processGuidance/BaseProcessGuidanceEndpoint.java

@@ -1,6 +1,7 @@
package com.yihu.jw.base.endpoint.processGuidance;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.processGuidance.*;
import com.yihu.jw.processGuidance.dao.*;
import com.yihu.jw.processGuidance.service.BaseProcessGuidanceNodeService;
@@ -68,7 +69,7 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return ObjEnvelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = "processGuidancePushLogPage")
@@ -121,7 +122,7 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return ObjEnvelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "saveProcessGuidanceNodeWx")
@@ -137,7 +138,7 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return ObjEnvelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = "nodeWxTemplateList")
@@ -149,7 +150,7 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return ListEnvelop.getError("获取失败");
        return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
    }
    @PostMapping(value = "saveProcessGuidanceNode")
@@ -162,7 +163,7 @@ public class BaseProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return ObjEnvelop.getError("保存失败");
        return ObjEnvelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = "getWxTemplateByNodeId")

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/role/MenuEndpoint.java

@@ -160,7 +160,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuDOS, count, page, size, MenuVO.class);
        }catch (Exception e){
            e.printStackTrace();
            return PageEnvelop.getError("获取失败");
            return PageEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -186,7 +186,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuDOS, MenuVO.class);
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
            return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -229,7 +229,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuVOs);
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
            return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -257,7 +257,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuVOs);
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
            return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -315,7 +315,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuVOs);
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
            return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -366,7 +366,7 @@ public class MenuEndpoint extends EnvelopRestEndpoint {
            return success(menuVOs);
        }catch (Exception e){
            e.printStackTrace();
            return ListEnvelop.getError("获取失败");
            return ListEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/article/KnowledgeArticleUserService.java

@@ -1,6 +1,6 @@
package com.yihu.jw.base.service.article;
import com.yihu.jw.base.dao.article.KnowledgeArticleUserDao;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/DictHospitalDeptService.java

@@ -4,22 +4,23 @@ import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.enums.SystemDictEnum;
import com.yihu.jw.base.service.org.BaseOrgService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.org.BaseOrgDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.common.IdCardUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import java.io.IOException;
import java.util.*;
@@ -351,10 +352,10 @@ public class DictHospitalDeptService extends BaseJpaService<DictHospitalDeptDO,
               }
           }
           returnMap.put("status",200);
           returnMap.put("msg","保存成功");
           returnMap.put("msg",CommonContant.Message.SAVE_SUCCESS);
       }else {
           returnMap.put("status",-1);
           returnMap.put("msg","保存失败");
           returnMap.put("msg", CommonContant.Message.SAVE_ERROR);
       }
       return returnMap;
   }

svr/svr-base/src/main/java/com/yihu/jw/base/service/notice/NoticeService.java

@@ -2,16 +2,16 @@ package com.yihu.jw.base.service.notice;
import com.yihu.jw.base.dao.notice.NoticeDao;
import com.yihu.jw.base.dao.notice.UserNoticeDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.util.threadPool.ThreadPoolUtil;
import com.yihu.jw.base.util.delay.DelayService;
import com.yihu.jw.base.util.delay.Notice;
import com.yihu.jw.base.util.delay.OnDelayedListener;
import com.yihu.jw.base.util.delay.RedisLock;
import com.yihu.jw.base.util.threadPool.ThreadPoolUtil;
import com.yihu.jw.entity.base.notice.NoticeDO;
import com.yihu.jw.entity.base.notice.UserNoticeDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.user.UserDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;

svr/svr-base/src/main/java/com/yihu/jw/base/service/radio/WlyyRadioService.java

@@ -1,10 +1,11 @@
package com.yihu.jw.base.service.radio;
import com.yihu.jw.base.dao.radio.WlyyRadioDao;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.care.radio.WlyyRadioDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -81,7 +82,7 @@ public class WlyyRadioService extends BaseJpaService<WlyyRadioDO, WlyyRadioDao>
        radio.setCreateTime(new Date());
        radio.setStatus(status);
        radioDao.save(radio);
        return Envelop.getSuccess("保存成功");
        return Envelop.getSuccess(CommonContant.Message.SAVE_SUCCESS);
    }
    /**

svr/svr-base/src/main/java/com/yihu/jw/base/service/saas/SaasService.java

@@ -10,7 +10,6 @@ import com.yihu.jw.base.dao.saas.SaasThemeDao;
import com.yihu.jw.base.dao.saas.SaasThemeExtendDao;
import com.yihu.jw.base.dao.system.SystemDictDao;
import com.yihu.jw.base.dao.system.SystemDictEntryDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.service.dict.DictHospitalDeptService;
import com.yihu.jw.base.util.SendEmailUtils;
import com.yihu.jw.entity.base.dict.*;
@@ -24,8 +23,9 @@ import com.yihu.jw.entity.base.saas.SaasThemeDO;
import com.yihu.jw.entity.base.saas.SaasThemeExtendDO;
import com.yihu.jw.entity.base.system.SystemDictEntryDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.org.dao.BaseOrgDao;
import com.yihu.jw.user.UserDao;
import com.yihu.jw.util.encrypt.MD5;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-base/src/main/java/com/yihu/jw/base/service/user/UserService.java

@@ -9,8 +9,9 @@ import com.yihu.jw.base.dao.equipment.WlyyUserEquipmentDao;
import com.yihu.jw.base.dao.role.BaseRoleMenuDao;
import com.yihu.jw.base.dao.role.RoleDao;
import com.yihu.jw.base.dao.saas.SaasDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.base.service.org.*;
import com.yihu.jw.base.service.org.BaseOrgUserService;
import com.yihu.jw.base.service.org.OrgTree;
import com.yihu.jw.base.service.org.OrgTreeService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.entity.base.org.BaseOrgUserDO;
@@ -21,10 +22,11 @@ import com.yihu.jw.entity.equipment.WlyyUserAreaDO;
import com.yihu.jw.entity.equipment.WlyyUserEquipmentDO;
import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.user.UserDao;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.encrypt.MD5;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import org.apache.commons.collections.map.HashedMap;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-base/src/main/java/com/yihu/jw/base/service/video/BaseVideoGroupService.java

@@ -2,11 +2,12 @@ package com.yihu.jw.base.service.video;
import com.yihu.jw.base.dao.video.BaseVideoDao;
import com.yihu.jw.base.dao.video.BaseVideoGroupDao;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.care.video.BaseVideoDO;
import com.yihu.jw.entity.care.video.BaseVideoGroupDO;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.JdbcTemplate;
@@ -74,7 +75,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
        videoGroupDO.setStatus(status);
        videoGroupDO.setCreateTime(new Date());
        videoGroupDao.save(videoGroupDO);
        return Envelop.getSuccess("保存成功");
        return Envelop.getSuccess(CommonContant.Message.SAVE_SUCCESS);
    }
    /**
@@ -151,7 +152,7 @@ public class BaseVideoGroupService extends BaseJpaService<BaseVideoGroupDO, Base
        videoDO.setStatus(status);
        videoDO.setCreateTime(new Date());
        videoDao.save(videoDO);
        return Envelop.getSuccess("保存成功");
        return Envelop.getSuccess(CommonContant.Message.SAVE_SUCCESS);
    }
    /**

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeArticleDeptDao.java

@@ -1,19 +0,0 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.JpaRepository;
import java.util.List;
/**
 * 健康文章部门关系DAO
 * @author huangwenjie
 * @date 2019/9/18 10:03
 */
public interface KnowledgeArticleDeptDao extends JpaRepository<KnowledgeArticleDeptDO, String>, JpaSpecificationExecutor<KnowledgeArticleDeptDO> {
	
	List<KnowledgeArticleDeptDO> findByArticleId(String articleId);
	
	List<KnowledgeArticleDeptDO> findByDept(String dept);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/dao/consult/KnowledgeArticleUserDao.java

@@ -1,17 +0,0 @@
package com.yihu.jw.hospital.dao.consult;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.jpa.repository.JpaRepository;
/**
 * 健康文章中间库DAO
 * @author
 * @date 2019/9/10 14:07
 */
public interface KnowledgeArticleUserDao extends JpaRepository<KnowledgeArticleUserDO, String>, JpaSpecificationExecutor<KnowledgeArticleUserDO> {
	@Query("select a from KnowledgeArticleUserDO a where a.del=1 and a.relationCode=?1 and a.user=?2")
	KnowledgeArticleUserDO findByrelationCodeAndUserAndDel(String relationCode,String user);
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/account/DoctorEndpoint.java

@@ -37,7 +37,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "doctor", value = "doctor", required = true)
            @RequestParam(value = "doctor", required = true)String doctor){
        try {
            return ObjEnvelop.getSuccess("获取成功",doctorInfoService.findTipNum(doctor));
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,doctorInfoService.findTipNum(doctor));
        }catch (Exception e){
            return failedException2(e);
        }
@@ -49,7 +49,7 @@ public class DoctorEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "doctor", value = "doctor", required = true)
            @RequestParam(value = "doctor", required = true)String doctor){
        try {
            return ObjEnvelop.getSuccess("获取成功",doctorRoleService.getDoctorRole(doctor, CommonContant.DR_INPATIENTAREA));
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,doctorRoleService.getDoctorRole(doctor, CommonContant.DR_INPATIENTAREA));
        }catch (Exception e){
            return failedException2(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/archives/MedicalRecordCopyingEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.archives;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.patient.BaseIdcardRecordDO;
import com.yihu.jw.entity.hospital.record.HospitalPatientInpatientRecordDO;
import com.yihu.jw.hospital.record.service.HospitalPatientInpatientRecordService;
@@ -44,11 +45,11 @@ public class MedicalRecordCopyingEndpoint extends EnvelopRestEndpoint {
            List<HospitalPatientInpatientRecordDO> recordDOS = inpatientRecordService.search(null, filters, "-visitTime", page, size);
            long count = inpatientRecordService.getCount(filters);
            return PageEnvelop.getSuccessListWithPage("获取成功",recordDOS,page,size,count);
            return PageEnvelop.getSuccessListWithPage(CommonContant.Message.GET_SUCCESS,recordDOS,page,size,count);
        }catch (Exception e){
            e.printStackTrace();
        }
        return PageEnvelop.getError("获取失败");
        return PageEnvelop.getError(CommonContant.Message.GET_ERROR);
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/archives/PatientArchivesEndpoint.java

@@ -0,0 +1,50 @@
package com.yihu.jw.hospital.endpoint.archives;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.hospital.record.HospitalPatientInpatientRecordDO;
import com.yihu.jw.hospital.record.service.HospitalPatientInpatientRecordService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
/**
 * Created by yeshijie on 2022/12/8.
 */
@RestController
@RequestMapping(value = "patient/archives")
@Api(value = "居民端-档案记录",  tags = {"居民端-档案记录"})
public class PatientArchivesEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private HospitalPatientInpatientRecordService inpatientRecordService;
    @GetMapping(value = "findInpatientRecently")
    @ApiOperation(value = "获取最近一次住院记录")
    public Envelop findInpatientRecently (
            @ApiParam(name = "patient", value = "居民id")
            @RequestParam(value = "patient", required = true) String patient){
        try {
            HospitalPatientInpatientRecordDO recordDO = inpatientRecordService.findByPatientRecently(patient);
            if(recordDO.getStatus()==1){
                recordDO.setStatusName("住院中");
            }else {
                recordDO.setStatusName("已出院");
            }
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,recordDO);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
}

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

@@ -0,0 +1,184 @@
package com.yihu.jw.hospital.endpoint.article;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.KnowledgeArticleDictDao;
import com.yihu.jw.article.service.KnowledgeArticleDictService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
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.web.bind.annotation.*;
import java.util.List;
/**
 * app文章
 * @author yeshijie
 */
@RestController
@RequestMapping(value = "articleDict")
@Api(value = "app文章管理接口",  tags = {"app文章管理接口"})
public class ArticleDictEndpoint extends EnvelopRestEndpoint {
	
	@Autowired
	private KnowledgeArticleDictService knowledgeArticleDictService;
	@Autowired
	private KnowledgeArticleDictDao knowledgeArticleDictDao;
	@Autowired
	private BaseDoctorDao doctorDao;
	@Autowired
	private BaseDoctorRoleDao doctorRoleDao;
	
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchKnowledgePageList)
	@ApiOperation(value = "获取文章列表")
	public Envelop searchKnowledgePageList(
			@ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
			@RequestParam(value = "fields", required = false) String fields,
			@ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
			@RequestParam(value = "filters", required = false) String filters,
			@ApiParam(name = "sorts", value = "排序，规则参见说明文档")
			@RequestParam(value = "sorts", required = false) String sorts,
			@ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
			@RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
			@ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize)throws Exception{
		try {
			String userId=getUID();
			BaseDoctorRoleDO roleDO = doctorRoleDao.findByDoctorCodeAndRoleCode(userId, CommonContant.DR_ARTICLEREVIEWER);
			boolean queryAll=false;
			if (roleDO!=null){
				queryAll=true;
			}
			if (queryAll){
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1";
				}else{
					filters=filters+";del=1";
				}
			}else {
				if(StringUtils.isBlank(filters)){
					filters=filters+"del=1"+";createUser="+userId+"";
				}else{
					filters=filters+";del=1"+";createUser="+userId+"";
				}
			}
			filters += ";type=2";
			List<KnowledgeArticleDictDO> list  = knowledgeArticleDictService.search(fields,filters,sorts,page,pageSize);
			List<KnowledgeArticleDictDO> totals  = knowledgeArticleDictService.search(fields,filters,sorts);
			JSONObject result = new JSONObject();
			result.put("total",totals.size());
			result.put("detailModelList",list);
			return success(result);
		}catch (Exception e){
			return failedException2(e);
		}
	}
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchKnowledgeList)
	@ApiOperation(value = "获取文章列表")
	public Envelop searchKnowledgeList(
			@ApiParam(name = "first", value = "second")
			@RequestParam(value = "first", required = false) String first,
			@ApiParam(name = "second", value = "second")
			@RequestParam(value = "second", required = false) String second,
			@ApiParam(name = "key", value = "关键字")
			@RequestParam(value = "key", required = false) String key,
			@ApiParam(name = "page", value = "第几页，从1开始", required = true, defaultValue = "1")
			@RequestParam(value = "page", required = true,defaultValue = "1")Integer page,
			@ApiParam(name = "pageSize", value = "每页分页大小", required = true, defaultValue = "10")
			@RequestParam(value = "pageSize", required = true,defaultValue = "10")Integer pageSize){
		try {
			return success(knowledgeArticleDictService.findArticleList(first,second,2,key,page,pageSize));
		}catch (Exception e){
			return failedException2(e);
		}
	}
	@GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.queryById)
	@ApiOperation(value = "根据id查询文章")
	public Envelop queryByCode(
			@ApiParam(name = "id", value = "id", required = true)
			@RequestParam(value = "id", required = true)String id){
		try {
			KnowledgeArticleDictDO articleDO = knowledgeArticleDictDao.findById(id).orElse(null);
			return success(articleDO);
		}catch (Exception e){
			return failedException2(e);
		}
	}
	
	@PostMapping (value = BaseHospitalRequestMapping.KnowledgeArticle.deleteById)
	@ApiOperation(value = "根据id删除文章")
	public Envelop deleteById(
			@ApiParam(name = "id", value = "id，多个使用英文逗号分隔", required = true)
			@RequestParam(value = "id", required = true)String id){
			try {
				knowledgeArticleDictService.delArticle(id);
				return success("操作成功");
			}catch (Exception e){
				return failedException2(e);
			}
	}
	
	@PostMapping (value = BaseHospitalRequestMapping.KnowledgeArticle.saveArticle)
	@ApiOperation(value = "保存/更新文章")
	public Envelop saveArticle(
			@ApiParam(name = "jsonData", value = "Json数据", required = true)
			@RequestParam String jsonData) {
		try {
			knowledgeArticleDictService.saveArticle(jsonData,2);
			return success("操作成功");
		}catch (Exception e){
			e.printStackTrace();
			return failedException2(e);
		}
	}
	
	@PostMapping (value = BaseHospitalRequestMapping.KnowledgeArticle.reviewArticle)
	@ApiOperation(value = "审核/退回文章")
	public Envelop saveArticle(
			@ApiParam(name = "articleId", value = "文章ID")
			@RequestParam(value = "articleId", required = true) String articleId,
			@ApiParam(name = "status", value = "0未审核，1已审核，2退回")
			@RequestParam(value = "status", required = true) Integer status,
			@ApiParam(name = "reason", value = "退回理由")
			@RequestParam(value = "reason", required = false) String reason
	){
		try {
			knowledgeArticleDictService.reviewArticle(articleId,status,reason);
			return success("操作成功");
		}catch (Exception e){
			return failedException2(e);
		}
	}
	@PostMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.setArticleUsed)
	@ApiOperation(value = "发布文章")
	public ObjEnvelop setArticleUsed(@ApiParam(name = "id", value = "文章id")
									  @RequestParam(value = "id",required = true)String id,
									  @ApiParam(name = "status", value = "1发布0未发布")
									  @RequestParam(value = "status",required = false)Integer status){
		try {
			return success(knowledgeArticleDictService.releaseArticle(id,status));
		}catch (Exception e){
			return failedObjEnvelopException2(e);
		}
	}
}

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

@@ -2,6 +2,7 @@ package com.yihu.jw.hospital.endpoint.article;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
@@ -9,7 +10,6 @@ import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeCategoryDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDao;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.hospital.service.consult.BasePatientBusinessService;
import com.yihu.jw.hospital.service.consult.KnowledgeArticleService;
import com.yihu.jw.hospital.service.consult.KnowledgeArticleUserService;

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

@@ -1,9 +1,7 @@
package com.yihu.jw.hospital.endpoint.article;
import com.yihu.jw.article.service.BaseMenuManageService;
import com.yihu.jw.entity.base.menu.BaseLinkDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import com.yihu.jw.entity.base.menu.BaseMenuShowDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.rm.base.BaseRequestMapping;
@@ -43,7 +41,7 @@ public class BaseMenuManageEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            BaseMenuDictDO baseMenuDictDO = menuService.createOrUpdateMenu(jsonData);
            BaseMenuDictDO baseMenuDictDO = menuService.createOrUpdateMenu(jsonData,2);
            return success(baseMenuDictDO);
        } catch (Exception e) {
            return failedException(e);
@@ -111,196 +109,7 @@ public class BaseMenuManageEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "status", value = "status", required = false)
            @RequestParam(value = "status",required = false) Integer status) {
        try {
            return success(menuService.findMenuDictByKey(parentId, name,status));
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.createLinkDict)
    @ApiOperation(value = "新建或修改")
    public Envelop createLink (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            BaseLinkDictDO baseLinkDictDO = menuService.createOrUpdateLink(jsonData);
            return success(baseLinkDictDO);
        } catch (Exception e) {
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.MOVELinkDOWN)
    @ApiOperation(value = "下移")
    public Envelop moveDownDict(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            BaseLinkDictDO baseLinkDictDO = menuService.downlink(id);
            return success(baseLinkDictDO);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.MOVELinkUP)
    @ApiOperation(value = "上移")
    public Envelop moveLink(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            BaseLinkDictDO baseLinkDictDO = menuService.upLink(id);
            return success(baseLinkDictDO);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.linkStatus)
    @ApiOperation(value = "生效/失效")
    public Envelop statusLink(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "status", value = "1生效，0失效", required = true)
            @RequestParam(value = "status") String status) {
        try {
            menuService.updateLinkStatus(id, status);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.findOneLink)
    @ApiOperation(value = "根据id查询链接单条")
    public Envelop findOneLink(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            return success(menuService.findOneLinkDict(id));
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.deleteLink)
    @ApiOperation(value = "删除链接")
    public Envelop deleteLink(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            menuService.updateLinkDel(id);
            return success("删除成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.LinkDict.linkShow)
    @ApiOperation(value = "生效/失效")
    public Envelop isShow(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id,
            @ApiParam(name = "status", value = "1展示0不展示", required = true)
            @RequestParam(value = "status") String status) {
        try {
            menuService.updateLinkShow(id, status);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(value = BaseRequestMapping.LinkDict.findLinkDictALL)
    @ApiOperation(value = "查询友情链接字典列表")
    public Envelop findLinkDictByKey(
            @ApiParam(name = "name", value = "name", required = false)
            @RequestParam(value = "name",required = false) String name,
            @ApiParam(name = "status", value = "status", required = false)
            @RequestParam(value = "status",required = false) String status) {
        try {
            return success(menuService.findLinkDict(name,status));
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.MenuShow.menuShowstatus)
    @ApiOperation(value = "移除")
    public Envelop removeMenu(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            menuService.removeMenu(id);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.MenuShow.createMenuShow)
    @ApiOperation(value = "新建或修首页菜单")
    public Envelop createMenuShow (
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try {
            menuService.saveMenuShow(jsonData);
            return success("操作成功");
        } catch (Exception e) {
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.MenuShow.MOVEMenuShowDOWN)
    @ApiOperation(value = "下移")
    public Envelop moveDownShow(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            BaseMenuShowDO  baseMenuShowDO= menuService.downMenuShow(id);
            return success(baseMenuShowDO);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = BaseRequestMapping.MenuShow.MOVEMenuShowUP)
    @ApiOperation(value = "上移")
    public Envelop moveUpShow(
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            BaseMenuShowDO baseMenuShowDO = menuService.upMenuShow(id);
            return success(baseMenuShowDO);
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(value = BaseRequestMapping.MenuShow.findMenuShow)
    @ApiOperation(value = "查询首页列表")
    public Envelop findMenuShowByKey(
            @ApiParam(name = "parentId", value = "parentId", required = false)
            @RequestParam(value = "parentId",required = false) String parentId,
            @ApiParam(name = "name", value = "name", required = false)
            @RequestParam(value = "name",required = false) String name) {
        try {
            return success(menuService.findMenuShow());
        }catch (Exception e){
            return failedException(e);
        }
    }
    @GetMapping(value = BaseRequestMapping.MenuShow.findMenuShowDict)
    @ApiOperation(value = "查询首页菜单词典列表")
    public Envelop findMenuShowDict(@ApiParam(name = "parentId", value = "parentId", required = false)
                                        @RequestParam(value = "parentId",required = false) String parentId,
                                    @ApiParam(name = "name", value = "name", required = false)
                                        @RequestParam(value = "name",required = false) String name) {
        try {
            return success(menuService.findMenuDictParent(parentId,name));
            return success(menuService.findMenuDictByKey(parentId, name,status,2));
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/booking/PatientBookingEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.booking;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.WxTemplateConfigDO;
import com.yihu.jw.entity.hospital.booking.PatientReservation;
@@ -51,6 +52,7 @@ public class PatientBookingEndpoint extends EnvelopRestEndpoint {
    private WechatUtilService wechatUtilService;
    @Autowired
    private JwSmjkEntranceService jwSmjkService;
    @Autowired
    private WxTemplateConfigDao templateConfigDao;
    @Autowired
    private StringRedisTemplate redisTemplate;
@@ -77,7 +79,7 @@ public class PatientBookingEndpoint extends EnvelopRestEndpoint {
    public Envelop findList(@ApiParam(name = "patient", value = "居民id")
                            @RequestParam(value = "patient", required = true) String patient) {
        try {
            return ListEnvelop.getSuccess("获取成功", patientReservationService.findList(patient));
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, patientReservationService.findList(patient));
        } catch (Exception e) {
            e.printStackTrace();
            return failedException2(e);
@@ -230,7 +232,7 @@ public class PatientBookingEndpoint extends EnvelopRestEndpoint {
            return result.toString();
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"获取失败");
            return error(-1,CommonContant.Message.GET_ERROR);
        }
    }
@@ -248,7 +250,7 @@ public class PatientBookingEndpoint extends EnvelopRestEndpoint {
            return list;
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"获取失败");
            return error(-1,CommonContant.Message.GET_ERROR);
        }
    }
@@ -364,7 +366,7 @@ public class PatientBookingEndpoint extends EnvelopRestEndpoint {
            return list;
        } catch (Exception e) {
            e.printStackTrace();
            return error(-1,"获取失败");
            return error(-1,CommonContant.Message.GET_ERROR);
        }
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/config/DoctorServiceEndPoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.config;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.doctor.service.BaseDoctorInfoService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -91,7 +92,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
            if (!update){
                return failed("保存失败，参数不可为空");
            }
            return success("保存成功");
            return success(CommonContant.Message.SAVE_ERROR);
        }catch (Exception e){
            return failedException(e);
        }
@@ -106,7 +107,7 @@ public class DoctorServiceEndPoint extends EnvelopRestEndpoint {
        try {
            JSONArray jsonArray = JSONArray.fromObject(baseDoctorVos);
            Boolean update = baseDoctorService.updateList(jsonArray);
            return success("保存成功");
            return success(CommonContant.Message.SAVE_ERROR);
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/expressage/DoctorExpressageEndpoint.java

@@ -1,19 +1,13 @@
package com.yihu.jw.hospital.endpoint.expressage;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.patient.PatientMedicareCardDO;
import com.yihu.jw.entity.hospital.prescription.WlyyPrescriptionDO;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.restmodel.hospital.prescription.WlyyPrescriptionVO;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
import com.yihu.jw.util.common.IdCardUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,8 +16,6 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
 * Created by yeshijie on 2020/4/26.
 *
@@ -47,11 +39,11 @@ public class DoctorExpressageEndpoint extends EnvelopRestEndpoint {
//            JSONObject json = JSONObject.parseObject(tmp);
//            JSONArray array = new JSONArray();
//            array.add(json);
//            return ObjEnvelop.getSuccess("获取成功", array);
            return ObjEnvelop.getSuccess("获取成功", prescriptionService.findUndeliveredList());
//            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, array);
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, prescriptionService.findUndeliveredList());
        }catch (Exception e){
            logger.error(e.getMessage());
            return ObjEnvelop.getError("获取失败");
            return ObjEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }
@@ -84,11 +76,11 @@ public class DoctorExpressageEndpoint extends EnvelopRestEndpoint {
//            JSONArray array2 = new JSONArray();
//            array2.add(json2);
//            rs.put("infos",array2);
//            return ObjEnvelop.getSuccess("获取成功", rs);
            return ObjEnvelop.getSuccess("获取成功", prescriptionService.findPrescriptionInfo(id));
//            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, rs);
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS, prescriptionService.findPrescriptionInfo(id));
        }catch (Exception e){
            logger.error(e.getMessage());
            return ObjEnvelop.getError("获取失败");
            return ObjEnvelop.getError(CommonContant.Message.GET_ERROR);
        }
    }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/healthUpload/HealthUploadPoint.java

@@ -3,6 +3,7 @@ package com.yihu.jw.hospital.endpoint.healthUpload;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.dict.dao.DictHospitalDeptDao;
import com.yihu.jw.entity.base.dict.DictHospitalDeptDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -60,7 +61,7 @@ public class HealthUploadPoint extends EnvelopRestEndpoint {
            return success("删除成功");
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("保存失败");
            return Envelop.getError(CommonContant.Message.SAVE_ERROR);
        }
    }
@@ -73,10 +74,10 @@ public class HealthUploadPoint extends EnvelopRestEndpoint {
            HealthReportingFrequencyDO frequencyDO = toEntity(jsonData, HealthReportingFrequencyDO.class);
            frequencyDO.setCreateTime(new Date());
            frequencyDO = healthReportingFrequencyService.save(frequencyDO);
            return success("保存成功",frequencyDO);
            return success(CommonContant.Message.SAVE_ERROR,frequencyDO);
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("保存失败");
            return Envelop.getError(CommonContant.Message.SAVE_ERROR);
        }
    }
@@ -86,7 +87,7 @@ public class HealthUploadPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "id", value = "id", required = true)
            @RequestParam(value = "id") String id) {
        try {
            return ObjEnvelop.getSuccess("获取成功",healthReportingFrequencyService.findDetail(id));
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,healthReportingFrequencyService.findDetail(id));
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败");

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/inpatient/PatientFeeEndpoint.java

@@ -1,6 +1,7 @@
package com.yihu.jw.hospital.endpoint.inpatient;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.inpatient.BasePatientFeeDO;
import com.yihu.jw.entity.base.inpatient.BasePatientFeeDetailDO;
import com.yihu.jw.inpatient.dao.BasePatientFeeDao;
@@ -104,7 +105,7 @@ public class PatientFeeEndpoint extends EnvelopRestEndpoint {
                    list.add(json);
                }
            }
            return MixEnvelop.getSuccess("获取成功",feeDO,list);
            return MixEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,feeDO,list);
        }catch (Exception e){
            e.printStackTrace();
            return Envelop.getError("查询失败");

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/inpatient/PatientInpatientRegistrationEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.inpatient;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.inpatient.service.BaseInpatientRegistrationService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -28,7 +29,7 @@ public class PatientInpatientRegistrationEndpoint extends EnvelopRestEndpoint {
                        @RequestParam(value = "patient", required = true)String patient){
        try {
            return ListEnvelop.getSuccess("获取成功",inpatientRegistrationService.list(patient));
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,inpatientRegistrationService.list(patient));
        }catch (Exception e){
            return failedException2(e);
        }
@@ -40,7 +41,7 @@ public class PatientInpatientRegistrationEndpoint extends EnvelopRestEndpoint {
                        @RequestParam(value = "id", required = true)String id){
        try {
            return ObjEnvelop.getSuccess("获取成功",inpatientRegistrationService.findDetail(id));
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,inpatientRegistrationService.findDetail(id));
        }catch (Exception e){
            return failedException2(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/message/SystemMessageController.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.message;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.hospital.message.service.SystemMessageService;
import com.yihu.jw.restmodel.web.Envelop;
@@ -122,7 +123,7 @@ public class SystemMessageController extends EnvelopRestEndpoint {
            if (null == systemMessageDO){
                return failed("获取失败,线上就诊消息不存在");
            }
            return success("获取成功",200,systemMessageDO);
            return success(CommonContant.Message.GET_SUCCESS,200,systemMessageDO);
        }catch (Exception e){
            return failedException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/nurse/NursingCardEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.nurse;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.nurse.BaseNursingCardDO;
import com.yihu.jw.healthUpload.service.BasePatientHealthUploadService;
import com.yihu.jw.nurse.service.BaseNursingCardService;
@@ -63,7 +64,7 @@ public class NursingCardEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "name") String name) {
        try {
            //院内存在住院患者时，才可提交页面
            return success("获取成功", nursingCardService.ifCanApply(idcard,name));
            return success(CommonContant.Message.GET_SUCCESS, nursingCardService.ifCanApply(idcard,name));
        }catch (Exception e){
            return failedException(e);
        }
@@ -93,7 +94,8 @@ public class NursingCardEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "size") Integer size) {
        try {
            String filters = "nursePatient="+patient;
            List<BaseNursingCardDO> list = nursingCardService.search(null, filters, null, page, size);
            String sorts = "-status,-createTime";
            List<BaseNursingCardDO> list = nursingCardService.search(null, filters, sorts, page, size);
            boolean hasNucleicReport = false;
            if(list.size()>0){
                //判断是否上传健康上报

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

@@ -2,6 +2,8 @@ package com.yihu.jw.hospital.endpoint.patient;
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.service.BaseDictJobTitleService;
import com.yihu.jw.dict.service.HospitalDeptService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
@@ -31,7 +33,6 @@ import com.yihu.jw.es.service.yqfk.YqfkService;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.healthUpload.service.BaseDoctorHealthUploadService;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDao;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.healthCare.YlzMedicailRelationDao;
import com.yihu.jw.hospital.httplog.dao.WlyyHttpLogDao;
@@ -1397,7 +1398,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
            @ApiParam(name = "realorder", value = "处方号")
            @RequestParam(value = "realorder", required = false) String realorder) throws Exception {
        net.sf.json.JSONObject obj = entranceService.BS15054(pid, realorder,false);
        return ObjEnvelop.getSuccess("获取成功",obj);
        return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,obj);
    }
    @PostMapping(value = "/testSFHis")
    @ApiOperation(value = "测试快递下单并更新his")
@@ -1753,18 +1754,6 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
    @GetMapping(value = BaseHospitalRequestMapping.KnowledgeArticle.searchKnowledgePageList)
    @ApiOperation(value = "获取文章列表")
    public Envelop searchKnowledgePageList(
//			@ApiParam(name = "category_first", value = "1级分类编码")
//			@RequestParam(value = "category_first", required = false) String category_first,
//			@ApiParam(name = "category_secend", value = "2级分类编码")
//			@RequestParam(value = "category_second", required = false) String category_second,
//			@ApiParam(name = "keyword", value = "关键字")
//			@RequestParam(value = "keyword", required = false) String keyword,
//			@ApiParam(name = "status", value = "审核状态：0未审核，1已审核")
//			@RequestParam(value = "status", required = false) String status,
//			@ApiParam(name = "start", value = "开始时间")
//			@RequestParam(value = "start", required = false) String start,
//			@ApiParam(name = "end", value = "结束时间")
//			@RequestParam(value = "end", required = false) String end,
            @ApiParam(name = "fields", value = "返回的字段，为空返回全部字段")
            @RequestParam(value = "fields", required = false) String fields,
            @ApiParam(name = "filters", value = "过滤器，为空检索所有条件")
@@ -2051,7 +2040,7 @@ public class PatientNoLoginEndPoint extends EnvelopRestEndpoint {
        try {
            prescriptionService.updateChannelId(id,channelId);
            return success("保存成功");
            return success(CommonContant.Message.SAVE_ERROR);
        }catch (Exception e) {
            return failedException2(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/DrugsPlanEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.prescription;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.hospital.prescription.service.DrugsPlanService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -28,7 +29,7 @@ public class DrugsPlanEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "prescriptionId", required = true) String prescriptionId) {
        try {
            drugsPlanService.createDrugsPlan(prescriptionId);
            return success("获取成功");
            return success(CommonContant.Message.GET_SUCCESS);
        } catch (Exception e) {
            return failedException2(e);
        }
@@ -42,7 +43,7 @@ public class DrugsPlanEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "month", value = "日期，yyyy-MM")
            @RequestParam(value = "month", required = true) String month) {
        try {
            return ListEnvelop.getSuccess("获取成功",drugsPlanService.findHaveDrugPlan(patient,month));
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,drugsPlanService.findHaveDrugPlan(patient,month));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
@@ -56,7 +57,7 @@ public class DrugsPlanEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "date", value = "日期，yyyy-MM-dd")
            @RequestParam(value = "date", required = true) String date) {
        try {
            return ListEnvelop.getSuccess("获取成功",drugsPlanService.findDrugsPlan(patient,date));
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,drugsPlanService.findDrugsPlan(patient,date));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }
@@ -68,7 +69,7 @@ public class DrugsPlanEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "patient", value = "居民id")
            @RequestParam(value = "patient", required = true) String patient) {
        try {
            return ListEnvelop.getSuccess("获取成功",drugsPlanService.findDrugsPlanMessage(patient));
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,drugsPlanService.findDrugsPlanMessage(patient));
        } catch (Exception e) {
            return failedListEnvelopException(e);
        }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ProcessGuidanceEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.processGuidance;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.processGuidance.service.ProcessGuidanceService;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -78,7 +79,7 @@ public class ProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/processGuidance/ThirdProcessGuidanceEndpoint.java

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.endpoint.processGuidance;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceBookingDO;
import com.yihu.jw.entity.base.processGuidance.BaseProcessGuidanceThirdPushLogDO;
import com.yihu.jw.processGuidance.dao.BaseProcessGuidanceBookingDao;
@@ -39,7 +40,7 @@ public class ThirdProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = "getInfo")
@@ -61,7 +62,7 @@ public class ThirdProcessGuidanceEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/role/BaseDoctorRoleEndpoint.java

@@ -53,7 +53,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
            String roleCode = json.getString("roleCode");
            if(CommonContant.DR_INPATIENTAREA.equals(roleCode)){
                //住院病区审核员处理
                return ObjEnvelop.getSuccess("保存成功", inpatientAreaService.addAreaDoctor(json,roleCode));
                return ObjEnvelop.getSuccess(CommonContant.Message.SAVE_ERROR, inpatientAreaService.addAreaDoctor(json,roleCode));
            }else{
                BaseDoctorRoleDO baseDoctorRole = toEntity(jsonData, BaseDoctorRoleDO.class);
                baseDoctorRole.setDel(1);
@@ -63,7 +63,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "updDel")
@@ -127,7 +127,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @GetMapping(value = BaseRequestMapping.BaseDoctorRole.PAGE)
@@ -148,7 +148,7 @@ public class BaseDoctorRoleEndpoint extends EnvelopRestEndpoint {
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
 }

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/role/BaseInpatientAreaEndpoint.java

@@ -2,6 +2,7 @@ package com.yihu.jw.hospital.endpoint.role;
import com.yihu.jw.area.dao.BaseInpatientAreaDao;
import com.yihu.jw.area.service.BaseInpatientAreaService;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.base.area.BaseInpatientAreaDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.ListEnvelop;
@@ -54,11 +55,11 @@ public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
                areaDO.setCreateTime(new Date());
                inpatientAreaDao.save(areaDO);
            }
            return ObjEnvelop.getSuccess("保存成功", areaDO);
            return ObjEnvelop.getSuccess(CommonContant.Message.SAVE_ERROR, areaDO);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "saveAreaRule")
@@ -77,11 +78,11 @@ public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
            areaDO.setDel(old.getDel());
            areaDO.setCreateTime(old.getCreateTime());
            inpatientAreaDao.save(areaDO);
            return ObjEnvelop.getSuccess("保存成功", areaDO);
            return ObjEnvelop.getSuccess(CommonContant.Message.SAVE_ERROR, areaDO);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("保存失败");
        return Envelop.getError(CommonContant.Message.SAVE_ERROR);
    }
    @PostMapping(value = "updDel")
@@ -116,11 +117,11 @@ public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
            if(!optional.isPresent()){
                return Envelop.getError("id不存在");
            }
            return ObjEnvelop.getSuccess("获取成功",optional.get());
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,optional.get());
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
    @PostMapping(value = "delete")
@@ -157,11 +158,11 @@ public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
        try {
            List<BaseInpatientAreaDO> list = inpatientAreaService.search(fields, filters, sorts, page, size);
            long count = inpatientAreaService.getCount(filters);
            return PageEnvelop.getSuccessListWithPage("获取成功",list,page,size,count);
            return PageEnvelop.getSuccessListWithPage(CommonContant.Message.GET_SUCCESS,list,page,size,count);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
    @GetMapping(value = "list")
@@ -175,10 +176,10 @@ public class BaseInpatientAreaEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "sorts", required = false) String sorts) throws Exception {
        try {
            List<BaseInpatientAreaDO> list = inpatientAreaService.search(fields, filters, sorts);
            return ListEnvelop.getSuccess("获取成功",list);
            return ListEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,list);
        }catch (Exception e){
            e.printStackTrace();
        }
        return Envelop.getError("获取失败");
        return Envelop.getError(CommonContant.Message.GET_ERROR);
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/ykyy/YkyyController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.hospital.endpoint.ykyy;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.contant.CommonContant;
import com.yihu.jw.entity.order.BusinessOrderDO;
import com.yihu.jw.hospital.prescription.service.PrescriptionService;
import com.yihu.jw.hospital.prescription.service.entrance.YkyyEntranceService;
@@ -16,8 +16,6 @@ import com.yihu.jw.wechat.service.WxTemplateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang3.StringUtils;
import org.apache.xerces.dom.PSVIAttrNSImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.Map;
/**
@@ -382,7 +379,7 @@ public class YkyyController extends EnvelopRestEndpoint {
            @ApiParam(name = "phone", value = "phone", required = true)
            @RequestParam(required = true)String phone) throws Exception {
        try {
            return ObjEnvelop.getSuccess("获取成功",ykyyService.GetDoctorInfoByLoginId(phone));
            return ObjEnvelop.getSuccess(CommonContant.Message.GET_SUCCESS,ykyyService.GetDoctorInfoByLoginId(phone));
        } catch (Exception e) {
            return ObjEnvelop.getError(e.getMessage());
        }

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

@@ -1,5 +1,6 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
@@ -8,16 +9,15 @@ import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyTemplateDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDao;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.hospital.survey.dao.SurveyTemplateDao;
import com.yihu.jw.hospital.survey.service.SurveyService;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.patient.dao.BasePatientDao;
import com.yihu.jw.restmodel.hospital.survey.WlyySurveyLabelInfoVO;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -2,6 +2,8 @@ package com.yihu.jw.hospital.service.consult;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.article.dao.KnowledgeArticleDeptDao;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -14,17 +16,15 @@ import com.yihu.jw.entity.hospital.consult.WlyyHospitalSysDictDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyTemplateDO;
import com.yihu.jw.entity.hospital.survey.WlyySurveyUserDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDao;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleDeptDao;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.hospital.dict.WlyyHospitalSysDictDao;
import com.yihu.jw.hospital.survey.dao.SurveyTemplateDao;
import com.yihu.jw.hospital.survey.dao.SurveyUserDao;
import com.yihu.jw.im.util.ImUtil;
import com.yihu.jw.mysql.query.BaseJpaService;
import com.yihu.jw.patient.dao.BasePatientBusinessDao;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.EntityUtils;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -1,7 +1,7 @@
package com.yihu.jw.hospital.service.consult;
import com.yihu.jw.article.dao.KnowledgeArticleUserDao;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleUserDO;
import com.yihu.jw.hospital.dao.consult.KnowledgeArticleUserDao;
import com.yihu.jw.mysql.query.BaseJpaService;
import org.springframework.stereotype.Service;