fix

广场医院头像和名称

tr-modules/tr-module-smartFollowUp/src/main/java/cn/tr/module/smart/common/dto/BizQuestionGroupSquareDTO.java

@@ -66,7 +66,7 @@ public class BizQuestionGroupSquareDTO extends BaseDTO  {
     @ApiModelProperty(value = "医院名称", position = 18)
     private String hospitalName;
 
-    @ApiModelProperty(value = "医院头像", position = 19)
-    private String avatar;
+    @ApiModelProperty("医院头像")
+    private String tenantAvatar;
 
 }

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

@@ -21,29 +21,29 @@
         <result property="isPull" column="is_pull"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="hospitalName" column="hospital_name"/>
-        <result property="avatar" column="avatar"/>
+        <result property="tenantAvatar" column="tenant_avatar"/>
     </resultMap>
 
     <select id="selectALlList" resultMap="SquareList">
         SELECT
-        bqgs.id,
-        bqgs.name,
-        bqgs.type,
-        bqgs.version,
-        bqgs.md5,
-        bqgs.hospital_group_id,
-        bqgs.citation_count,
-        bqgs.interval,
-        bqgs.frequency,
-        bqgs.create_by,
-        bqgs.update_by,
-        bqgs.create_time,
-        bqgs.update_time,
-        bqgs.tenant_id,
-        ( SELECT COUNT ( 1 ) FROM biz_question_square bqs WHERE bqs.group_id = bqgs.ID ) AS question_count,
-        ( SELECT CASE WHEN EXISTS ( SELECT id FROM biz_question_group bqg WHERE bqg.square_id = bqgs.ID ) THEN 1 ELSE 0 END ) AS is_pull,
+            bqgs.id,
+            bqgs.name,
+            bqgs.type,
+            bqgs.version,
+            bqgs.md5,
+            bqgs.hospital_group_id,
+            bqgs.citation_count,
+            bqgs.interval,
+            bqgs.frequency,
+            bqgs.create_by,
+            bqgs.update_by,
+            bqgs.create_time,
+            bqgs.update_time,
+            bqgs.tenant_id,
+        st.avatar as tenant_avatar,
         st.name as hospital_name,
-        st.avatar
+            ( SELECT COUNT ( 1 ) FROM biz_question_square bqs WHERE bqs.group_id = bqgs.ID ) AS question_count,
+            ( SELECT CASE WHEN EXISTS ( SELECT id FROM biz_question_group bqg WHERE bqg.square_id = bqgs.ID ) THEN 1 ELSE 0 END ) AS is_pull
         FROM
         biz_question_group_square bqgs
         left join sys_tenant st on st.id = bqgs.tenant_id