소스 검색

icssman删除无用代码

gaodm 6 년 전
부모
커밋
c642a7c13e

+ 0 - 4
icssman-service/src/main/java/com/diagbot/facade/ModuleInfoFacade.java

@@ -69,10 +69,6 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
     UserServiceClient userServiceClient;
     @Autowired
     DictionaryFacade dictionaryFacade;
-    @Autowired
-    DeptInfoFacade deptInfoFacade;
-    @Autowired
-    DisTypeFacade disTypeFacade;
 
     /**
      * 根据id删除标签模板

+ 37 - 73
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -6,24 +6,19 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.KnowledgemanServiceClient;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetQuestionInfoDTO;
-import com.diagbot.dto.IndexRevDTO;
 import com.diagbot.dto.QuestionDTO;
 import com.diagbot.dto.QuestionPageDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.CommonParam;
-import com.diagbot.entity.DeptInfo;
 import com.diagbot.entity.DeptVital;
-import com.diagbot.entity.DisType;
 import com.diagbot.entity.QuestionDetail;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionMapping;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
 import com.diagbot.entity.wrapper.QuestionMappingWrapper;
 import com.diagbot.entity.wrapper.QuestionWrapper;
-import com.diagbot.enums.DisTypeEnum;
 import com.diagbot.enums.InsertOrUpdateEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -42,7 +37,6 @@ import com.diagbot.vo.ConceptExistVO;
 import com.diagbot.vo.DeleteQuestionVO;
 import com.diagbot.vo.GetQuestionIdsByTypeVO;
 import com.diagbot.vo.GetQuestionInfoVO;
-import com.diagbot.vo.GetQuestionUsualByDeptVO;
 import com.diagbot.vo.QuestionIdsVO;
 import com.diagbot.vo.QuestionIndexSubVO;
 import com.diagbot.vo.QuestionIndexVO;
@@ -86,18 +80,12 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
     @Autowired
     ModuleDetailFacade moduleDetailFacade;
     @Autowired
-    DeptInfoFacade deptInfoFacade;
-    @Autowired
     UserServiceClient userServiceClient;
     @Autowired
     ModuleInfoFacade moduleInfoFacade;
     @Autowired
     DeptVitalFacade deptVitalFacade;
     @Autowired
-    DisTypeFacade disTypeFacade;
-    @Autowired
-    DisScaleFacade disScaleFacade;
-    @Autowired
     KnowledgemanServiceClient knowledgemanServiceClient;
 
     /**
@@ -484,43 +472,43 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return res;
     }
 
-//    /**
-//     * 别名新增标签检索
-//     *
-//     * @param questionIndexVO
-//     * @return
-//     */
-//    public List<IndexRevDTO> indexRev(QuestionIndexVO questionIndexVO) {
-//        Map<String, Object> paramMap = new HashMap<>();
-//        paramMap.put("age", questionIndexVO.getAge());
-//        paramMap.put("sexType", questionIndexVO.getSexType());
-//        paramMap.put("tagName", questionIndexVO.getTagName());
-//        paramMap.put("type", questionIndexVO.getType());
-//        paramMap.put("controlType", questionIndexVO.getControlType());
-//        paramMap.put("notIds", questionIndexVO.getNotIds());
-//        paramMap.put("tagType", questionIndexVO.getTagType());
-//        paramMap.put("existName", questionIndexVO.getExistName());
-//        paramMap.put("notTagType", questionIndexVO.getNotTagType());
-//        paramMap.put("notControlType", questionIndexVO.getNotControlType());
-//        List<QuestionInfo> list = this.index(paramMap);
-//        if (ListUtil.isNotEmpty(list)) {
-//            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
-//            list = list.stream().filter(i -> {
-//                if (couMap.get(i.getId()) != null) {
-//                    return false;
-//                }
-//                return true;
-//            }).collect(Collectors.toList());
-//            if (ListUtil.isNotEmpty(list)) {
-//                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
-//                indexRevDTOList.forEach(i -> {
-//                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
-//                });
-//                return indexRevDTOList;
-//            }
-//        }
-//        return null;
-//    }
+    //    /**
+    //     * 别名新增标签检索
+    //     *
+    //     * @param questionIndexVO
+    //     * @return
+    //     */
+    //    public List<IndexRevDTO> indexRev(QuestionIndexVO questionIndexVO) {
+    //        Map<String, Object> paramMap = new HashMap<>();
+    //        paramMap.put("age", questionIndexVO.getAge());
+    //        paramMap.put("sexType", questionIndexVO.getSexType());
+    //        paramMap.put("tagName", questionIndexVO.getTagName());
+    //        paramMap.put("type", questionIndexVO.getType());
+    //        paramMap.put("controlType", questionIndexVO.getControlType());
+    //        paramMap.put("notIds", questionIndexVO.getNotIds());
+    //        paramMap.put("tagType", questionIndexVO.getTagType());
+    //        paramMap.put("existName", questionIndexVO.getExistName());
+    //        paramMap.put("notTagType", questionIndexVO.getNotTagType());
+    //        paramMap.put("notControlType", questionIndexVO.getNotControlType());
+    //        List<QuestionInfo> list = this.index(paramMap);
+    //        if (ListUtil.isNotEmpty(list)) {
+    //            Map<Long, Long> couMap = retrievalMappingFacade.getMapCouByQuesIds(list.stream().map(i -> i.getId()).collect(Collectors.toList()));
+    //            list = list.stream().filter(i -> {
+    //                if (couMap.get(i.getId()) != null) {
+    //                    return false;
+    //                }
+    //                return true;
+    //            }).collect(Collectors.toList());
+    //            if (ListUtil.isNotEmpty(list)) {
+    //                List<IndexRevDTO> indexRevDTOList = BeanUtil.listCopyTo(list, IndexRevDTO.class);
+    //                indexRevDTOList.forEach(i -> {
+    //                    i.setTypeName(QuestionTypeEnum.getName(i.getType()));
+    //                });
+    //                return indexRevDTOList;
+    //            }
+    //        }
+    //        return null;
+    //    }
 
     /**
      * 根据主标签id 检索子标签
@@ -589,30 +577,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
         return questionIds;
     }
 
-
-    /**
-     * 根据科室id获取常用标签信息
-     *
-     * @param getQuestionUsualByDeptVO
-     * @return
-     */
-    public List<GetQuestionInfoDTO> getQuestionUsualByDept(GetQuestionUsualByDeptVO getQuestionUsualByDeptVO) {
-        //先判断科室是不是已被删除
-        QueryWrapper<DeptInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("id", getQuestionUsualByDeptVO.getDeptId());
-        List<DeptInfo> deptInfoList = deptInfoFacade.list(queryWrapper);
-        if (ListUtil.isEmpty(deptInfoList)) {
-            throw new CommonException(CommonErrorCode.NOT_EXISTS, "科室信息不存在");
-        }
-        //获取常用标签信息
-        List<GetQuestionInfoDTO> getQuestionInfoDTOList = this.getQuestionUsualsByDept(getQuestionUsualByDeptVO);
-        return getQuestionInfoDTOList;
-    }
-
-
-    /********************************************以下从icss项目拷贝过来*****************************************************/
-
     /**
      * 根据参数返回标签内容
      *