From 7dbf152a623ee5cef37aa090f30013e0b3e22429 Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 9 Jul 2024 16:04:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88?= =?UTF-8?q?=E6=81=AF=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/service/homepage/Impl/HomePageServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 11912004..c7019ea4 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 @@ -312,8 +312,9 @@ public class HomePageServiceImpl implements HomePageService { //查询问卷 QuestionInfo questionInfo = questionInfoMapper.selectQuestionInfoById(signPatientManageRouteNode.getQuestionInfoId()); // 查询题目表 + QuestionVO questionVO = new QuestionVO(); if (Objects.nonNull(questionInfo)) { - BeanUtils.copyBeanProp(messageContentVO.getQuestion(), questionInfo); + BeanUtils.copyBeanProp(questionVO, questionInfo); List questionSubjects = questionSubjectMapper.selectQuestionSubjectBy(signPatientManageRouteNode.getQuestionInfoId()); if (CollectionUtils.isNotEmpty(questionSubjects)) { List questionSubjectIds = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getId())).map(QuestionSubject::getId).collect(Collectors.toList()); @@ -323,7 +324,8 @@ public class HomePageServiceImpl implements HomePageService { List collect = questionSubjectOptions.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionnaireSubjectId()) && questionSubject.getId().equals(item.getQuestionnaireSubjectId())).collect(Collectors.toList()); questionSubject.setQuestionSubjectOptionList(collect); } - messageContentVO.getQuestion().setQuestionSubjectList(questionSubjects); + questionVO.setQuestionSubjectList(questionSubjects); + messageContentVO.setQuestion(questionVO); } } } @@ -335,7 +337,7 @@ public class HomePageServiceImpl implements HomePageService { messageContentVO.setPropagandaContent(JSONObject.parseObject(JSONObject.toJSONString(propagandaMaterialsVo))); } //副文本塞值 - if (!TaskContentEnum.PROPAGANDA_ARTICLE.getInfo().equals(signPatientManageRouteNode.getTaskType()) || !TaskContentEnum.QUESTIONNAIRE_SCALE.getInfo().equals(signPatientManageRouteNode.getTaskType()) || !TaskContentEnum.ARTIFICIAL_FOLLOW_UP.getInfo().equals(signPatientManageRouteNode.getTaskType())) { + if (!TaskContentEnum.PROPAGANDA_ARTICLE.getInfo().equals(signPatientManageRouteNode.getTaskType()) && !TaskContentEnum.QUESTIONNAIRE_SCALE.getInfo().equals(signPatientManageRouteNode.getTaskType()) && !TaskContentEnum.ARTIFICIAL_FOLLOW_UP.getInfo().equals(signPatientManageRouteNode.getTaskType())) { messageContentVO.setTaskType(TaskContentEnum.TEXT_REMIND.getInfo()); messageContentVO.setNodeContent(signPatientManageRouteNode.getNodeContent()); } From f959cbc0a095dd3c86a1513b327931ca4ca996cb Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Tue, 9 Jul 2024 16:05:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=9F=A5?= =?UTF-8?q?=E8=AF=86=E5=BA=93=E6=97=A0=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../labelfieldinfo/LabelFieldInfoController.java | 3 +++ .../impl/LabelFieldInfoServiceImpl.java | 11 +++++++++++ .../manage/wechattemplate/WechatTemplateMapper.xml | 10 +++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java index 404b88b2..4da42b40 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java @@ -116,6 +116,9 @@ public class LabelFieldInfoController extends BaseController { return toAjax(labelFieldInfoService.deleteLabelFieldInfoByIds(ids)); } + /** + * 任务类型分组 + */ @GetMapping("/taskTypeGrouping") public AjaxResult taskTypeGrouping() { return labelFieldInfoService.taskTypeGrouping(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java index b60813be..af02220b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java @@ -181,14 +181,25 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService { return 1; } + /** + * 查询字段信息 + * + * @return AjaxResult + */ @Override public AjaxResult taskTypeGrouping() { + //查询任务类型 List taskTypeDictList = taskTypeDictMapper.selectTaskTypeDicts(); List ids = taskTypeDictList.stream().filter(Objects::nonNull).map(TaskTypeDictVO::getTaskTypeId).filter(Objects::nonNull).collect(Collectors.toList()); + //查询细分类型 + if (CollectionUtils.isEmpty(taskTypeDictList)) { + return AjaxResult.success(taskTypeDictList); + } List taskPartitionDicts = taskPartitionDictMapper.selectTaskPartitionList(ids); if (CollectionUtils.isEmpty(taskPartitionDicts)) { return AjaxResult.success(taskPartitionDicts); } + //组装 for (TaskTypeDictVO taskTypeDictVO : taskTypeDictList) { List collect = taskPartitionDicts.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskTypeId()) && taskTypeDictVO.getTaskTypeId().equals(item.getTaskTypeId())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(collect)) { diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml index 743a29b2..6cdc913d 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml @@ -125,14 +125,14 @@ wt.template_sort, wt.template_remark, wtst.id AS taskId, - GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName + GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName from wechat_template wt left join wechat_template_suit_task wtst on wt.id = wtst.wechat_template_id left join department d on d.id = wt.department_id - - and d.hospital_agency_id = #{hospitalAgencyId} - + + and d.hospital_agency_id = #{hospitalAgencyId} + and wt.department_id = #{departmentId} @@ -156,7 +156,7 @@ ${params.dataScope} - group by wt.id order by wt.create_time DESC,wtst.create_time DESC + group by wt.id,wtst.id order by wt.create_time DESC,wtst.create_time DESC