ICSS常用症状科室无常用症状时返回全科常用

icss-service/src/main/java/com/diagbot/facade/QuestionUsualFacade.java

@@ -1,8 +1,13 @@
 package com.diagbot.facade;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.QuestionUsualDTO;
+import com.diagbot.entity.DeptInfo;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.QuestionUsualVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,7 +19,8 @@ import java.util.List;
  */
 @Component
 public class QuestionUsualFacade extends QuestionUsualServiceImpl {
-
+    @Autowired
+    DeptInfoFacade deptInfoFacade;
 
     /**
      * 获取常用标签
@@ -24,6 +30,14 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      */
     public List<QuestionUsualDTO> getQuestionUsual(QuestionUsualVO questionUsualVO) {
         List<QuestionUsualDTO> questionUsualDTOList = this.getQuestionUsualName(questionUsualVO);
+        if(ListUtil.isEmpty(questionUsualDTOList)){
+            QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("name","全科");
+            DeptInfo deptInfo = deptInfoFacade.getOne(queryWrapper);
+            questionUsualVO.setDeptId(deptInfo.getId());
+            questionUsualDTOList = this.getQuestionUsualName(questionUsualVO);
+        }
         return questionUsualDTOList;
     }
 }

icss-service/src/main/java/com/diagbot/vo/QuestionUsualVO.java

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 public class QuestionUsualVO {
 
     @NotNull(message = "请输入科室id")
-    private String deptId;
+    private Long deptId;
     @NotNull(message = "请输入病人年龄")
     private Integer age;
     @NotNull(message = "请输入病人性别")