Merge remote-tracking branch 'origin/dev/KLBstand' into dev/KLBstand

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

@@ -25,8 +25,6 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.ModuleInfoTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.TagTypeEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ModuleInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
@@ -292,11 +290,16 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         RespDTOUtil.respNGDeal(deptInfoList,"获取科室信息失败");
         Map<Long, ConceptBaseDTO> deptInfoMap = deptInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
         //获取疾病名称
-        QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
+        conceptTypeVO = new ConceptTypeVO();
+        conceptTypeVO.setType(3);
+        RespDTO<List<ConceptBaseDTO>> disInfoList = knowledgemanServiceClient.getConceptListByType(conceptTypeVO);
+        RespDTOUtil.respNGDeal(disInfoList,"获取疾病信息失败");
+        Map<Long, ConceptBaseDTO> disInfoMap = disInfoList.data.stream().collect(Collectors.toMap(ConceptBaseDTO::getConceptId,conceptBaseDTO -> conceptBaseDTO));
+        /*QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper<>();
         questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .in("id", disId);
         List<QuestionInfo> questionInfoList = questionFacade.list(questionInfoQueryWrapper);
-        Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));
+        Map<Long, QuestionInfo> questionInfoMap = questionInfoList.stream().collect(Collectors.toMap(QuestionInfo::getId,questionInfo -> questionInfo));*/
         //获取模板类型名称
         QueryWrapper<DictionaryInfo> dictionaryInfoQueryWrapper = new QueryWrapper<>();
         dictionaryInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -308,10 +311,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
         if(ListUtil.isNotEmpty(moduleInfoDTOIPage.getRecords())){
             //获取用户信息
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-            if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR,
-                        "获取用户信息失败");
-            }
+            RespDTOUtil.respNGDeal(respDTO,"获取用户信息失败");
             //将用户信息放入实体
             for (ModuleInfoListDTO moduleInfoListDTO : moduleInfoDTOIPage.getRecords()) {
                 moduleInfoListDTO.setUserName(respDTO.data.get(moduleInfoListDTO.getModifier()));
@@ -327,7 +327,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 }
                 if(moduleInfoListDTO.getModuleType().intValue() == 2){//根据疾病
                     if(moduleInfoListDTO.getRelationId().intValue() != -1){//判断是不是科室通用子模板
-                        moduleInfoListDTO.setRelationName(questionInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
+                        moduleInfoListDTO.setRelationName(disInfoMap.get(moduleInfoListDTO.getRelationId()).getName());
                     }else {
                         moduleInfoListDTO.setRelationName(ModuleInfoTypeEnum.Common.getName());
                     }
@@ -535,7 +535,7 @@ public class ModuleInfoFacade extends ModuleInfoServiceImpl {
                 }
             }
         }
-        List<DisDTO> disDTOS = BeanUtil.listCopyTo(deptInfoList.data,DisDTO.class);
+        List<DisDTO> disDTOS = BeanUtil.listCopyTo(disTypes.data,DisDTO.class);
         GetAllDeptAndDisInfoDTO getAllDeptAndDisInfoDTO = new GetAllDeptAndDisInfoDTO();
         getAllDeptAndDisInfoDTO.setDeptDTOS(deptDTOS);
         getAllDeptAndDisInfoDTO.setDisDTOS(disDTOS);

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

@@ -114,6 +114,7 @@ public class DeptVitalController {
             notes = "deptId:科室ID，必填<br>")
     @PostMapping("/getDeptShortList_modify")
     @SysLogger("getDeptShortList_modify")
+    @ApiIgnore
     public RespDTO<DeptShortDTO> getDeptShortListModify(@RequestBody DeptIdVO deptIdVO) {
         List<DeptShortDTO> data = deptVitalFacade.getDeptShortLisModify(deptIdVO.getDeptId());
         return RespDTO.onSuc(data);

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -200,7 +200,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationNodeDTO.setConceptTypeName(LexiconTypeEnum.getName(concept.getLibType().intValue()));
 		relationNodeDTO.setConceptNameType(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
 		
-		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId()));
+		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId(),null));
 		
 		return relationNodeDTO;
 	}
@@ -209,19 +209,30 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * 处理关系节点-查询事件
 	 * @param conceptId
 	 * @param relationId
+	 * @param hookConceptIds
 	 * @return
 	 */
-	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId){
-		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId);
+	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId,List<Long> hookConceptIds){
+		if(hookConceptIds==null){
+			hookConceptIds = new ArrayList<>();
+			hookConceptIds.add(conceptId);
+		}
+		
+		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId,relationId);
 		
-		relationNodeDTOList.forEach(i->{
+		for(RelationNodeDTO i : relationNodeDTOList){
 			i.setConceptTypeName(LexiconTypeEnum.getName(i.getConceptTypeId().intValue()));
 			i.setConceptNameType(i.getConceptName()+"("+LexiconTypeEnum.getName(i.getConceptTypeId().intValue())+")");
 			i.setParentConceptTypeName(LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue()));
 			i.setParentConceptNameType(i.getParentConceptName()+"("+LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue())+")");
 			
-			i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId));
-		});
+			if(!hookConceptIds.contains(i.getConceptId())){
+				List<Long> hookConceptIds_ = new ArrayList<>();
+				hookConceptIds_.addAll(hookConceptIds);
+				hookConceptIds_.add(i.getConceptId());
+				i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId,hookConceptIds_));
+			}
+		}
 		
 		return relationNodeDTOList;
 	}

