liquanyu / talkonline

Commit 0ad508e9836a4021e6cf29effb5dbd395de4df8f

Authored by zhangchao almost 2 years ago

Exists in dev

#fix 优化token过期提醒，新增发布、下架接口

Showing 4 changed files with 89 additions and 33 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/config/MyWebInterceptor.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ArticleController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DepartController.java
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java

...	...	@@ -53,8 +53,8 @@
53	53
54	54	if(!checkResult.isSuccess()){
55	55	BaseResponse baseResponse=new BaseResponse();
56		- baseResponse.setErrorcode(1);
57		- baseResponse.setErrormsg("无效token");
	56	+ baseResponse.setErrorcode(checkResult.getErrCode());
	57	+ baseResponse.setErrormsg(checkResult.getErrCode()==500?"登录过期，请重新登录":"登录异常，请重新登录");
58	58	response.setCharacterEncoding("UTF-8");
59	59	response.setHeader("Cache-Control", "no-cache");
60	60	response.setContentType("application/json;charset=UTF-8");

1	1	package com.lyms.talkonlineweb.controller;
2	2
	3	+import com.baomidou.mybatisplus.annotation.TableField;
3	4	import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
4	5	import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
5	6	import com.baomidou.mybatisplus.core.toolkit.Wrappers;
...	...	@@ -69,7 +70,8 @@
69	70	*/
70	71	@PostMapping("upFile")
71	72	@TokenRequired
72		- public String upFile(MultipartFile imgFile) {
	73	+ public BaseResponse upFile(MultipartFile imgFile) {
	74	+ BaseResponse baseResponse = new BaseResponse();
73	75	String furl = "";
74	76	if (Objects.nonNull(imgFile)) {
75	77	try {
76	78
...	...	@@ -80,13 +82,14 @@
80	82	furl = file.getAbsolutePath();
81	83	log.info("上传文件:" + furl);
82	84	furl = imgUrlPre + file.getName();
	85	+ baseResponse.setObject(furl);
83	86	} catch (Exception e) {
84	87	log.error(e.getMessage());
85	88	e.printStackTrace();
86	89	}
87	90	}
88	91
89		- return furl;
	92	+ return baseResponse;
90	93	}
91	94
92	95	/**
...	...	@@ -124,6 +127,20 @@
124	127	baseResponse.setErrorcode(f == true ? 0 : 1);
125	128	return baseResponse;
126	129	}
	130	+ /**
	131	+ * 是否发布. 0,否;1是
	132	+ */
	133	+ @GetMapping("upArticle")
	134	+ @TokenRequired
	135	+ public BaseResponse saveArticle(Integer aid,Byte stat){
	136	+ BaseResponse baseResponse = new BaseResponse();
	137	+ LymsArticle lymsArticle= new LymsArticle();
	138	+ lymsArticle.setStat(stat);
	139	+ lymsArticle.setAid(aid);
	140	+ boolean f =lymsArticleService.updateById(lymsArticle);
	141	+ baseResponse.setErrorcode(f == true ? 0 : 1);
	142	+ return baseResponse;
	143	+ }
127	144
128	145	/**
129	146	* PC-获取文章列表
...	...	@@ -141,6 +158,7 @@
141	158	Page<ArticleInfo> page = new Page<>(current, size);
142	159	Page<ArticleInfo> articlePagePage = new Page<>();
143	160	QueryWrapper query=new QueryWrapper();
	161	+ query.select("id,aid,did,iid,title,uname,createdtime,value,stat,dname,cname,article_type as articleType");
144	162	if(!StringUtils.isEmpty(article.getIid())){
145	163	query.eq("iid",article.getIid());
146	164	}
147	165
...	...	@@ -169,7 +187,23 @@
169	187
170	188	return baseResponse;
171	189	}
	190	+
172	191	/**
	192	+ * 获取文章详情接口
	193	+ * @param aid
	194	+ * @return
	195	+ */
	196	+ @GetMapping("getArticle")
	197	+ @TokenRequired
	198	+ public BaseResponse getArticle(Integer aid){
	199	+ BaseResponse baseResponse = new BaseResponse();
	200	+ QueryWrapper query=new QueryWrapper();
	201	+ query.eq("aid",aid);
	202	+ ArticleInfo articleInfo= articleInfoService.getOne(query);
	203	+ baseResponse.setObject(articleInfo);
	204	+ return baseResponse;
	205	+ }
	206	+ /**
173	207	* 小程序-获取文章列表
174	208	*
175	209	* @param article
...	...	@@ -303,7 +337,11 @@
303	337	BaseResponse baseResponse=new BaseResponse();
304	338	try {
305	339	Page<PushedartlogsInfo> page=new Page<>(current,size);
306		- Page<PushedartlogsInfo> pushedartlogsInfoPage=pushedartlogsInfoService.page(page,Wrappers.query(pushedartlogsInfo).orderByDesc("createdtime"));
	340	+ QueryWrapper query=new QueryWrapper();
	341	+ query.select("title,createdtime,illness,dname,createdtime,pname");
	342	+ query.setEntity(pushedartlogsInfo);
	343	+ query.orderByDesc("createdtime");
	344	+ Page<PushedartlogsInfo> pushedartlogsInfoPage=pushedartlogsInfoService.page(page,query);
307	345	baseResponse.setObject(pushedartlogsInfoPage);
308	346	baseResponse.setErrormsg("成功");
309	347	} catch (Exception e) {
...	...	@@ -312,6 +350,7 @@
312	350	}
313	351	return baseResponse;
314	352	}
	353	+
315	354	/**
316	355	* 根据患者id,问诊id,状态类型1为已读更新推送文章记录
317	356	*/
...	...	@@ -440,6 +479,7 @@
440	479	try {
441	480	Page<LymsPushMessages> page=new Page<>(current,size);
442	481	QueryWrapper<LymsPushMessages> queryWrapper = new QueryWrapper<>();
	482	+ queryWrapper.select("id,pname,mobile,hname,dname,iname,dtname,atitle,article_type as articleType,isweixin_one as isweixinOne,isweixin_two as isweixinTwo,push_time as pushTime,state,remark");
443	483	queryWrapper.setEntity(lymsPushMessages);
444	484	if(null!=lymsPushMessages.getStartDate()&&null!=lymsPushMessages.getEndDate()){
445	485	queryWrapper.ge("push_time", lymsPushMessages.getStartDate()).le("push_time",lymsPushMessages.getEndDate());

...	...	@@ -15,10 +15,7 @@
15	15	import org.springframework.validation.annotation.Validated;
16	16	import org.springframework.web.bind.annotation.*;
17	17
18		-import java.util.Date;
19		-import java.util.HashMap;
20		-import java.util.List;
21		-import java.util.Map;
	18	+import java.util.*;
22	19
23	20	/**
24	21	* 科室管理
25	22
...	...	@@ -122,13 +119,16 @@
122	119	if(depart.getIllsName()!=null){
123	120	iArrName=depart.getIllsName().split(",");
124	121	}
125		-
	122	+ List<LymsDepartill> departillList=new ArrayList<>();
126	123	for (int i = 0; i < iArr.length; i++) {
127	124	LymsDepartill departill=new LymsDepartill();
128	125	departill.setDid(depart.getDid());
129	126	departill.setIid(Integer.parseInt(iArr[i]));
130	127	departill.setIname(iArrName[i]);
131		- lymsDepartillService.save(departill);
	128	+ departillList.add(departill);
	129	+ }
	130	+ if (CollectionUtils.isNotEmpty(departillList)){
	131	+ lymsDepartillService.saveBatch(departillList);
132	132	}
133	133	//保存操作记录
134	134	lymsLogsCrud(depart,hid);

...	...	@@ -379,7 +379,7 @@
379	379	params.put(8,remark);
380	380	}
381	381
382		- //疾病
	382	+ //疾病孕33+4周第2胎,瘢痕子宫
383	383	List<String> diagnoses = Arrays.asList(lymsHisInfo.getDiagnose().split(","));
384	384	Map<String,Diagnose> diagnoseMap = new HashMap<>();
385	385	List<String> diagnoseIds = new ArrayList<>();//疾病ids
...	...	@@ -395,11 +395,7 @@
395	395	}
396	396	}
397	397
398		- if (diagnoseIds.size()>1){
399		- String remark= "该患者存在多种疾病,请手动上传";
400		- //lymsHisInfo.setRemark(remark);
401		- params.put(10,remark);
402		- }
	398	+
403	399	/*
404	400	List<String> diagnoseOrmIds = new ArrayList<>();//疾病映射ids
405	401	if (null != diagnoses) {
...	...	@@ -437,6 +433,11 @@
437	433
438	434	//手动上传不卡条件，自动上传的时候才卡
439	435	if (type==2){
	436	+ if (diagnoseIds.size()>1){
	437	+ String remark= "该患者存在多种疾病,请手动上传";
	438	+ //lymsHisInfo.setRemark(remark);
	439	+ params.put(10,remark);
	440	+ }
440	441	//知识库
441	442	if (diagnoseIds.size()>0){
442	443	List<ArticleInfo> articleList= articleInfoService.list(new QueryWrapper<ArticleInfo>()
...	...	@@ -446,6 +447,10 @@
446	447	//lymsHisInfo.setRemark(remark);
447	448	params.put(11,remark);
448	449	}
	450	+ }else {
	451	+ String remark= "该患者疾病文章不足18篇,（缺少18篇）";
	452	+ //lymsHisInfo.setRemark(remark);
	453	+ params.put(11,remark);
449	454	}
450	455	}
451	456	//当前科室不为产科并且是自动上传时才卡
...	...	@@ -467,6 +472,10 @@
467	472	//lymsHisInfo.setRemark(remark);
468	473	params.put(12,remark);
469	474	}
	475	+ }else {
	476	+ String remark= "该患者疾病回访内容不足5种类型(缺少第二天、第五天、第十天、第二十天、第三十天)";
	477	+ //lymsHisInfo.setRemark(remark);
	478	+ params.put(12,remark);
470	479	}
471	480	}
472	481
473	482
474	483
...	...	@@ -477,27 +486,34 @@
477	486	}
478	487	List<LymsWorkMessage> workMessageList=new ArrayList<>();
479	488	StringBuffer sb=new StringBuffer();
	489	+ QueryWrapper<LymsWorkMessage> wr = new QueryWrapper<>();
480	490	params.entrySet().stream().forEach(entry -> {
481	491	LymsWorkMessage lymsWorkMessage=new LymsWorkMessage();
482	492	Integer key = entry.getKey();
483	493	String value = entry.getValue();
484		- if (key==9 \|\|key==10 ){
485		- lymsWorkMessage.setType(1);
486		- }else if (key==11 \|\|key==12){
487		- lymsWorkMessage.setType(2);
488		- }else {
489		- lymsWorkMessage.setType(3);
	494	+ wr.eq("hospital_id",lymsHospital.getHid());
	495	+ wr.eq("phone",phone);
	496	+ wr.eq("remark",value);
	497	+ List<LymsWorkMessage> list= lymsWorkMessageService.list(wr);
	498	+ if (CollectionUtils.isEmpty(list)){
	499	+ if (key==9 \|\|key==10 ){
	500	+ lymsWorkMessage.setType(1);
	501	+ }else if (key==11 \|\|key==12){
	502	+ lymsWorkMessage.setType(2);
	503	+ }else {
	504	+ lymsWorkMessage.setType(3);
	505	+ }
	506	+ sb.append(value).append(",");
	507	+ lymsWorkMessage.setRemark(value);
	508	+ lymsWorkMessage.setCreated(new Date());
	509	+ lymsWorkMessage.setDept(deptName);
	510	+ lymsWorkMessage.setHisInfoId(lymsHisInfo.getId());
	511	+ lymsWorkMessage.setHospital(lymsHospital.getHname());
	512	+ lymsWorkMessage.setHospitalId(lymsHospital.getHid());
	513	+ lymsWorkMessage.setPhone(phone);
	514	+ lymsWorkMessage.setUsername(name);
	515	+ workMessageList.add(lymsWorkMessage);
490	516	}
491		- sb.append(value).append(",");
492		- lymsWorkMessage.setRemark(value);
493		- lymsWorkMessage.setCreated(new Date());
494		- lymsWorkMessage.setDept(deptName);
495		- lymsWorkMessage.setHisInfoId(lymsHisInfo.getId());
496		- lymsWorkMessage.setHospital(lymsHospital.getHname());
497		- lymsWorkMessage.setHospitalId(lymsHospital.getHid());
498		- lymsWorkMessage.setPhone(phone);
499		- lymsWorkMessage.setUsername(name);
500		- workMessageList.add(lymsWorkMessage);
501	517	});
502	518	if (CollectionUtils.isNotEmpty(workMessageList)){
503	519	lymsWorkMessageService.saveBatch(workMessageList);