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

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

@@ -302,7 +302,6 @@ public class DeptVitalFacade extends DeptVitalServiceImpl {
         List<DeptShortDTO> res = ListUtil.newArrayList();
         if (ListUtil.isNotEmpty(deptIds)) {
             ConceptSearchVO conceptSearchVO = new ConceptSearchVO();
-            List<Long> conceptIds = ListUtil.newArrayList();
             conceptSearchVO.setConceptIds(deptIds);
             RespDTO<Map<Long, String>> deptMap = klmServiceClient.getConceptMap(conceptSearchVO);
             for (Long deptId : deptIds) {

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/dto/RelationNodeDTO.java

@@ -24,6 +24,21 @@ public class RelationNodeDTO {
 	 */
 	private String conceptName;
 	
+	/**
+	 * 当前概念类型id
+	 */
+	private Long conceptTypeId;
+	
+	/**
+	 * 当前概念类型名称
+	 */
+	private String conceptTypeName;
+	
+	/**
+	 * 当前概念名称(类型)
+	 */
+	private String conceptNameType;
+	
 	/**
 	 * 上一级概念id end_id
 	 */
@@ -34,6 +49,21 @@ public class RelationNodeDTO {
 	 */
 	private String parentConceptName;
 	
+	/**
+	 * 上一级概念类型id
+	 */
+	private Long parentConceptTypeId;
+	
+	/**
+	 * 上一级概念类型名称
+	 */
+	private String parentConceptTypeName;
+	
+	/**
+	 * 上一级概念名称(类型)
+	 */
+	private String parentConceptNameType;
+	
 	/**
 	 * 当前概念(起点术语) 与 上一级概念(终点术语) 关系id
 	 */

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

@@ -195,7 +195,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 		
 		Concept concept = conceptFacade.getById(relationContactDetailVO.getConceptId());
 		relationNodeDTO.setConceptId(concept.getId());
-		relationNodeDTO.setConceptName(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
+		relationNodeDTO.setConceptName(concept.getLibName());
+		relationNodeDTO.setConceptTypeId(concept.getLibType());
+		relationNodeDTO.setConceptTypeName(LexiconTypeEnum.getName(concept.getLibType().intValue()));
+		relationNodeDTO.setConceptNameType(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
 		
 		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId()));
 		
@@ -209,9 +212,14 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @return
 	 */
 	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId){
-		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId, relationId);
+		List<RelationNodeDTO> relationNodeDTOList = this.baseMapper.getRelationNodeDTOs(conceptId,relationId);
 		
 		relationNodeDTOList.forEach(i->{
+			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));
 		});
 		

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);
 	

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -54,8 +54,10 @@
     	SELECT
 			d.id AS conceptId,
 			d.lib_name AS conceptName,
+			d.lib_type AS conceptTypeId,
 			c.id AS parentConceptId,
 			c.lib_name AS parentConceptName,
+			c.lib_type AS parentConceptTypeId,
 			e.id AS relationId,
 			e.`name` AS relationName
 		FROM kl_relation a LEFT JOIN kl_relation_order b ON a.id=b.t_relation_id

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