knowledgeman-service/src/main/java/com/diagbot/mapper/RelationMapper.java

@@ -2,6 +2,8 @@ package com.diagbot.mapper;
 
 import java.util.List;
 
+import org.apache.ibatis.annotations.Param;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.dto.GetRelationInfoListDTO;
@@ -28,7 +30,7 @@ public interface RelationMapper extends BaseMapper<Relation> {
 	
 	IPage<GetRelationInfoListDTO> getRelationInfoList(GetRelationInfoListVO getRelationInfoListVO);
 	
-	List<RelationNodeDTO> getRelationNodeDTOs(Long conceptId,Long relationId);
+	List<RelationNodeDTO> getRelationNodeDTOs(@Param(value="conceptId")Long conceptId,@Param(value="relationId")Long relationId);
 	
 	IPage<RelationContactListDTO> relationContactList(RelationContactListVO relationContactListVO);
 	

tran-service/src/main/java/com/diagbot/facade/DataServiceFacade.java

@@ -10,8 +10,6 @@ import com.diagbot.vo.HosCodeVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import javax.management.Query;
-
 /**
  * @Description:
  * @Author:zhaops
@@ -33,7 +31,8 @@ public class DataServiceFacade {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
         }
         QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("code", hosCodeVO.getHosCode());
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("code", hosCodeVO.getHosCode());
         HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper);
         if (hospitalInfo == null) {
             return false;

tran-service/src/main/java/com/diagbot/facade/DoctorInfoFacade.java

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import com.diagbot.enums.IsDeleteEnum;
 import org.springframework.stereotype.Component;
 
 import com.diagbot.dto.DoctorInfoDTO;
@@ -36,7 +37,10 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
      * @return 医生信息
      */
     public Map<Long, DoctorInfo> doctorInfoMapByIds(List<Long> ids) {
-    	Map<Long, DoctorInfo> doctorInfoMap = this.listByIds(ids).stream().filter(i -> i.getIsDeleted().equals("N")).collect(Collectors.toMap(DoctorInfo::getId, i -> i));
+    	Map<Long, DoctorInfo> doctorInfoMap
+                = this.listByIds(ids).stream()
+                .filter(i -> i.getIsDeleted().equals(IsDeleteEnum.N.getKey()))
+                .collect(Collectors.toMap(DoctorInfo::getId, i -> i));
         return doctorInfoMap;
     }
 }

tran-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

@@ -1,29 +1,25 @@
 package com.diagbot.facade;
 
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.entity.IndexData;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.service.IndexDataService;
 import com.diagbot.service.impl.IndexDataServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.vo.IndexDataAllVO;
 import com.diagbot.vo.IndexDataFindVO;
 import com.diagbot.vo.IndexDataSaveVO;
-import com.diagbot.vo.IndexDataVO;
+import org.springframework.stereotype.Component;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 
@@ -34,8 +30,6 @@ import com.diagbot.vo.IndexDataVO;
 @Component
 public class IndexDataFacade extends IndexDataServiceImpl {
 
-	@Autowired 
-	IndexDataService indexDataService;
 	/**
 	 * 
 	 * @param indexDataFindVO
@@ -48,7 +42,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
         indexDataMap.put("startTime", indexDataFindVO.getStartTime());
         indexDataMap.put("endTime", indexDataFindVO.getEndTime());
         //获取慢病指标数据
-         return indexDataService.quisitionIndexDataAll(indexDataFindVO.getIds(),indexDataMap);
+         return this.quisitionIndexDataAll(indexDataFindVO.getIds(),indexDataMap);
          
 	}
 
@@ -92,7 +86,7 @@ public class IndexDataFacade extends IndexDataServiceImpl {
 	                }
 	           
 	            if (ListUtil.isNotEmpty(IndexDataList)) {
-	                res = indexDataService.insertIndexDataList(IndexDataList);
+	                res = this.insertIndexDataList(IndexDataList);
 	            }
 	}
 	        return res;

tran-service/src/main/java/com/diagbot/web/DataServiceController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/dataService")
 @Api(value = "数据服务对外接口相关API", tags = { "数据服务对外接口相关API" })
+@SuppressWarnings("unchecked")
 public class DataServiceController {
 
     @Autowired

tran-service/src/main/java/com/diagbot/web/IntroduceTitleConfigController.java

@@ -22,6 +22,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/introduceTitleConfig")
 @Api(value = "提示信息标题映射相关API", tags = { "提示信息标题映射相关API" })
+@SuppressWarnings("unchecked")
 public class IntroduceTitleConfigController {
     @Autowired
     IntroduceTitleConfigFacade introduceTitleConfigFacade;

tran-service/src/main/java/com/diagbot/web/PacsConfigController.java

@@ -23,6 +23,7 @@ import java.util.Map;
 @RestController
 @RequestMapping("/pacsConfig")
 @Api(value = "辅检公表映射配置相关API", tags = { "辅检公表映射配置相关API" })
+@SuppressWarnings("unchecked")
 public class PacsConfigController {
 
     @Autowired