官网接口修改

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

@@ -7,12 +7,14 @@ import com.yihu.jw.base.dao.article.KnowledgeArticleDeptDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleMenuDao;
import com.yihu.jw.base.dao.article.KnowledgeArticleUserDao;
import com.yihu.jw.base.dao.menu.BaseMenuDictDao;
import com.yihu.jw.base.dao.user.UserDao;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
import com.yihu.jw.entity.base.doctor.BaseDoctorHospitalDO;
import com.yihu.jw.entity.base.menu.BaseMenuDictDO;
import com.yihu.jw.entity.base.patient.BasePatientBusinessDO;
import com.yihu.jw.entity.base.user.UserDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDeptDO;
import com.yihu.jw.entity.hospital.article.KnowledgeArticleDictDO;
@@ -69,6 +71,8 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	private SurveyTemplateDao surveyTemplateDao;
	@Autowired
    private HibenateUtils hibenateUtils;
	@Autowired
	private UserDao userDao;
	//查询文章列表
	public List<Map<String,Object>> findArticleList(String first,String second ,String key,Integer page ,Integer pageSize){
		String sql ="select b.id as \"id\", " +
@@ -118,7 +122,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
	 * 删除，支持批量
	 * @param id
	 */
	public boolean delArticle(String 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 + ")";
@@ -132,45 +136,48 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
		}
		return false;
	}
	
	public boolean delArticle(String id){
		KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(id);
		if (knowledgeArticleDictDO!=null){
			knowledgeArticleDictDO.setDel(0);
			knowledgeArticleDictDao.save(knowledgeArticleDictDO);
			return true;
		}
		return false;
	}
	/**
	 * 更新/保存健康文章
	 * @param jsonData
	 * @return
	 * @throws Exception
	 */
	public KnowledgeArticleDictDO saveArticle(String jsonData,String menuId) throws  Exception {
		WlyyHospitalSysDictDO wlyyHospitalSysDictDO = hospitalSysDictDao.findById("EXAMINE");
	public KnowledgeArticleDictDO saveArticle(String jsonData) throws  Exception {
		KnowledgeArticleDictDO knowledgeArticleDO = EntityUtils.jsonToEntity(jsonData, KnowledgeArticleDictDO.class);
		if (null == knowledgeArticleDO.getId()) {
		if (!StringUtils.isNotBlank(knowledgeArticleDO.getId()) ) {
			// 新增
			knowledgeArticleDO.setId(UUID.randomUUID().toString().replace("-", ""));
			knowledgeArticleDO.setCreateTime(new Date());
//			knowledgeArticleDO.setSource("客服");
			knowledgeArticleDO.setStatus(0);
			knowledgeArticleDO.setReleaseStatus(0);
			knowledgeArticleDO.setDel(1);
			if (wlyyHospitalSysDictDO!=null&&wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("0")){
				knowledgeArticleDO.setStatus(1);
			UserDO userDO = userDao.findById(knowledgeArticleDO.getCreateUser());
			if (userDO!=null){
				knowledgeArticleDO.setCreateUserName(userDO.getName());
			}
			knowledgeArticleDO = knowledgeArticleDictDao.save(knowledgeArticleDO);
			/*if (StringUtils.isNotBlank(menuId)){
				BaseMenuDictDO baseMenuDictDO = baseMenuDictDao.findOne(menuId);
				KnowledgeArticleMenuDO knowledgeArticleMenuDO = new KnowledgeArticleMenuDO();
				if (baseMenuDictDO!=null){
					knowledgeArticleMenuDO.setArticleId(knowledgeArticleDO.getId());
					knowledgeArticleMenuDO.setMenuId(menuId);
					knowledgeArticleMenuDO.setMenuName(baseMenuDictDO.getName());
				}
			}*/
			return knowledgeArticleDO;
		} else {
			KnowledgeArticleDictDO one = knowledgeArticleDictDao.findOne(knowledgeArticleDO.getId());
			one.setTitle(knowledgeArticleDO.getTitle());
			one.setContent(knowledgeArticleDO.getContent());
			one.setImage(knowledgeArticleDO.getImage());
			one.setIntro(knowledgeArticleDO.getIntro());
			one.setUpdateTime(new Date());
			if (wlyyHospitalSysDictDO!=null&&wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("0")){
				one.setStatus(1);
			}
			one.setCategoryFirst(knowledgeArticleDO.getCategoryFirst());
			one.setCategoryFirstName(knowledgeArticleDO.getCategoryFirstName());
			one.setCategorySecond(knowledgeArticleDO.getCategorySecond());
			one.setCategorySecondName(knowledgeArticleDO.getCategorySecondName());
			one.setStatus(0);
			knowledgeArticleDictDao.save(one);
			return  one;
		}
@@ -184,7 +191,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
			throw new Exception("该文章不存在");
		} else {
			knowledgeArticleDO.setStatus(status);
			knowledgeArticleDO.setUpdateTime(new Date());
			knowledgeArticleDO.setCheckTime(new Date());
			if(StringUtils.isNotBlank(reason)){
				knowledgeArticleDO.setCancelReason(reason);
			}
@@ -278,8 +285,15 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDict
		}
		return true;
	}
	public KnowledgeArticleDictDO releaseArticle(String articleId,Integer releaseStatus ){
		KnowledgeArticleDictDO knowledgeArticleDictDO = knowledgeArticleDictDao.findByIdAndDel(articleId);
		if (null!=knowledgeArticleDictDO){
			knowledgeArticleDictDO.setReleaseStatus(releaseStatus);
			knowledgeArticleDictDO.setReleaseTime(new Date());
			knowledgeArticleDictDao.save(knowledgeArticleDictDO);
		}
		return knowledgeArticleDictDO;
	}
	/**
	 *	患者接收问卷/文章
	 * @param businessDOS

svr/svr-base/src/main/java/com/yihu/jw/base/service/doctor/BaseDoctorService.java

@@ -11,6 +11,7 @@ import com.yihu.jw.base.service.dict.DictDoctorDutyService;
import com.yihu.jw.base.service.doctor.excelImport.BaseDoctorExcelDO;
import com.yihu.jw.base.service.org.OrgTree;
import com.yihu.jw.base.service.org.OrgTreeService;
import com.yihu.jw.base.service.util.YkyyBaseService;
import com.yihu.jw.base.util.ConstantUtils;
import com.yihu.jw.base.util.JavaBeanUtils;
import com.yihu.jw.dict.dao.DictDoctorDutyDao;
@@ -123,6 +124,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
    private BaseIncentiveDictDao baseIncentiveDictDao;
    @Autowired
    private BaseTeamMemberDao baseTeamMemberDao;
    @Autowired
    private YkyyBaseService ykyyService;
    @Value("${wechat.flag}")
    private boolean flag;
@@ -1265,7 +1268,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
        return list;
    }
    //医生重置密码
    public String  resetDoctorPwd(String doctor){
    @Transactional
    public String  resetDoctorPwd(String doctor) throws Exception{
        BaseDoctorDO baseDoctorDO= baseDoctorDao.findById(doctor);
        if (baseDoctorDO!=null){
@@ -1276,6 +1280,29 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            }
            baseDoctorDO.setPassword(MD5.md5Hex(baseDoctorDO.getIdcard().substring(12, 18) + "{" + salt + "}"));
            baseDoctorDao.save(baseDoctorDO);
            if ("xm_ykyy_wx".equalsIgnoreCase(wxId)){
                String res = ykyyService.getResetCode("4",baseDoctorDO.getMobile());
                String resltCode ="";
                String captcha = "";
                if (!StringUtils.isEmpty(res)){
                    JSONObject jsonObject = JSONObject.parseObject(res);
                    if ("10000".equalsIgnoreCase(jsonObject.getString("code"))){
                        captcha = jsonObject.getString("value");
                        resltCode = jsonObject.getString("code");
                        String response =  ykyyService.ResetPwd(baseDoctorDO.getMobile(),baseDoctorDO.getIdcard().substring(12, 18),captcha);
                        if (org.apache.commons.lang3.StringUtils.isNoneBlank(response)){
                            JSONObject object = JSONObject.parseObject(response);
                            if (object.getString("code").equalsIgnoreCase("10000")){
                                return "修改成功！";
                            }else {
                                throw  new Exception("修改失败");
                            }
                        }else {
                            throw  new Exception("修改失败");
                        }
                    }
                }
            }
            return "操作成功";
        }
        return "医生不存在";

svr/svr-base/src/main/java/com/yihu/jw/base/service/menu/BaseMenuManageService.java

@@ -130,7 +130,7 @@ public class BaseMenuManageService {
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:effect){
                if (map.get("status").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    map.put("statusName",wlyyHospitalSysDictDO.getDictValue());
                    map.put("isShow",wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("1")?"是":"否");
                    map.put("isShow",map.get("status").toString().equalsIgnoreCase("1")?"是":"否");
                }
            }
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:menuLocation){
@@ -145,7 +145,7 @@ public class BaseMenuManageService {
                    for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:effect){
                        if (mapchild.get("status").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                            mapchild.put("statusName",wlyyHospitalSysDictDO.getDictValue());
                            mapchild.put("isShow",wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("1")?"是":"否");
                            mapchild.put("isShow",mapchild.get("status").toString().equalsIgnoreCase("1")?"是":"否");
                        }
                    }
                    for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:menuFunction){
@@ -165,11 +165,7 @@ public class BaseMenuManageService {
    public BaseMenuDictDO findOneMenuDict(String id){
        BaseMenuDictDO baseMenuDictDO= baseMenuDictDao.findOne(id);
        if (baseMenuDictDO!=null){
            WlyyHospitalSysDictDO menuLocation = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuLocation",baseMenuDictDO.getMenuLocation());
            WlyyHospitalSysDictDO menuFunction = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuFunction",baseMenuDictDO.getFunctionType());
            WlyyHospitalSysDictDO effect = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("isEffect",baseMenuDictDO.getStatus().toString());
            baseMenuDictDO.setLocaTionName(menuLocation.getDictValue());
            baseMenuDictDO.setFunctionName(menuFunction.getDictValue());
            baseMenuDictDO.setShowName(baseMenuDictDO.getStatus().equals("1")?"是":"否");
            baseMenuDictDO.setStatusName(effect.getDictValue());
            if (!"0".equalsIgnoreCase(baseMenuDictDO.getParentId())){
@@ -177,6 +173,11 @@ public class BaseMenuManageService {
                if (parentDo!=null){
                    baseMenuDictDO.setParentName(parentDo.getName());
                }
                WlyyHospitalSysDictDO menuFunction = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuFunction",baseMenuDictDO.getFunctionType());
                baseMenuDictDO.setFunctionName(menuFunction.getDictValue());
            }else {
                WlyyHospitalSysDictDO menuLocation = wlyyHospitalSysDictDao.findOneByDictNameAndDictCode("menuLocation",baseMenuDictDO.getMenuLocation());
                baseMenuDictDO.setLocaTionName(menuLocation.getDictValue());
            }
        }
        return baseMenuDictDO;
@@ -276,7 +277,7 @@ public class BaseMenuManageService {
                menuDO = baseMenuDictDao.save(menuOld);
            }
        }else {
            if (StringUtils.isNoneBlank(menuDO.getParentId())){
            if (!"0".equalsIgnoreCase(menuDO.getParentId())){
                Integer maxSort=baseMenuDictDao.getMaxSort(menuDO.getParentId());
                menuDO.setMenuSort((maxSort==null?0:maxSort)+1);
                menuDO.setIsDel("1");
@@ -301,6 +302,7 @@ public class BaseMenuManageService {
                baseLinkDictDO.setLinkUrl(linkDictDO.getLinkUrl());
                //baseLinkDictDO.setLinkSort((maxSort==null?0:maxSort)+1);
                baseLinkDictDO.setIsShow(linkDictDO.getIsShow());
                baseLinkDictDO.setStatus(linkDictDO.getStatus());
                baseLinkDictDO.setIsDel("1");
                linkDictDO =  baseLinkDictDao.save(baseLinkDictDO);
            }else {
@@ -318,6 +320,7 @@ public class BaseMenuManageService {
                " t.name as \"name\"," +
                " t.link_url as \"linkUrl\"," +
                " t.is_show as \"isShow\"," +
                " t.status as \"status\"," +
                " t.link_sort as \"linkSort\"," +
                " t.create_time as \"createTime\"," +
                " t.is_del as \"isDel\" " +
@@ -330,6 +333,16 @@ public class BaseMenuManageService {
        }
        sql+=" order by t.link_sort asc";
        List<Map<String,Object>> list = hibenateUtils.createSQLQuery(sql);
        List<WlyyHospitalSysDictDO> effect = wlyyHospitalSysDictDao.findByDictName("isEffect");
        for (Map<String,Object> map:list){
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:effect){
                if (map.get("status").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    map.put("statusName",wlyyHospitalSysDictDO.getDictValue());
                    map.put("isShow",map.get("status").toString().equalsIgnoreCase("1")?"是":"否");
                }
            }
        }
        return list;
    }
@@ -481,7 +494,7 @@ public class BaseMenuManageService {
                " t.style_name as \"styleName\" " +
                " from base_menu_show t left join " +
                " base_link_dict m on t.menu_id= m.id" +
                " where t.is_del ='1' and t.model_id='03' order by t.menu_sort asc ";
                " where t.is_del ='1' and t.model_id='03' and t.status='1' order by t.menu_sort asc ";
        List<Map<String,Object>> listLink=hibenateUtils.createSQLQuery(sqlLink);
        for (Map<String,Object> map:listModel){
@@ -675,7 +688,7 @@ public class BaseMenuManageService {
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:effect){
                if (map.get("status").toString().equalsIgnoreCase(wlyyHospitalSysDictDO.getDictCode())){
                    map.put("statusName",wlyyHospitalSysDictDO.getDictValue());
                    map.put("isShow",wlyyHospitalSysDictDO.getDictValue().equalsIgnoreCase("1")?"是":"否");
                    map.put("isShow",map.get("status").toString().equalsIgnoreCase("1")?"是":"否");
                }
            }
            for (WlyyHospitalSysDictDO wlyyHospitalSysDictDO:menuLocation){