111

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

@@ -26,7 +26,7 @@ public class CaseClinicalArticleQueryForm extends PageParam {
     private Integer articleStatus;
 
     @Schema(description = "删除状态")
-    private Integer deleteStatus;
+    private Integer deleteStatus = 0;
 
     @Schema(description = "发表时间")
     private LocalDate pushDateBegin;

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseClinicalArticle/service/CaseClinicalArticleLabelService.java

@@ -2,6 +2,7 @@ package net.lab1024.sa.admin.module.business.caseClinicalArticle.service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.amazonaws.Response;
 import net.lab1024.sa.admin.extend.app.label.GetLabelsResponse;
@@ -52,6 +53,10 @@ public class CaseClinicalArticleLabelService {
 
             List<AppCaseClinicalArticleLabelVO> labelDtoList = new ArrayList<>();
             for (GetLabelsResponse.GetLabelsData d : datas) {
+                if (Objects.equals(pid, "0") && Objects.equals(d.getId(), "464")){
+                    continue;
+                }
+
                 AppCaseClinicalArticleLabelVO dto = new AppCaseClinicalArticleLabelVO();
                 dto.setAppIden(d.getId());
                 dto.setLabelName(d.getName());

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

@@ -26,7 +26,7 @@ public class CaseClinicalVideoQueryForm extends PageParam {
     private Integer videoStatus;
 
     @Schema(description = "删除状态")
-    private Integer deleteStatus;
+    private Integer deleteStatus = 0;
 
     @Schema(description = "发表时间")
     private LocalDate pushDateBegin;

sa-admin/src/main/java/net/lab1024/sa/admin/module/business/caseExchange/domain/form/CaseExchangeQueryForm.java

@@ -25,4 +25,7 @@ public class CaseExchangeQueryForm extends PageParam {
 
     @Schema(description = "是否被精选（0:否 1:是）")
     private Integer isSelected;
+
+    @Schema(description = "deleteStatus（0:否 1:是）")
+    private Integer deleteStatus = 0;
 }

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

@@ -45,7 +45,9 @@
                 )
             </if>
             <!--删除状态-->
-            AND case_clinical_article.delete_status = 0
+            <if test="queryForm.deleteStatus != null">
+                AND case_clinical_article.delete_status = #{queryForm.deleteStatus}
+            </if>
             <!--状态-->
             <if test="queryForm.articleStatus != null">
                 AND case_clinical_article.article_status = #{queryForm.articleStatus}

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

@@ -45,7 +45,9 @@
                 )
             </if>
             <!--删除状态-->
-            AND case_clinical_video.delete_status = 0
+            <if test="queryForm.deleteStatus != null">
+                AND case_clinical_video.delete_status = #{queryForm.deleteStatus}
+            </if>
             <!--状态-->
             <if test="queryForm.videoStatus != null">
                 AND case_clinical_video.video_status = #{queryForm.videoStatus}

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

@@ -46,6 +46,9 @@
             <if test="queryForm.isSelected != null">
                 AND case_exchange.is_selected = #{queryForm.isSelected}
             </if>
+            <if test="queryForm.deleteStatus != null">
+                AND case_exchange.delete_status = #{queryForm.deleteStatus}
+            </if>
         </where>
         ORDER BY case_exchange.created_at DESC
     </select>