From bdf086b4cdafb04d2c077bd0deea90524b522f88 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 16 Jul 2024 08:59:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=94=BB=E5=83=8F=E6=98=9F=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SignPatientManageRouteNodeMapper.java | 8 ++++++++ .../impl/LabelFieldContentServiceImpl.java | 10 ++++++++++ .../SignPatientManageRouteNodeMapper.xml | 9 +++++++++ 3 files changed, 27 insertions(+) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java index 7cd40a42..1b244cc5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.java @@ -117,4 +117,12 @@ public interface SignPatientManageRouteNodeMapper { * @return 节点列表 */ List selectNodesByManageIds(@Param("manageRouteIds") List manageRouteIds); + + /** + * 查询患者管理路径节点内容 + * + * @param patientId 患者id + * @return 患者管理任务路径节点 + */ + List getRouteNodeContentList(Long patientId); } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index 07f6e841..a4741d81 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -214,6 +214,10 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { patientTaskDto.setPatientId(patientId); //根据患者id查询节点富文本所需标签 List nodeList = signPatientManageRouteNodeMapper.getNodeList(patientTaskDto); + List routeNodeContentList = signPatientManageRouteNodeMapper.getRouteNodeContentList(patientId); + if (CollectionUtils.isNotEmpty(routeNodeContentList)) { + nodeList.addAll(routeNodeContentList); + } List nodeContentList = nodeList.stream().filter(Objects::nonNull).map(SignPatientManageRouteNode::getNodeContent).filter(Objects::nonNull).collect(Collectors.toList()); String nodeContentListJoin = String.join(",", nodeContentList); Document document = Jsoup.parse(nodeContentListJoin); @@ -247,6 +251,12 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { for (GroupingValue groupingValue : labelFieldContentList) { groupingValue.setPatientId(patientId); String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String()); + List collect = string.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(collect)) { + groupingValue.setSign(1); + } else { + groupingValue.setSign(0); + } groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString()); } //遍历任务细分id组装数据 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index 896153a3..1f767dc7 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -814,4 +814,13 @@ #{manageRouteId} + + \ No newline at end of file From 62563aaa32dabfb93129783d82175b6dde5f9cb5 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 16 Jul 2024 11:05:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=94=BB=E5=83=8F=E6=98=9F=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LabelFieldContentMapper.java | 3 +- .../impl/LabelFieldContentServiceImpl.java | 53 ++++++++++++++----- .../xinelu/manage/vo/agency/AgencyTreeVO.java | 2 +- .../com/xinelu/manage/vo/agency/AgencyVO.java | 2 +- .../xinelu/manage/vo/agency/HospitalVO.java | 6 +++ .../agencycategory/AgencyCategoryTreeVO.java | 6 +++ .../vo/agencycategory/AgencyCategoryVO.java | 6 +++ .../vo/labelfieldcontent/GroupingValue.java | 2 +- .../vo/labelfieldcontent/LabelField.java | 4 +- .../LabelFieldAndPartitionDict.java | 6 +++ .../LabelFieldContentVO.java | 4 +- .../vo/labelfieldcontent/PortraitSnVO.java | 6 +++ .../vo/labelfieldinfo/LabelFieldTreeVO.java | 2 +- .../vo/labelfieldinfo/LabelFieldVO.java | 4 +- .../PatientQuestionSubjectResultVO.java | 2 +- .../PatientQuestionSubmitResultVO.java | 2 +- .../PatientTaskExecuteRecordVO.java | 2 +- .../manage/vo/questionInfo/QuestionVO.java | 3 +- .../vo/questionsubject/QuestionSubjectVO.java | 2 +- .../QuestionSubjectOptionVO.java | 2 +- .../com/xinelu/manage/vo/scriptInfo/Edge.java | 3 ++ .../com/xinelu/manage/vo/scriptInfo/Node.java | 6 +++ .../vo/signpatientmanageroute/PhonePush.java | 6 +++ .../SignRouteTriggerConditionVO.java | 2 +- .../SpecialDiseaseNodeVO.java | 4 +- .../SpecialDiseaseRouteVO.java | 7 ++- .../SpecialDiseaseRoutePackageVO.java | 5 +- .../TriggerConditionVO.java | 4 +- .../xinelu/manage/vo/sysarea/SysAreaVO.java | 7 +-- .../vo/tasktypedict/TaskTypeDictVO.java | 7 ++- .../manage/vo/termbank/TermBankTreeVO.java | 4 +- .../xinelu/manage/vo/termbank/TermBankVO.java | 10 +++- .../LabelFieldContentMapper.xml | 2 +- .../homepage/HomePageController.java | 2 +- .../mapper/homepage/HomePageMapper.java | 1 - .../service/homepage/HomePageService.java | 6 +++ .../homepage/Impl/HomePageServiceImpl.java | 8 ++- .../mobile/vo/homepage/MessageContentVO.java | 3 ++ .../vo/homepage/MessageTabulationVO.java | 3 ++ .../mobile/vo/myfollowup/MyFollowUpVO.java | 2 +- .../SatisfactionQuestionnaire.java | 11 +++- .../PatientVO.java | 7 +++ .../MessageSubscriptionController.java | 2 +- .../impl/subscribeTaskServiceImpl.java | 5 ++ 44 files changed, 181 insertions(+), 55 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java index 294a8879..470c54b9 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/labelfieldcontent/LabelFieldContentMapper.java @@ -2,7 +2,6 @@ package com.xinelu.manage.mapper.labelfieldcontent; import com.xinelu.manage.domain.labelfieldcontent.LabelFieldContent; import com.xinelu.manage.vo.labelfieldcontent.GroupingValue; -import com.xinelu.manage.vo.labelfieldcontent.LabelFieldAndPartitionDict; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldContentVO; import com.xinelu.manage.vo.labelfieldcontent.LabelFieldInfoContentVo; import org.apache.ibatis.annotations.Param; @@ -90,7 +89,7 @@ public interface LabelFieldContentMapper { * @param portraitStatus 状态 * @return GroupingValue */ - List labelFieldAndPartitionDict(@Param("taskPartitionDictId") Long taskPartitionDictId, @Param("patientId") Long patientId, @Param("portraitStatus") String portraitStatus); + List labelFieldAndPartitionDict(@Param("taskPartitionDictId") Long taskPartitionDictId, @Param("patientId") Long patientId, @Param("portraitStatus") String portraitStatus); List groupingValue(@Param("taskPartitionDictId") Long taskPartitionDictId, @Param("patientId") Long patientId, @Param("portraitStatus") String portraitStatus); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java index a4741d81..cab36302 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldcontent/impl/LabelFieldContentServiceImpl.java @@ -36,10 +36,7 @@ import javax.annotation.Resource; import java.lang.reflect.Field; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Objects; +import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -229,14 +226,44 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { string.add(paramKey); } //根据patientId查询是否有已经维护的参数、有维护数据返回已维护数据、没有维护数据查询视图数据 - List labelFieldContents = labelFieldContentMapper.labelFieldAndPartitionDict(taskPartitionDictId, patientId, null); - if (CollectionUtils.isNotEmpty(labelFieldContents)) { - return labelFieldContents; + List groupingValues; + groupingValues = labelFieldContentMapper.labelFieldAndPartitionDict(taskPartitionDictId, patientId, null); + if (CollectionUtils.isNotEmpty(groupingValues)) { + for (GroupingValue groupingValue : groupingValues) { + groupingValue.setPatientId(patientId); + List collect = string.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).collect(Collectors.toList()); + //判断星标 + if (CollectionUtils.isNotEmpty(collect)) { + groupingValue.setSign(1); + } else { + groupingValue.setSign(0); + } + } + //组装数据 + List taskPartitionDictIds = groupingValues.stream().filter(Objects::nonNull).map(LabelFieldInfo::getTaskPartitionDictId).filter(Objects::nonNull).distinct().collect(Collectors.toList()); + List labelFieldAndPartitionDictList = new ArrayList<>(); + for (Long aLong : taskPartitionDictIds) { + List PortraitSnVOS = new ArrayList<>(); + LabelFieldAndPartitionDict labelFieldAndPartitionDict = new LabelFieldAndPartitionDict(); + List collect = groupingValues.stream().filter(Objects::nonNull).filter(item -> aLong.equals(item.getTaskPartitionDictId())).collect(Collectors.toList()); + Map> collect1 = collect.stream().filter(Objects::nonNull).collect(Collectors.groupingBy(GroupingValue::getPortraitSn)); + collect1.forEach((Key, value) -> { + PortraitSnVO portraitSnVO = new PortraitSnVO(); + portraitSnVO.setPortraitSn(Key); + portraitSnVO.setGroupingValues(value); + PortraitSnVOS.add(portraitSnVO); + }); + labelFieldAndPartitionDict.setTaskPartitionDictId(aLong); + labelFieldAndPartitionDict.setTaskPartitionDictName(collect.get(0).getTaskPartitionDictName()); + labelFieldAndPartitionDict.setPortraitSnVOList(PortraitSnVOS); + labelFieldAndPartitionDictList.add(labelFieldAndPartitionDict); + } + return labelFieldAndPartitionDictList; } //查询未维护标签及从患者表取值，患者视图无值返回分组，有值根据属性名遍历塞入 - List labelFieldContentList = labelFieldInfoMapper.selectLabelFieldInfoByTaskPartitionDictId(taskPartitionDictId); + groupingValues = labelFieldInfoMapper.selectLabelFieldInfoByTaskPartitionDictId(taskPartitionDictId); JSONObject paramsValue = getParamsValue(patientId); - if (CollectionUtils.isEmpty(labelFieldContentList)) { + if (CollectionUtils.isEmpty(groupingValues)) { return new ArrayList<>(); } //取患者表视图属性名 @@ -248,25 +275,27 @@ public class LabelFieldContentServiceImpl implements ILabelFieldContentService { } //遍历分组，根据属性名塞入视图值 List asListStrings = Arrays.asList(strings); - for (GroupingValue groupingValue : labelFieldContentList) { + for (GroupingValue groupingValue : groupingValues) { groupingValue.setPatientId(patientId); String s = asListStrings.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).findFirst().orElse(new String()); List collect = string.stream().filter(Objects::nonNull).filter(item -> item.equals(groupingValue.getFieldCode())).collect(Collectors.toList()); + //判断星标 if (CollectionUtils.isNotEmpty(collect)) { groupingValue.setSign(1); } else { groupingValue.setSign(0); } + //塞入视图数据 groupingValue.setFieldValue(paramsValue.getOrDefault(s, "").toString()); } //遍历任务细分id组装数据 - List collect = labelFieldContentList.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskPartitionDictId())).map(LabelFieldInfo::getTaskPartitionDictId).distinct().collect(Collectors.toList()); + List collect = groupingValues.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskPartitionDictId())).map(LabelFieldInfo::getTaskPartitionDictId).distinct().collect(Collectors.toList()); List labelFieldAndPartitionDictList = new ArrayList<>(); for (Long aLong : collect) { List PortraitSnVOS = new ArrayList<>(); LabelFieldAndPartitionDict labelFieldAndPartitionDict = new LabelFieldAndPartitionDict(); PortraitSnVO portraitSnVO = new PortraitSnVO(); - List collect1 = labelFieldContentList.stream().filter(Objects::nonNull).filter(item -> aLong.equals(item.getTaskPartitionDictId())).collect(Collectors.toList()); + List collect1 = groupingValues.stream().filter(Objects::nonNull).filter(item -> aLong.equals(item.getTaskPartitionDictId())).collect(Collectors.toList()); portraitSnVO.setGroupingValues(collect1); PortraitSnVOS.add(portraitSnVO); labelFieldAndPartitionDict.setTaskPartitionDictId(aLong); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyTreeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyTreeVO.java index 755186af..0f6e570b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyTreeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyTreeVO.java @@ -9,7 +9,7 @@ import java.util.stream.Collectors; /** * 机构树图信息对象vo agency * - * @author xinelu + * @author zh * @date 2024-02-26 */ public class AgencyTreeVO implements Serializable { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java index 906c719b..d5fd9c47 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java @@ -10,7 +10,7 @@ import java.util.List; /** * 机构树图信息对象vo agency * - * @author xinelu + * @author zh * @date 2024-02-26 */ diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java index 9cec0bf0..9aff6ce0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/HospitalVO.java @@ -6,6 +6,12 @@ import lombok.Data; import java.util.List; +/** + * 医院科室联动vo agency + * + * @author zh + * @date 2024-02-26 + */ @Data public class HospitalVO { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java index e871080b..8acf71b6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryTreeVO.java @@ -6,6 +6,12 @@ import java.io.Serializable; import java.util.List; import java.util.stream.Collectors; +/** + * 机构类型树图信息对象vo agency + * + * @author zh + * @date 2024-02-27 + */ public class AgencyCategoryTreeVO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java index 67bf5231..4baa20da 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agencycategory/AgencyCategoryVO.java @@ -7,6 +7,12 @@ import lombok.EqualsAndHashCode; import java.util.ArrayList; import java.util.List; +/** + * 机构类型树图信息对象vo agency + * + * @author zh + * @date 2024-02-27 + */ @EqualsAndHashCode(callSuper = true) @Data public class AgencyCategoryVO extends AgencyCategory { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java index c51758c7..37c5edfd 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/GroupingValue.java @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; /** * 标签字段内容信息对象 * - * @author xinelu + * @author zh * @date 2024-03-11 */ @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java index f0294b8e..f201832e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelField.java @@ -4,9 +4,11 @@ import lombok.Data; import java.util.List; - /** * 画像编辑传值反值 + * + * @author zh + * @date 2024-06-15 */ @Data public class LabelField { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldAndPartitionDict.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldAndPartitionDict.java index 88fc6953..79fdc4d1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldAndPartitionDict.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldAndPartitionDict.java @@ -5,6 +5,12 @@ import lombok.Data; import java.util.List; +/** + * 画像编辑传值反值 + * + * @author zh + * @date 2024-06-15 + */ @Data public class LabelFieldAndPartitionDict { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldContentVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldContentVO.java index e7c7e8b7..b1159fa3 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldContentVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/LabelFieldContentVO.java @@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode; /** * 标签字段内容信息对象 label_field_content * - * @author xinelu - * @date 2024-03-11 + * @author zh + * @date 2024-04-1 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/PortraitSnVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/PortraitSnVO.java index 888bf978..2c61decf 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/PortraitSnVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldcontent/PortraitSnVO.java @@ -4,6 +4,12 @@ import lombok.Data; import java.util.List; +/** + * 画像编辑传值反值 + * + * @author zh + * @date 2024-07-01 + */ @Data public class PortraitSnVO { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldTreeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldTreeVO.java index 31737660..29f7464b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldTreeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldTreeVO.java @@ -10,7 +10,7 @@ import java.util.stream.Collectors; /** * 画像树图信息对象vo * - * @author xinelu + * @author zh * @date 2024-06-27 */ @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldVO.java index 33f74538..f555f3df 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/labelfieldinfo/LabelFieldVO.java @@ -10,8 +10,8 @@ import java.util.List; /** * 标签字段信息对象 label_field_info * - * @author xinelu - * @date 2024-03-11 + * @author zh + * @date 2024-04-01 */ @Data @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultVO.java index 8d21c9fa..e1f29416 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubjectresult/PatientQuestionSubjectResultVO.java @@ -10,7 +10,7 @@ import java.util.List; /** * 患者问卷题目提交结果信息对象 patient_question_subject_result * - * @author xinelu + * @author zh * @date 2024-03-28 */ @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java index 915b170c..43a557cb 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patientquestionsubmitresult/PatientQuestionSubmitResultVO.java @@ -10,7 +10,7 @@ import java.util.List; /** * 患者问卷提交结果信息对象 patient_question_submit_result * - * @author xinelu + * @author zh * @date 2024-03-28 */ @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java index ec22d51d..db5a43e2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/patienttaskexecuterecord/PatientTaskExecuteRecordVO.java @@ -15,7 +15,7 @@ import org.springframework.format.annotation.DateTimeFormat; /** * 患者管理任务执行记录对象 patient_task_execute_record * - * @author xinelu + * @author zh * @date 2024-03-25 */ @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionInfo/QuestionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionInfo/QuestionVO.java index 92c32360..78d202c1 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionInfo/QuestionVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionInfo/QuestionVO.java @@ -1,6 +1,5 @@ package com.xinelu.manage.vo.questionInfo; - import com.xinelu.manage.domain.questioninfo.QuestionInfo; import com.xinelu.manage.vo.questionsubject.QuestionSubjectVO; import lombok.Data; @@ -11,7 +10,7 @@ import java.util.List; /** * 问卷基本信息VO * - * @author xinelu + * @author zh * @date 2024-02-28 */ @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubject/QuestionSubjectVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubject/QuestionSubjectVO.java index 9ddc0f46..16df91b6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubject/QuestionSubjectVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubject/QuestionSubjectVO.java @@ -10,7 +10,7 @@ import java.util.List; /** * 问卷题目信息对象 question_subject * - * @author xinelu + * @author zh * @date 2024-02-29 */ @EqualsAndHashCode(callSuper = true) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java index c168b622..167bae7c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/questionsubjectoption/QuestionSubjectOptionVO.java @@ -9,7 +9,7 @@ import java.math.BigDecimal; /** * 问卷题目选项答案对象 question_subject_option * - * @author xinelu + * @author zh * @date 2024-02-29 */ @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Edge.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Edge.java index 837e53e2..5c663ba5 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Edge.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Edge.java @@ -4,6 +4,9 @@ import lombok.Data; /** * 话术信息分支表VO + * + * @author zh + * @date 2024-06-13 */ @Data public class Edge { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Node.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Node.java index e733c00c..14f32685 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Node.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/scriptInfo/Node.java @@ -4,6 +4,12 @@ import com.xinelu.manage.domain.scriptinfonode.ScriptInfoNode; import lombok.Data; import lombok.EqualsAndHashCode; +/** + * 话术信息分支表VO + * + * @author zh + * @date 2024-06-13 + */ @EqualsAndHashCode(callSuper = true) @Data public class Node extends ScriptInfoNode { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java index 71a1e8c8..a010cf0e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroute/PhonePush.java @@ -3,6 +3,12 @@ package com.xinelu.manage.vo.signpatientmanageroute; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +/** + * 话术类型代办处理详情返回VO + * + * @author zh + * @date 2024-06-12 + */ @Data public class PhonePush { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signroutetriggercondition/SignRouteTriggerConditionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signroutetriggercondition/SignRouteTriggerConditionVO.java index 2b0af62a..efc438f2 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signroutetriggercondition/SignRouteTriggerConditionVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signroutetriggercondition/SignRouteTriggerConditionVO.java @@ -7,7 +7,7 @@ import lombok.EqualsAndHashCode; /** * 签约患者管理任务（路径）触发条件关系对象 sign_route_trigger_condition * - * @author haown + * @author zh * @date 2024-03-18 */ @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java index b12537b1..27c707fe 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasenode/SpecialDiseaseNodeVO.java @@ -8,8 +8,8 @@ import lombok.EqualsAndHashCode; /** * 专病路径-管理节点信息对象 special_disease_node * - * @author xinelu - * @date 2024-03-13 + * @author zh + * @date 2024-03-29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java index d1b7b6c4..eafc186e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroute/SpecialDiseaseRouteVO.java @@ -12,8 +12,8 @@ import java.util.List; /** * 专病路径信息对象 special_disease_route * - * @author xinelu - * @date 2024-03-13 + * @author zh + * @date 2024-03-29 */ @EqualsAndHashCode(callSuper = true) @Data @@ -49,5 +49,8 @@ public class SpecialDiseaseRouteVO extends SpecialDiseaseRoute { */ List triggerConditionList; + /** + * 服务包集合 + */ List routePackageList; } \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroutepackage/SpecialDiseaseRoutePackageVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroutepackage/SpecialDiseaseRoutePackageVO.java index f56c93f3..489fa96b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroutepackage/SpecialDiseaseRoutePackageVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseaseroutepackage/SpecialDiseaseRoutePackageVO.java @@ -7,12 +7,15 @@ import lombok.EqualsAndHashCode; /** * 专病路径-服务包关系（多对多关系）对象 special_disease_route_package * - * @author xinelu + * @author zh * @date 2024-04-09 */ @Data @EqualsAndHashCode(callSuper = true) public class SpecialDiseaseRoutePackageVO extends SpecialDiseaseRoutePackage { + /** + * 专病路径-服务包关系id + */ private Long specialDiseaseRoutePackageId; } \ No newline at end of file diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java index 5ad22c33..381c4321 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/specialdiseasetriggercondition/TriggerConditionVO.java @@ -7,8 +7,8 @@ import lombok.EqualsAndHashCode; /** * 触发条件关系DTO * - * @author xinelu - * @date 2024-03-18 + * @author zh + * @date 2024-03-29 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java index 6c40c4b3..4a139f22 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/sysarea/SysAreaVO.java @@ -5,9 +5,10 @@ import lombok.Data; import java.io.Serializable; /** - * @author ljh - * @version 1.0 - * Create by 2022/9/20 17:58 + * 区域信息VO + * + * @author zh + * @date 2024-03-29 */ @Data public class SysAreaVO implements Serializable { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java index 150d5c9d..51a86d19 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/tasktypedict/TaskTypeDictVO.java @@ -9,8 +9,8 @@ import java.util.List; /** * 任务类型字典对象 task_type_dict * - * @author xinelu - * @date 2024-03-11 + * @author ZH + * @date 2024-07-03 */ @Data public class TaskTypeDictVO { @@ -26,5 +26,8 @@ public class TaskTypeDictVO { @ApiModelProperty(value = "任务类型名称") private String taskTypeName; + /** + * 细分集合 + */ private List taskPartitionDictList; } diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankTreeVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankTreeVO.java index 3856899f..3c249fc4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankTreeVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankTreeVO.java @@ -10,8 +10,8 @@ import java.util.stream.Collectors; /** * 知识库树图信息对象vo * - * @author xinelu - * @date 2024-02-26 + * @author zh + * @date 2024-06-13 */ @Data public class TermBankTreeVO implements Serializable { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankVO.java index 4f479877..9f4ece2e 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankVO.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/termbank/TermBankVO.java @@ -8,17 +8,23 @@ import java.util.ArrayList; import java.util.List; /** - * 常用术语(知识库)对象 term_bank + * 常用术语(知识库)树图对象 term_bank * * @author xinelu - * @date 2024-06-07 + * @date 2024-06-11 */ @EqualsAndHashCode(callSuper = true) @Data public class TermBankVO extends TermBank { + /** + * 标识 + */ private String value; + /** + * 子集合 + */ private List children = new ArrayList(); public List getChildren() { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml index fe42caa2..18eb30fb 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/labelfieldcontent/LabelFieldContentMapper.xml @@ -325,7 +325,7 @@ where content.patient_id = #{patientId} and content.portrait_status='INUSE' - select lfi.id labelFieldInfoId, lfi.field_name, diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java index e4abca75..b3b4cfd4 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/controller/homepage/HomePageController.java @@ -17,7 +17,7 @@ import java.util.Objects; /** * 小程序首页Controller * - * @author xinelu + * @author zh * @date 2024-04-18 */ @RestController diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/homepage/HomePageMapper.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/homepage/HomePageMapper.java index 28063a5a..4d068de6 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/homepage/HomePageMapper.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/mapper/homepage/HomePageMapper.java @@ -14,7 +14,6 @@ import java.util.List; * @Description 院后小程序首页Mapper层 * @Author zh * @Date 2024-04-18 - * @Version 1.0 */ public interface HomePageMapper { diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java index 838c5772..e02d5196 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/HomePageService.java @@ -10,6 +10,12 @@ import com.xinelu.mobile.vo.myfollowup.MyFollowUpVO; import java.util.List; +/** + * 小程序首页Service + * + * @author zh + * @date 2024-04-18 + */ public interface HomePageService { /** diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java index bf35d44e..9fc1fd61 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/service/homepage/Impl/HomePageServiceImpl.java @@ -52,6 +52,12 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +/** + * 小程序首页ServiceImpl + * + * @author zh + * @date 2024-04-18 + */ @Service @Slf4j public class HomePageServiceImpl implements HomePageService { @@ -61,8 +67,6 @@ public class HomePageServiceImpl implements HomePageService { @Resource private PageServiceUtil pageServiceUtil; @Resource - private ScriptInfoMapper scriptInfoMapper; - @Resource private QuestionInfoMapper questionInfoMapper; @Resource private QuestionSubjectMapper questionSubjectMapper; diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageContentVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageContentVO.java index a3cc4f24..c7930dd3 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageContentVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageContentVO.java @@ -6,6 +6,9 @@ import lombok.Data; /** * 消息内容返回实体类 + * + * @Author zh + * @Date 2024-07-8 */ @Data public class MessageContentVO { diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java index 273107d7..fac07cbe 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/homepage/MessageTabulationVO.java @@ -4,6 +4,9 @@ import lombok.Data; /** * 消息列表返回VO + * + * @Author zh + * @Date 2024-07-8 */ @Data public class MessageTabulationVO { diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java index b7671386..55ef0919 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/myfollowup/MyFollowUpVO.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * 我的随访对象vo * - * @author xinelu + * @author zh * @date 2024-04-18 */ @Data diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java index 266e4fd6..0eab78e2 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/satisfactionquestionnaire/SatisfactionQuestionnaire.java @@ -5,6 +5,12 @@ import lombok.Data; import java.time.LocalDateTime; +/** + * 居民满意度vo + * + * @author zh + * @date 2024-04-18 + */ @Data public class SatisfactionQuestionnaire { @@ -24,10 +30,13 @@ public class SatisfactionQuestionnaire { */ private Long templateId; + /** + * 是否参加满意度 completed：完成；incomplete：未完成； + */ private String sign; /*** - * + * 患者问卷id */ private Long patientQuestionSubmitResultId; } \ No newline at end of file diff --git a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java index a8774da3..b5df079a 100644 --- a/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java +++ b/postdischarge-mobile/src/main/java/com/xinelu/mobile/vo/wechatofficialaccountcallback/PatientVO.java @@ -5,6 +5,13 @@ import lombok.Data; import java.time.LocalDate; +/** + * 居民信息vo + * + * @author zh + * @date 2024-04-18 + */ + @Data public class PatientVO { diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java index 0904226d..959f347c 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/controller/MessageSubscriptionController.java @@ -10,7 +10,7 @@ import javax.annotation.Resource; /** * 消息推送 * - * @author xinelu + * @author zh */ @RestController @RequestMapping("/monitor/messageSubscription") diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java index 74affbc4..d5c41770 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java @@ -19,6 +19,11 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +/** + * @Description 消息推送定时任务业务层 + * @Author zh + * @Date 2024-05-24 + */ @Service @Slf4j public class subscribeTaskServiceImpl implements SubscribeTaskService { From 03d6598c9313b47a5fd7b43efa2087d2042cfaf2 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 16 Jul 2024 13:51:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=9D=E6=9C=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scriptInfo/impl/ScriptInfoServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java index fa182306..a8a1f0a0 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/scriptInfo/impl/ScriptInfoServiceImpl.java @@ -244,13 +244,15 @@ public class ScriptInfoServiceImpl implements IScriptInfoService { int i = 0; for (Node node : scriptVO.getNodes()) { node.setScriptInfoId(scriptVO.getScriptInfoId()); - String[] split = node.getLabel().split("\\n"); - int i1 = node.getLabel().indexOf("\n"); - if (split.length > 0) { - node.setScriptNodeName(split[0]); - } - if (split.length > 1) { - node.setScriptContent(node.getLabel().substring(i1 + 1)); + if (Objects.nonNull(node.getLabel())){ + String[] split = node.getLabel().split("\\n"); + int i1 = node.getLabel().indexOf("\n"); + if (split.length > 0) { + node.setScriptNodeName(split[0]); + } + if (split.length > 1) { + node.setScriptContent(node.getLabel().substring(i1 + 1)); + } } node.setScriptNodeType(node.getType()); node.setCreateBy(SecurityUtils.getUsername());