diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java index 8fcd84b4..29871afa 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/aiob/impl/AIOBServiceImpl.java @@ -628,6 +628,8 @@ public class AIOBServiceImpl implements IAIOBService { patientQuestionOptionResults.add(patientQuestionOptionResult); }); //判断问卷 满意项与异常项 + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); if (CollectionUtils.isNotEmpty(patientQuestionOptionResults)) { List remarkableFlag = patientQuestionOptionResults.stream().filter(Objects::nonNull).filter(item -> org.apache.commons.lang3.StringUtils.isNotBlank(item.getRemarkableFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(remarkableFlag)) { @@ -639,7 +641,6 @@ public class AIOBServiceImpl implements IAIOBService { } } questionSubmitResultMapper.updatePatientQuestionSubmitResult(patientQuestionSubmitResult); - patientQuestionOptionResultMapper.saveQuestionOptionList(patientQuestionOptionResults); totalScore[0] = totalScore[0].add(questionSubjectVO.getQuestionScore() == null ? BigDecimal.ZERO : questionSubjectVO.getQuestionScore()); } else { 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 2a61adf5..2652da82 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 @@ -51,13 +51,13 @@ public class PatientQuestionSubmitResultVO { * 冗余:整个问卷中是否包含不满意项;DISCONTENTED:不满意;CONTENTED:满意;默认CONTENTED; * 2024/12/2 */ - private String contentedFlag; + private String submitContentedFlag; /** * 冗余:整个问卷中是否包含异常项;REMARKABLE:异常的;ROUTINE:正常的;默认ROUTINE * 2024/12/2 */ - private String remarkableFlag; + private String submitRemarkableFlag; List subjectResultList; diff --git a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml index 74355225..f4ac8436 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/patientquestionsubmitresult/PatientQuestionSubmitResultMapper.xml @@ -41,8 +41,8 @@ - - + + @@ -417,8 +417,8 @@ pqsm.questionnaire_description, pqsm.questionnaire_total_score, pqsm.total_score, - pqsm.contented_flag, - pqsm.remarkable_flag, + pqsm.contented_flag submitContentedFlag, + pqsm.remarkable_flag submitRemarkableFlag, pqsj.id subjectResult, pqsj.question_submit_result_id, pqsj.question_info_id, 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 aa1ca391..74fd7435 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 @@ -4,11 +4,7 @@ import com.alibaba.fastjson2.JSONObject; import com.xinelu.common.constant.TaskStatisticsTypeConstants; import com.xinelu.common.core.domain.AjaxResult; import com.xinelu.common.core.page.TableDataInfo; -import com.xinelu.common.enums.NodeExecuteStatusEnum; -import com.xinelu.common.enums.QuestionTypeEnum; -import com.xinelu.common.enums.QuestionnaireStatusEnum; -import com.xinelu.common.enums.RouteNodeNameEnum; -import com.xinelu.common.enums.TaskContentEnum; +import com.xinelu.common.enums.*; import com.xinelu.common.exception.ServiceException; import com.xinelu.common.utils.PageServiceUtil; import com.xinelu.common.utils.bean.BeanUtils; @@ -59,12 +55,6 @@ import java.util.Comparator; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -import javax.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; /** * 小程序首页ServiceImpl @@ -223,6 +213,20 @@ public class HomePageServiceImpl implements HomePageService { patientQuestionSubmitResult.setManageRouteId(patientTaskExecuteRecord.getManageRouteId()); patientQuestionSubmitResult.setManageRouteName(patientTaskExecuteRecord.getManageRouteName()); patientQuestionSubmitResult.setCreateTime(time); + List patientQuestionOptionResultsFlag = new ArrayList<>(); + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.ROUTINE.getInfo()); + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.CONTENTED.getInfo()); + dto.getSubjectResultDTOList().forEach(item -> patientQuestionOptionResultsFlag.addAll(item.getOptionResultList())); + if (CollectionUtils.isNotEmpty(patientQuestionOptionResultsFlag)) { + List remarkableFlag = patientQuestionOptionResultsFlag.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getRemarkableFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(remarkableFlag)) { + patientQuestionSubmitResult.setRemarkableFlag(ContentedAndRemarkableFlagEnum.REMARKABLE.getInfo()); + } + List contentedFlag = patientQuestionOptionResultsFlag.stream().filter(Objects::nonNull).filter(item -> StringUtils.isNotBlank(item.getContentedFlag()) && Objects.nonNull(item.getOptionChooseSign()) && item.getOptionChooseSign().equals(0) && ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo().equals(item.getRemarkableFlag())).collect(Collectors.toList()); + if (CollectionUtils.isNotEmpty(contentedFlag)) { + patientQuestionSubmitResult.setContentedFlag(ContentedAndRemarkableFlagEnum.DISCONTENTED.getInfo()); + } + } // 新增患者问卷提交结果 if (patientQuestionSubmitResultMapper.insertPatientQuestionSubmitResult(patientQuestionSubmitResult) <= 0) { log.info("新增任务记录表失败"); @@ -239,6 +243,7 @@ public class HomePageServiceImpl implements HomePageService { BeanUtils.copyBeanProp(saveQuestionSubject, questionSubjectResult); saveQuestionSubject.setQuestionSubmitResultId(patientQuestionSubmitResult.getId()); saveQuestionSubject.setCreateTime(time); + saveQuestionSubject.setQuestionSubjectId(questionSubjectResult.getId()); patientQuestionSubjectResults.add(saveQuestionSubject); if (CollectionUtils.isNotEmpty(questionSubjectResult.getOptionResultList())) { patientQuestionOptionResults.addAll(questionSubjectResult.getOptionResultList()); @@ -261,6 +266,7 @@ public class HomePageServiceImpl implements HomePageService { PatientQuestionSubjectResult patientQuestionSubjectResult = patientQuestionSubjectResults.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getQuestionNumber()) && patientQuestionOptionResult.getQuestionNumber().compareTo(item.getQuestionNumber()) == 0).findFirst().orElse(new PatientQuestionSubjectResult()); saveQuestionOption.setQuestionSubjectResultId(patientQuestionSubjectResult.getId()); saveQuestionOption.setCreateTime(time); + saveQuestionOption.setQuestionSubjectOptionId(patientQuestionOptionResult.getId()); saveQuestionSubjectOptions.add(saveQuestionOption); } // 新增患者问卷题目选项提交结果