liquanyu / talkonline

Download as
Browse Code »

Commit 34f352e757c8f78b4522199e7cdc2eb93fcf8010

Authored by zhangchao
1 parent 01054ed761
Exists in dev

#fix 优化病例一键上传逻辑判断

Showing 2 changed files with 4 additions and 5 deletions

talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PushMessageController.java View file @ 34f352e
... ... @@ -27,9 +27,6 @@
27 27 public BaseResponse getAllPerm(@PathVariable("messageType") Integer messageType
28 28 ,String diagnose,Integer type,Integer status,String cid,Integer isRead
29 29 ,String startTime,String endTime,int current,int size){
30   - if (messageType==null){
31   - return BaseResponse.error("推送类型不能为空");
32   - }
33 30 QueryWrapper<LymsPushMessage> queryWrapper=new QueryWrapper<>();
34 31 List<Integer> list=new ArrayList<>();
35 32 list.add(messageType);
talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java View file @ 34f352e
... ... @@ -24,6 +24,7 @@
24 24 import org.springframework.util.DigestUtils;
25 25  
26 26 import java.util.*;
  27 +import java.util.stream.Collectors;
27 28  
28 29 /**
29 30 *
... ... @@ -385,8 +386,9 @@
385 386 }
386 387 //随访
387 388 List<LymsChatInfo> chatList= lymsChatInfoService.list(new QueryWrapper<LymsChatInfo>().in("illid",diagnoseIds));
388   - if (CollectionUtils.isEmpty(chatList)){
389   - String remark= "该患者疾病没有设置回访内容";
  389 + if (CollectionUtils.isEmpty(chatList) ||
  390 + chatList.stream().collect(Collectors.groupingBy(LymsChatInfo::getType)).size()<5){
  391 + String remark= "该患者疾病回访内容不足5种类型";
390 392 lymsHisInfo.setRemark(remark);
391 393 return remark;
392 394 }