diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java index 50a2b64b..739a2865 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/statistics/impl/StatisticsServiceImpl.java @@ -330,9 +330,11 @@ public class StatisticsServiceImpl implements IStatisticsService { */ @Override public List questionnaireTaskOptionList(UploadRobotPublishRecordDto uploadRobotPublishRecordDto) { - // sql查询反馈意见使用 if (Objects.nonNull(uploadRobotPublishRecordDto)){ + // sql查询反馈意见使用 uploadRobotPublishRecordDto.setQuestionType(QuestionTypeEnum.FEEDBACK_BLANKS_SUBJECT.getInfo()); + //选项已选择 + uploadRobotPublishRecordDto.setOptionChooseSign(0); } return signPatientManageRouteNodeMapper.selectTaskOptionContented(uploadRobotPublishRecordDto); } 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 ae580797..8d7a51a8 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -89,7 +89,6 @@ - @@ -106,7 +105,6 @@ - @@ -1228,7 +1226,6 @@ resultMap="QuestionnaireTaskStatisticsVoResult"> select spmrn.question_info_id, - pqsbr.id questionSubmitResultId, pqsjr.question_subject_id, pqsjr.question_number, pqsjr.question_type, @@ -1236,7 +1233,6 @@ pqor.id patientQuestionOptionResult, pqor.question_subject_option_id questionSubjectOptionId, pqor.option_name, - pqor.option_choose_sign, pqor.option_sort, ( SELECT @@ -1266,7 +1262,7 @@ left join patient_question_subject_result pqsjr on pqsbr.id = pqsjr.question_submit_result_id left join patient_question_option_result pqor on pqsjr.id = pqor.question_subject_result_id where p.del_flag = 0 - -- and spmrn.node_finish_status = 'SUCCESS' + and spmrn.node_finish_status = 'SUCCESS' and pqsjr.question_type in ('MULTIPLE_CHOICE','MULTIPLE_CHOICE_QUESTIONS','COMBINATION_RADIO_SUBJECT','COMBINATION_MULTIPLE_SUBJECT')