From eb277f29d643719c16430371cfd7ed28ed72e15b Mon Sep 17 00:00:00 2001 From: zhangheng <3226558941@qq.com> Date: Mon, 2 Dec 2024 17:56:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enums/ContentedAndRemarkableFlagEnum.java | 38 +++++++++++++++++++ .../PatientQuestionOptionResult.java | 17 +++++++++ .../PatientQuestionSubjectResult.java | 5 +++ .../PatientQuestionSubmitResult.java | 12 ++++++ .../QuestionSubjectOption.java | 12 ++++++ .../impl/PatientInfoServiceImpl.java | 4 +- .../impl/QuestionInfoServiceImpl.java | 7 ++++ .../SignPatientManageRouteServiceImpl.java | 26 ++++++------- .../manage/department/DepartmentMapper.xml | 1 + .../QuestionSubjectOptionMapper.xml | 38 +++++++++++++++++-- 10 files changed, 142 insertions(+), 18 deletions(-) create mode 100644 postdischarge-common/src/main/java/com/xinelu/common/enums/ContentedAndRemarkableFlagEnum.java diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/ContentedAndRemarkableFlagEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/ContentedAndRemarkableFlagEnum.java new file mode 100644 index 00000000..7ff78a47 --- /dev/null +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/ContentedAndRemarkableFlagEnum.java @@ -0,0 +1,38 @@ +package com.xinelu.common.enums; + +import lombok.Getter; + +/** + * @Description 问卷中是否包含不满意项 整个问卷中是否包含异常项 + * @Author zh + * @Date 2024-03-19 + */ +@Getter +public enum ContentedAndRemarkableFlagEnum { + /** + * 不满意 + */ + DISCONTENTED("DISCONTENTED"), + + /** + * 满意 + */ + CONTENTED("CONTENTED"), + + /** + * 异常的 + */ + REMARKABLE("REMARKABLE"), + + /** + * 正常的 + */ + ROUTINE("ROUTINE"), + ; + + final private String info; + + ContentedAndRemarkableFlagEnum(String info) { + this.info = info; + } +} diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java index d56413ea..a699e6d6 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionoptionresult/PatientQuestionOptionResult.java @@ -102,6 +102,23 @@ public class PatientQuestionOptionResult extends BaseEntity { @Excel(name = "选项备注") private String optionRemark; + /** + * 冗余:整个问卷中是否包含不满意项;DISCONTENTED:不满意;CONTENTED:满意;默认CONTENTED; + * 2024/12/2 + */ + private String contentedFlag; + + /** + * 冗余:整个问卷中是否包含异常项;REMARKABLE:异常的;ROUTINE:正常的;默认ROUTINE + * 2024/12/2 + */ + private String remarkableFlag; + + /** + * 问卷题目选项表的ID + * 2024/12/2 + */ + private String questionSubjectOptionId; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java index 46f7429a..a8ee2b6c 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubjectresult/PatientQuestionSubjectResult.java @@ -139,6 +139,11 @@ public class PatientQuestionSubjectResult extends BaseEntity { @Excel(name = "题目备注") private String questionRemark; + /** + * 问卷题目选项表的ID + * 2024/12/2 + */ + private String questionSubjectOptionId; @Override public String toString() { diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java index 6b69296f..04f90ead 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/patientquestionsubmitresult/PatientQuestionSubmitResult.java @@ -168,6 +168,18 @@ public class PatientQuestionSubmitResult extends BaseEntity { private Long residentId; + /** + * 冗余:整个问卷中是否包含不满意项;DISCONTENTED:不满意;CONTENTED:满意;默认CONTENTED; + * 2024/12/2 + */ + private String contentedFlag; + + /** + * 冗余:整个问卷中是否包含异常项;REMARKABLE:异常的;ROUTINE:正常的;默认ROUTINE + * 2024/12/2 + */ + private String remarkableFlag; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java index 958cf066..b341c6d4 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/domain/questionsubjectoption/QuestionSubjectOption.java @@ -91,6 +91,18 @@ public class QuestionSubjectOption extends BaseEntity { */ private String intent; + /** + * 冗余:整个问卷中是否包含不满意项;DISCONTENTED:不满意;CONTENTED:满意;默认CONTENTED; + * 2024/12/2 + */ + private String contentedFlag; + + /** + * 冗余:整个问卷中是否包含异常项;REMARKABLE:异常的;ROUTINE:正常的;默认ROUTINE + * 2024/12/2 + */ + private String remarkableFlag; + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java index 431c43ad..1a50460b 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/patientinfo/impl/PatientInfoServiceImpl.java @@ -406,7 +406,9 @@ public class PatientInfoServiceImpl implements IPatientInfoService { //组装返回数据 List patientInfoImports = new ArrayList<>(patientInfoImportList); patientInfoImportVO.setSn(sn); - patientInfoImportVO.setDepartments(departmentList); + if (CollectionUtils.isNotEmpty(departmentList) && departmentList.size() > 0) { + patientInfoImportVO.setDepartments(departmentList); + } if (CollectionUtils.isNotEmpty(deptAliasVOS)) { deptAliasVOS = deptAliasVOS.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getDeptAlias())).distinct().collect(Collectors.toList()); patientInfoImportVO.setDeptAliasVOS(deptAliasVOS); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java index 8dc0ca27..6f178874 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/questioninfo/impl/QuestionInfoServiceImpl.java @@ -2,6 +2,7 @@ package com.xinelu.manage.service.questioninfo.impl; import com.xinelu.common.annotation.DataScope; import com.xinelu.common.core.domain.AjaxResult; +import com.xinelu.common.enums.ContentedAndRemarkableFlagEnum; import com.xinelu.common.enums.QuestionnaireStatusEnum; import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.bean.BeanUtils; @@ -150,6 +151,12 @@ public class QuestionInfoServiceImpl implements IQuestionInfoService { QuestionSubjectOption saveQuestionSubjectOption = new QuestionSubjectOption(); BeanUtils.copyBeanProp(saveQuestionSubjectOption, questionSubjectOption); QuestionSubject questionSubject = questionSubjects.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && questionSubjectOption.getQuestionNumber().compareTo(item.getQuestionNumber()) == 0).findFirst().orElse(new QuestionSubject()); + if (StringUtils.isBlank(questionSubjectOption.getContentedFlag())){ + saveQuestionSubjectOption.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); + } + if (StringUtils.isBlank(questionSubjectOption.getRemarkableFlag())){ + saveQuestionSubjectOption.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + } saveQuestionSubjectOption.setQuestionnaireSubjectId(questionSubject.getId()); saveQuestionSubjectOption.setCreateTime(LocalDateTime.now()); saveQuestionSubjectOption.setCreateBy(SecurityUtils.getUsername()); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java index 17d412a3..bdc78877 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroute/impl/SignPatientManageRouteServiceImpl.java @@ -16,19 +16,7 @@ import com.xinelu.common.constant.TaskNodeTypeConstants; import com.xinelu.common.constant.TaskStatisticsTypeConstants; import com.xinelu.common.constant.TemplateTypeConstants; import com.xinelu.common.core.domain.AjaxResult; -import com.xinelu.common.enums.ErrorStatusEnum; -import com.xinelu.common.enums.NodeExecuteResultStatusEnum; -import com.xinelu.common.enums.NodeExecuteStatusEnum; -import com.xinelu.common.enums.PhoneConnectStatusEnum; -import com.xinelu.common.enums.PhoneDialMethodEnum; -import com.xinelu.common.enums.PhoneMessageRemindEnum; -import com.xinelu.common.enums.PhoneRedialTimesEnum; -import com.xinelu.common.enums.RouteNodeNameEnum; -import com.xinelu.common.enums.ShortMessageTypeEnum; -import com.xinelu.common.enums.SmsErrorCodeEnum; -import com.xinelu.common.enums.TaskContentEnum; -import com.xinelu.common.enums.TaskCreateTypeEnum; -import com.xinelu.common.enums.TaskNodeTypeEnum; +import com.xinelu.common.enums.*; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.AgeUtil; import com.xinelu.common.utils.SecurityUtils; @@ -449,6 +437,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout patientQuestionSubmitResult.setCreateBy(routeHandlePerson); patientQuestionSubmitResult.setCreateTime(time); patientQuestionSubmitResult.setTaskExecuteRecordId(taskExecuteRecordId); + if (StringUtils.isBlank(dto.getContentedFlag())){ + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); + } + if (StringUtils.isBlank(dto.getRemarkableFlag())){ + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + } // 新增患者问卷提交结果 if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) { throw new ServiceException("新增患者问卷提交结果失败"); @@ -482,6 +476,12 @@ public class SignPatientManageRouteServiceImpl implements ISignPatientManageRout saveQuestionOption.setQuestionSubjectResultId(patientQuestionSubjectResult.getId()); saveQuestionOption.setCreateTime(time); saveQuestionOption.setCreateBy(routeHandlePerson); + if (StringUtils.isBlank(patientQuestionOptionResult.getContentedFlag())){ + saveQuestionOption.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); + } + if (StringUtils.isBlank(patientQuestionOptionResult.getRemarkableFlag())){ + saveQuestionOption.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + } saveQuestionSubjectOptions.add(saveQuestionOption); } // 新增患者问卷题目选项提交结果 diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml index db4ea03d..69e32485 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml @@ -633,6 +633,7 @@ FROM agency a LEFT JOIN department d ON a.id = d.hospital_agency_id where a.id = #{hospitalAgencyId} + and d.id is not null diff --git a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml index 6d57132c..c78d18a2 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/questionsubjectoption/QuestionSubjectOptionMapper.xml @@ -19,6 +19,8 @@ + + @@ -35,7 +37,9 @@ update_by, update_time, speech_context_text, - intent + intent, + contented_flag, + remarkable_flag from question_subject_option @@ -64,6 +68,12 @@ and option_remark = #{optionRemark} + + and contented_flag = #{contentedFlag} + + + and remarkable_flag = #{remarkableFlag} + @@ -103,6 +113,10 @@ intent, + contented_flag, + + remarkable_flag, + #{questionnaireSubjectId}, @@ -131,6 +145,10 @@ #{intent}, + #{contentedFlag}, + + #{remarkableFlag}, + @@ -176,6 +194,12 @@ intent = #{intent}, + contented_flag = + #{contentedFlag}, + + remarkable_flag = + #{remarkableFlag}, + where id = #{id} @@ -205,7 +229,9 @@ create_by, create_time, speech_context_text, - intent + intent, + contented_flag, + remarkable_flag ) values ( @@ -219,7 +245,9 @@ #{QuestionSubjectOption.createBy}, #{QuestionSubjectOption.createTime}, #{QuestionSubjectOption.speechContextText}, - #{QuestionSubjectOption.intent} + #{QuestionSubjectOption.intent}, + #{QuestionSubjectOption.contentedFlag}, + #{QuestionSubjectOption.remarkableFlag} ) @@ -239,7 +267,9 @@ update_by, update_time, speech_context_text, - intent + intent, + contented_flag, + remarkable_flag from question_subject_option