add

问卷信息

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/service/impl/BizQuestionGroupServiceImpl.java

@@ -216,7 +216,8 @@ public class BizQuestionGroupServiceImpl implements IBizQuestionGroupService {
             throw new ServiceException(TRExcCode.SYSTEM_ERROR_B0001, "未查询到问卷组信息");
         }
         List<BizQuestionPO> questionList = bizQuestionRepository.selectList(new LambdaQueryWrapper<BizQuestionPO>()
-                .eq(BizQuestionPO::getGroupId, id));
+                .eq(BizQuestionPO::getGroupId, id)
+                .orderByDesc(BizQuestionPO::getInputBoxType));
         BizWebQuestionGroupVO bizWebQuestionAnswerDTO = new BizWebQuestionGroupVO();
         bizWebQuestionAnswerDTO.setId(bizQuestionGroupPO.getId());
         bizWebQuestionAnswerDTO.setGroupName(bizQuestionGroupPO.getName());

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/wx/controller/vo/BizWxAppletClinicDetailVO.java

@@ -87,4 +87,7 @@ public class BizWxAppletClinicDetailVO implements Serializable {
 
     @ApiModelProperty("上一次镇痛评价的时间")
     private Date lastPainAssessmentTime;
+
+    @ApiModelProperty("术后问卷id")
+    private String postQuestionGroupId;
 }

tr-modules/tr-module-smartFollowUp/src/main/resources/mapper/smart/BizClinicRoomMapper.xml

@@ -26,6 +26,7 @@
         <result property="doctorNickname" column="doctor_nickname"/>
         <result property="lastPainAssessmentTime" column="last_pain_assessment_time"/>
         <result property="lastAfterQuestionTime" column="last_after_question_time"/>
+        <result property="postQuestionGroupId" column="post_question_group_id"/>
     </resultMap>
 
     <resultMap id="roomAndPatient" type="cn.tr.module.smart.app.controller.vo.DoctorClinicRoomVO">
@@ -84,6 +85,7 @@
         bqa.answer_time       as last_modify_question_time,
         su.id                 as doctor_id,
         su.nickname           as doctor_nickname,
+        bd.group_id as post_question_group_id,
         bcr.image_url as image_url,
         bp.new_human as new_human,
         bp.card_no as card_no,
@@ -96,6 +98,7 @@
         left join biz_clinic_room_doctor_user as bcrmu on bcrmu.clinic_room_id = bcr.id
         left join sys_user as su on bcrmu.user_id = su.id
         left join biz_question_answer as bqa on bqa.clinic_id = bcr.id
+        left join biz_dept as bd on bd.id=bcr.dept_id
         <where>
             and bcr.deleted=0 and bcrwu.wx_user_id = #{query.userId}
             <if test="query.patientCode != null and query.patientCode != ''">