查看问卷问题修改提交

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/config/ContentListType.java

@@ -0,0 +1,22 @@
+package cn.tr.module.smart.app.config;
+
+import cn.tr.module.smart.common.entity.BizQuestionEntity;
+import cn.tr.module.smart.common.entity.BizWxAppletQuestionAnswerEntity;
+import cn.tr.plugin.mybatis.config.handler.ListTypeHandler;
+
+/**
+ * @author wangzl
+ * @description: TODO
+ * @date 2025/7/17 15:31
+ */
+public class ContentListType extends ListTypeHandler<BizWxAppletQuestionAnswerEntity> {
+    /**
+     * 具体类型，由子类提供
+     *
+     * @return 具体类型
+     */
+    @Override
+    protected Class specificType() {
+        return BizWxAppletQuestionAnswerEntity.class;
+    }
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/app/config/QuestionListType.java

@@ -0,0 +1,21 @@
+package cn.tr.module.smart.app.config;
+
+import cn.tr.module.smart.common.entity.BizQuestionEntity;
+import cn.tr.plugin.mybatis.config.handler.ListTypeHandler;
+
+/**
+ * @author wangzl
+ * @description: TODO
+ * @date 2025/7/17 15:31
+ */
+public class QuestionListType extends ListTypeHandler<BizQuestionEntity> {
+    /**
+     * 具体类型，由子类提供
+     *
+     * @return 具体类型
+     */
+    @Override
+    protected Class specificType() {
+        return BizQuestionEntity.class;
+    }
+}

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/po/BizQuestionAnswerPO.java

@@ -1,5 +1,7 @@
 package cn.tr.module.smart.common.po;
 
+import cn.tr.module.smart.app.config.ContentListType;
+import cn.tr.module.smart.app.config.QuestionListType;
 import cn.tr.module.smart.common.entity.BizQuestionEntity;
 import cn.tr.module.smart.common.entity.BizWxAppletQuestionAnswerEntity;
 import cn.tr.plugin.mybatis.config.handler.JsonbTypeHandler;
@@ -31,12 +33,12 @@ public class BizQuestionAnswerPO extends TenantPO {
 
     /** 回答的内容 */
     @ApiModelProperty(value = "回答的内容", position = 2)
-    @TableField(typeHandler = JsonbTypeHandler.class)
+    @TableField(typeHandler = ContentListType.class)
     private List<BizWxAppletQuestionAnswerEntity> content;
 
     /** 问卷问题 */
     @ApiModelProperty(value = "问卷问题", position = 3)
-    @TableField(typeHandler = JsonbTypeHandler.class)
+    @TableField(typeHandler = QuestionListType.class)
     private List<BizQuestionEntity> question;
 
     /** 手术id */

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

@@ -96,7 +96,7 @@ public class BizQuestionAnswerServiceImpl implements IBizQuestionAnswerService {
                     continue;
                 }
                 BizWxDeptQuestionVO question = questionMap.get(answer.getFiledName());
-                if(ObjectUtil.isNull(question)){
+                if(ObjectUtil.isNotNull(question)){
                     question.setAnswer(answer.getContent());
                 }
             }

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/web/dto/BizPatientClinicListDTO.java

@@ -30,6 +30,6 @@ public class BizPatientClinicListDTO implements Serializable {
     @ApiModelProperty(value = "科室名称",position = 5)
     private String deptName;
     @ApiModelProperty(value = "医生名称",position = 6)
-    private String doctorName;
+    private String nickName;
 
 }

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

@@ -218,10 +218,13 @@
             bcr.clinic_name as clinicName,
             bcr.clinic_start_time as clinicStartTime,
             bcr.dept_id as deptId,
-            bcr.dept_name as deptName
+            bcr.dept_name as deptName,
+            su.nickName as nickName
+
         FROM
             biz_clinic_room bcr
                 JOIN biz_clinic_room_doctor_user bcrdu ON bcr.ID = bcrdu.clinic_room_id
+                Join sys_user su on bcrdu.user_id = su.id
         <where>
             and bcr.deleted = 0
             <if test="patientId != null and patientId != ''">