From 34f352e757c8f78b4522199e7cdc2eb93fcf8010 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Mon, 22 Jan 2024 08:32:56 +0800 Subject: [PATCH] =?UTF-8?q?#fix=20=E4=BC=98=E5=8C=96=E7=97=85=E4=BE=8B?= =?UTF-8?q?=E4=B8=80=E9=94=AE=E4=B8=8A=E4=BC=A0=E9=80=BB=E8=BE=91=E5=88=A4?= =?UTF-8?q?=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/talkonlineweb/controller/PushMessageController.java | 3 --- .../com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PushMessageController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PushMessageController.java index 0727df4..3de77a9 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PushMessageController.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PushMessageController.java @@ -27,9 +27,6 @@ public class PushMessageController { public BaseResponse getAllPerm(@PathVariable("messageType") Integer messageType ,String diagnose,Integer type,Integer status,String cid,Integer isRead ,String startTime,String endTime,int current,int size){ - if (messageType==null){ - return BaseResponse.error("推送类型不能为空"); - } QueryWrapper queryWrapper=new QueryWrapper<>(); List list=new ArrayList<>(); list.add(messageType); diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index d693e9c..cb2734a 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -24,6 +24,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.DigestUtils; import java.util.*; +import java.util.stream.Collectors; /** * @@ -385,8 +386,9 @@ public class LymsHisInfoServiceImpl extends ServiceImpl chatList= lymsChatInfoService.list(new QueryWrapper().in("illid",diagnoseIds)); - if (CollectionUtils.isEmpty(chatList)){ - String remark= "该患者疾病没有设置回访内容"; + if (CollectionUtils.isEmpty(chatList) || + chatList.stream().collect(Collectors.groupingBy(LymsChatInfo::getType)).size()<5){ + String remark= "该患者疾病回访内容不足5种类型"; lymsHisInfo.setRemark(remark); return remark; } -- 1.8.3.1