diff --git a/postdischarge-common/src/main/java/com/xinelu/common/enums/QuestionSubjectTypeEnum.java b/postdischarge-common/src/main/java/com/xinelu/common/enums/QuestionSubjectTypeEnum.java index d485d63e..c94c491c 100644 --- a/postdischarge-common/src/main/java/com/xinelu/common/enums/QuestionSubjectTypeEnum.java +++ b/postdischarge-common/src/main/java/com/xinelu/common/enums/QuestionSubjectTypeEnum.java @@ -22,6 +22,11 @@ public enum QuestionSubjectTypeEnum { * 填空题 */ FILL_IN_THE_BLANKS("FILL_IN_THE_BLANKS"), + + /** + * 反馈填空题 + */ + FEEDBACK_BLANKS_SUBJECT("FEEDBACK_BLANKS_SUBJECT"), ; final private String info; diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java index bf7a25a7..8d768772 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/signpatientmanageroutenode/impl/SignPatientManageRouteNodeServiceImpl.java @@ -1523,7 +1523,7 @@ public class SignPatientManageRouteNodeServiceImpl implements ISignPatientManage } } //题目是多选 - if (questionSubmitExportVo.getQuestionType().equals(QuestionSubjectTypeEnum.FILL_IN_THE_BLANKS.getInfo())) { + if (questionSubmitExportVo.getQuestionType().equals(QuestionSubjectTypeEnum.FILL_IN_THE_BLANKS.getInfo()) || questionSubmitExportVo.getQuestionType().equals(QuestionSubjectTypeEnum.FEEDBACK_BLANKS_SUBJECT.getInfo())) { followUpFeedbackVo.setWorkSuggestions(questionSubmitExportVo.getFillBlanksAnswer()); } } 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 fadbe3be..a5e956f0 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -1551,6 +1551,10 @@ from patient_question_submit_result pqsm LEFT JOIN patient_question_subject_result pqsj on pqsm.id = pqsj.question_submit_result_id LEFT JOIN patient_question_option_result pqor on pqsj.id = pqor.question_subject_result_id + where pqsm.manage_route_node_id in + + #{id} + ORDER BY pqsm.create_time DESC