55555

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/form/CaseClinicalArticleAddForm.java

@@ -35,8 +35,7 @@ public class CaseClinicalArticleAddForm {
     @NotNull(message = "发表时间 不能为空")
     private LocalDateTime pushDate;
 
-    @Schema(description = "是否外部链接（0:否 1:是）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否外部链接（0:否 1:是）")
-    @NotNull(message = "是否外部链接（0:否 1:是） 不能为空")
     private Integer isLink;
 
     @Schema(description = "外部链接地址")
@@ -46,8 +45,7 @@ public class CaseClinicalArticleAddForm {
     @JsonDeserialize(using = FileKeyVoDeserializer.class)
     private String shareQrcode;
 
-    @Schema(description = "内容", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "内容")
-    @NotBlank(message = "内容 不能为空")
     private String articleContent;
 
     @Schema(description = "作者列表")

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/domain/vo/UserCommentClinicalArticleVO.java

@@ -22,6 +22,9 @@ public class UserCommentClinicalArticleVO {
     @Schema(description = "用户名称")
     private String userName;
 
+    @Schema(description = "医院名称")
+    private String hospitalName;
+
     @Schema(description = "父级ID")
     private Long parentId;
 

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/form/CaseClinicalVideoAddForm.java

@@ -36,16 +36,14 @@ public class CaseClinicalVideoAddForm {
     @NotNull(message = "删除状态（0:否 1:是） 不能为空")
     private Integer deleteStatus;
 
-    @Schema(description = "视频编号（保利）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "视频编号（保利）")
-    @NotBlank(message = "视频编号 不能为空")
     private String videoNo;
 
     @Schema(description = "发表时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "发表时间 不能为空")
     private LocalDateTime pushDate;
 
-    @Schema(description = "是否外部链接（0:否 1:是）", requiredMode = Schema.RequiredMode.REQUIRED)
+    @Schema(description = "是否外部链接（0:否 1:是）")
-    @NotNull(message = "是否外部链接（0:否 1:是） 不能为空")
     private Integer isLink;
 
     @Schema(description = "外部链接地址")

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalVideo/domain/vo/UserCommentClinicalVideoVO.java

@@ -22,6 +22,9 @@ public class UserCommentClinicalVideoVO {
     @Schema(description = "用户名称")
     private String userName;
 
+    @Schema(description = "医院名称")
+    private String hospitalName;
+
     @Schema(description = "父级ID")
     private Long parentId;
     

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/vo/UserCommentExchangeVO.java

@@ -22,6 +22,9 @@ public class UserCommentExchangeVO {
     @Schema(description = "用户名称")
     private String userName;
 
+    @Schema(description = "医院名称")
+    private String hospitalName;
+
     @Schema(description = "父级ID")
     private Long parentId;
 

sa-admin/src/main/resources/mapper/business/caseClinicalArticle/UserCommentClinicalArticleMapper.xml

@@ -6,6 +6,7 @@
     <sql id="base_columns">
         user_comment_clinical_article.comment_id,
         user.user_name,
+        basic_hospital.hospital_name,
         user_comment_clinical_article.status,
         user_comment_clinical_article.parent_id,
         user_comment_clinical_article.is_sensitive,
@@ -25,6 +26,7 @@
         <include refid="base_columns"/>
         FROM user_comment_clinical_article
         LEFT JOIN user ON user_comment_clinical_article.user_id = user.user_id
+        LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id
         LEFT JOIN case_clinical_article ON user_comment_clinical_article.article_id = case_clinical_article.article_id
         <where>
             <!--关键词搜索：支持评论内容、文章标题搜索-->

sa-admin/src/main/resources/mapper/business/caseClinicalVideo/UserCommentClinicalVideoMapper.xml

@@ -6,6 +6,7 @@
     <sql id="base_columns">
         user_comment_clinical_video.comment_id,
         user.user_name,
+        basic_hospital.hospital_name,
         user_comment_clinical_video.status,
         user_comment_clinical_video.parent_id,
         user_comment_clinical_video.is_sensitive,
@@ -25,6 +26,7 @@
         <include refid="base_columns"/>
         FROM user_comment_clinical_video
         LEFT JOIN user ON user_comment_clinical_video.user_id = user.user_id
+        LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id
         LEFT JOIN case_clinical_video ON user_comment_clinical_video.video_id = case_clinical_video.video_id
         <where>
             <!--关键词搜索：支持评论内容、视频标题搜索-->

sa-admin/src/main/resources/mapper/business/caseExchange/UserCommentExchangeMapper.xml

@@ -6,6 +6,7 @@
     <sql id="base_columns">
         user_comment_exchange.comment_id,
         user.user_name,
+        basic_hospital.hospital_name,
         user_comment_exchange.status,
         user_comment_exchange.parent_id,
         user_comment_exchange.is_sensitive,
@@ -25,6 +26,7 @@
         <include refid="base_columns"/>
         FROM user_comment_exchange
         LEFT JOIN user ON user_comment_exchange.user_id = user.user_id
+        LEFT JOIN basic_hospital ON user.hospital_id = basic_hospital.hospital_id
         LEFT JOIN case_exchange ON user_comment_exchange.exchange_id = case_exchange.exchange_id
         <where>
             <!--关键词搜索：支持评论内容、交流标题搜索-->