二期ICSS常用标签维护，获取科室名称

icssman-service/src/main/java/com/diagbot/entity/ModuleDetail.java

@@ -80,10 +80,6 @@ public class ModuleDetail implements Serializable {
      */
     private Long relationModule;
 
-    /**
-     * 特殊标志
-     */
-    private String flag;
 
     /**
      * 排序号

icssman-service/src/main/java/com/diagbot/enums/QuestionUsualTypeEnum.java

@@ -0,0 +1,50 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description: 
+ * @Author: wangyu
+ * @Date: 13:41 2019/3/28
+ */
+public enum QuestionUsualTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检");
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    QuestionUsualTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static QuestionUsualTypeEnum getEnum(Integer key) {
+        for (QuestionUsualTypeEnum item : QuestionUsualTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        QuestionUsualTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

icssman-service/src/main/java/com/diagbot/facade/DeptInfoFacade.java

@@ -3,15 +3,12 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
-import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.GetDeptInfoDTO;
 import com.diagbot.dto.GetQuestionUsualAndTypeDTO;
-import com.diagbot.dto.QuestionTypeDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.QuestionUsual;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
@@ -32,6 +29,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -173,8 +171,16 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      *
      * @return
      */
-    public List<DeptInfoDTO> getAllDeptInfo() {
-        //查询所有科室
+    public List<DeptInfo> getAllDeptInfo(GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
+        //查询当前类型已经添加过得常用标签所关联的科室
+        List<GetQuestionUsualAndTypeDTO> getQuestionUsualAndTypeDTOS = questionUsualFacade.getQuestionUsualByDeptIds(getQuestionUsualAndTypeVO);
+        List<Long> deptIds = getQuestionUsualAndTypeDTOS.stream().map(getQuestionUsualAndTypeDTO -> getQuestionUsualAndTypeDTO.getDeptId()).collect(Collectors.toList());
+        //查询科室信息过滤掉已经添加过得科室
+        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey())
+                .notIn("id",deptIds);
+        List<DeptInfo> deptInfoList = this.list(queryWrapper);
+        /*//查询所有科室
         QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",IsDeleteEnum.N.getKey());
         List<DeptInfo> deptInfoList = this.list(queryWrapper);
@@ -225,8 +231,8 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
             if(ListUtil.isNotEmpty(deptInfoDTO.getTypeDTOList())){
                 deptInfoDTOS.add(deptInfoDTO);
             }
-        }
-        return deptInfoDTOS;
+        }*/
+        return deptInfoList;
     }
 
     /**

icssman-service/src/main/java/com/diagbot/vo/GetQuestionUsualAndTypeVO.java

@@ -3,8 +3,6 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import java.util.List;
-
 /**
  * @Description:
  * @author: wangyu
@@ -13,9 +11,6 @@ import java.util.List;
 @Getter
 @Setter
 public class GetQuestionUsualAndTypeVO {
-
-    /**
-     * 科室id
-     */
-    private List<Long> deptIds;
+    //标签类型
+    private Integer type;
 }

icssman-service/src/main/java/com/diagbot/web/QuestionUsualController.java

@@ -3,16 +3,17 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.DeptInfoDTO;
 import com.diagbot.dto.GetDeptInfoDTO;
 import com.diagbot.dto.GetQuestionInfoDTO;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.DeptInfo;
 import com.diagbot.facade.DeptInfoFacade;
 import com.diagbot.facade.QuestionFacade;
 import com.diagbot.facade.QuestionUsualFacade;
 import com.diagbot.vo.DeleteQuestionUsualVO;
 import com.diagbot.vo.GetDeptInfoVO;
 import com.diagbot.vo.GetQuestionInfoVO;
+import com.diagbot.vo.GetQuestionUsualAndTypeVO;
 import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionUsualVO;
 import io.swagger.annotations.Api;
@@ -75,8 +76,8 @@ public class QuestionUsualController {
             notes = "")
     @PostMapping("/getDeptName")
     @SysLogger("getDeptName")
-    public RespDTO<List<DeptInfoDTO>> getDeptName() {
-        List<DeptInfoDTO> data = deptInfoFacade.getAllDeptInfo();
+    public RespDTO<List<DeptInfo>> getDeptName(@RequestBody GetQuestionUsualAndTypeVO getQuestionUsualAndTypeVO) {
+        List<DeptInfo> data = deptInfoFacade.getAllDeptInfo(getQuestionUsualAndTypeVO);
         return RespDTO.onSuc(data);
     }
 

icssman-service/src/main/resources/mapper/QuestionUsualMapper.xml

@@ -31,9 +31,7 @@
         LEFT JOIN icss_question_info b ON a.question_id = b.id
         WHERE
 	      a.is_deleted = 'N'
-        AND a.dept_id IN
-        <foreach item="deptId" collection="deptIds" open="(" separator="," close=")">
-            #{deptId}
-        </foreach>
+        AND b.type = #{type}
+        GROUP BY a.dept_id
     </select>
 </mapper>