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

knowledgeman-service/src/main/java/com/diagbot/dto/GetConceptInfoDetailDTO.java

@@ -19,6 +19,12 @@ public class GetConceptInfoDetailDTO {
 	@ApiModelProperty(value="名称")
     private String name;
     
+	/**
+	 * 拼音
+	 */
+	@ApiModelProperty(value="拼音")
+	private String spell;
+	
     /**
      * 类型id
      */

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

@@ -1,27 +1,5 @@
 package com.diagbot.facade;
 
-import java.io.InputStream;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.lang.time.DateFormatUtils;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-import org.apache.poi.xssf.usermodel.XSSFWorkbook;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
@@ -69,6 +47,27 @@ import com.diagbot.vo.GetAllLisConceptVO;
 import com.diagbot.vo.GetConceptInfoDetailVO;
 import com.diagbot.vo.IndexVO;
 import com.diagbot.vo.RemoveConceptInfoVO;
+import org.apache.commons.lang.time.DateFormatUtils;
+import org.apache.poi.hssf.usermodel.HSSFDateUtil;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 术语查询业务层
@@ -80,10 +79,6 @@ public class ConceptFacade extends ConceptServiceImpl {
 
     @Autowired
     private LibraryInfoFacade libraryinfoFacade;
-    //    @Autowired
-    //    private LibraryDetailFacade libraryDetailFacade;
-//    @Autowired
-//    private MedicalFacade medicalFacade;
     @Autowired
     private RelationFacade relationFacade;
     @Autowired
@@ -103,27 +98,27 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<GetAllLisConceptDTO> getAllLisConcept(GetAllLisConceptVO getAllLisConceptVO) {
-    	List<GetAllLisConceptDTO> getAllLisConceptDTOList = new ArrayList<>();
-    	
-    	QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-    	conceptQe.eq("is_deleted", "N");
-    	conceptQe.eq("lib_type", 46);
-    	conceptQe.like(StringUtil.isNotEmpty(getAllLisConceptVO.getConceptName()),"lib_name", getAllLisConceptVO.getConceptName());
-    	List<Concept> conceptList = list(conceptQe);
-    	
-    	conceptList.forEach(i->{
-    		if(getAllLisConceptVO.getExcludedConceptNames()!=null
-    				&&getAllLisConceptVO.getExcludedConceptNames().contains(i.getLibName())){
-    			return;
-    		}
-    		GetAllLisConceptDTO getAllLisConceptDTO = new GetAllLisConceptDTO();
-    		getAllLisConceptDTO.setConceptId(i.getId());
-    		getAllLisConceptDTO.setConceptName(i.getLibName());
-    		getAllLisConceptDTOList.add(getAllLisConceptDTO);
-    	});
-    	
+        List<GetAllLisConceptDTO> getAllLisConceptDTOList = new ArrayList<>();
+
+        QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+        conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        conceptQe.eq("lib_type", LexiconTypeEnum.LIS_TABLES.getKey());
+        conceptQe.like(StringUtil.isNotEmpty(getAllLisConceptVO.getConceptName()), "lib_name", getAllLisConceptVO.getConceptName());
+        List<Concept> conceptList = list(conceptQe);
+
+        conceptList.forEach(i -> {
+            if (getAllLisConceptVO.getExcludedConceptNames() != null
+                    && getAllLisConceptVO.getExcludedConceptNames().contains(i.getLibName())) {
+                return;
+            }
+            GetAllLisConceptDTO getAllLisConceptDTO = new GetAllLisConceptDTO();
+            getAllLisConceptDTO.setConceptId(i.getId());
+            getAllLisConceptDTO.setConceptName(i.getLibName());
+            getAllLisConceptDTOList.add(getAllLisConceptDTO);
+        });
+
         //return this.baseMapper.getAllLisConcept(getAllLisConceptVO);
-    	return getAllLisConceptDTOList;
+        return getAllLisConceptDTOList;
     }
 
     /**
@@ -134,15 +129,15 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public List<GetAllConceptDTO> getAllConcept(GetAllConceptVO getAllConceptVO) {
         QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
-        libraryInfoQe.eq("is_deleted", "N");
-        libraryInfoQe.eq(getAllConceptVO.getIsConcept() != null,"is_concept", getAllConceptVO.getIsConcept());
-        libraryInfoQe.like(StringUtil.isNotBlank(getAllConceptVO.getName()),"name", getAllConceptVO.getName());
+        libraryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        libraryInfoQe.eq(getAllConceptVO.getIsConcept() != null, "is_concept", getAllConceptVO.getIsConcept());
+        libraryInfoQe.like(StringUtil.isNotBlank(getAllConceptVO.getName()), "name", getAllConceptVO.getName());
         List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
 
         //过滤掉非概念术语
         if (getAllConceptVO.getIsConcept() != null && getAllConceptVO.getIsConcept() == 1) {
             QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-            conceptQe.eq("is_deleted", "N");
+            conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
             conceptQe.in("id", libraryInfoList.stream().map(i -> i.getConceptId()).distinct().collect(Collectors.toList()));
             Map<Long, Concept> conceptMap = list(conceptQe).stream().collect(Collectors.toMap(Concept::getId, i -> i));
             libraryInfoList.forEach(i -> {
@@ -175,7 +170,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         return getAllConceptDTOList;
     }
-    
+
     /**
      * 获取所有概念(术语关系维护时筛选使用)
      *
@@ -183,46 +178,46 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<GetAllForRelationDTO> getAllForRelation(GetAllForRelationVO getAllForRelationVO) {
-    	List<GetAllForRelationDTO> retList = new ArrayList<>();
-    	
-    	QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
-    	conceptQe.eq("is_deleted", "N");
-    	conceptQe.like(StringUtil.isNotEmpty(getAllForRelationVO.getName()),"lib_name", getAllForRelationVO.getName());
-    	conceptQe.eq(getAllForRelationVO.getTypeId()!=null,"lib_type", getAllForRelationVO.getTypeId());
-    	List<Concept> conceptList = list(conceptQe);
-    	
-    	Map<Long,Long> reCouMap = new HashMap<>();
-    	if(getAllForRelationVO.getRelationPosition()!=3){
-    		if(getAllForRelationVO.getRelationId()==null){
-    			throw new CommonException(CommonErrorCode.RPC_ERROR, "关系类型id必传！");
-    		}
-    		
-    		List<Long> conceptIdList = conceptList.stream().map(i->i.getId()).collect(Collectors.toList());
-    		QueryWrapper<Relation> relationQe = new QueryWrapper<>();
-    		relationQe.eq("relation_id", getAllForRelationVO.getRelationId());
-    		if(getAllForRelationVO.getRelationPosition()==1){
-    			relationQe.in("start_id", conceptIdList);
-    			relationQe.eq(getAllForRelationVO.getRelationConceptId()!=null,"end_id", getAllForRelationVO.getRelationConceptId());
-    			reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId,Collectors.counting()));
-    		}else{
-    			relationQe.in("end_id", conceptIdList);
-    			relationQe.eq(getAllForRelationVO.getRelationConceptId()!=null,"start_id", getAllForRelationVO.getRelationConceptId());
-    			reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getEndId,Collectors.counting()));
-    		}
-    	}
-    	
-    	for(Concept i : conceptList){
-    		if(reCouMap.get(i.getId())!=null
-    				||(getAllForRelationVO.getExcludedConceptIds()!=null&&getAllForRelationVO.getExcludedConceptIds().contains(i.getId()))){
-    			continue;
-    		}
-    		GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
-    		getAllForRelationDTO.setConceptId(i.getId());
-    		getAllForRelationDTO.setConceptName(i.getLibName());
-    		retList.add(getAllForRelationDTO);
-    	}
-    	
-    	return retList;
+        List<GetAllForRelationDTO> retList = new ArrayList<>();
+
+        QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+        conceptQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        conceptQe.like(StringUtil.isNotEmpty(getAllForRelationVO.getName()), "lib_name", getAllForRelationVO.getName());
+        conceptQe.eq(getAllForRelationVO.getTypeId() != null, "lib_type", getAllForRelationVO.getTypeId());
+        List<Concept> conceptList = list(conceptQe);
+
+        Map<Long, Long> reCouMap = new HashMap<>();
+        if (getAllForRelationVO.getRelationPosition() != 3) {
+            if (getAllForRelationVO.getRelationId() == null) {
+                throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "关系类型id必传！");
+            }
+
+            List<Long> conceptIdList = conceptList.stream().map(i -> i.getId()).collect(Collectors.toList());
+            QueryWrapper<Relation> relationQe = new QueryWrapper<>();
+            relationQe.eq("relation_id", getAllForRelationVO.getRelationId());
+            if (getAllForRelationVO.getRelationPosition() == 1) {
+                relationQe.in("start_id", conceptIdList);
+                relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "end_id", getAllForRelationVO.getRelationConceptId());
+                reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
+            } else {
+                relationQe.in("end_id", conceptIdList);
+                relationQe.eq(getAllForRelationVO.getRelationConceptId() != null, "start_id", getAllForRelationVO.getRelationConceptId());
+                reCouMap = relationFacade.list(relationQe).stream().collect(Collectors.groupingBy(Relation::getEndId, Collectors.counting()));
+            }
+        }
+
+        for (Concept i : conceptList) {
+            if (reCouMap.get(i.getId()) != null
+                    || (getAllForRelationVO.getExcludedConceptIds() != null && getAllForRelationVO.getExcludedConceptIds().contains(i.getId()))) {
+                continue;
+            }
+            GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
+            getAllForRelationDTO.setConceptId(i.getId());
+            getAllForRelationDTO.setConceptName(i.getLibName());
+            retList.add(getAllForRelationDTO);
+        }
+
+        return retList;
     }
 
     /**
@@ -232,7 +227,7 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public IPage<GetAllInformationDTO> getAllInformation(GetAllInformationVO getAllInformationVO) {
-    	IPage<GetAllInformationDTO> ipage = this.baseMapper.getAllInformation(getAllInformationVO);
+        IPage<GetAllInformationDTO> ipage = this.baseMapper.getAllInformation(getAllInformationVO);
         if (ipage.getRecords().size() > 0) {
             List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
@@ -306,11 +301,11 @@ public class ConceptFacade extends ConceptServiceImpl {
             throw new CommonException(CommonErrorCode.NOT_EXISTS);
         }
         if (concept.getIsDeleted().equals(removeConceptInfoVO.getIsDeleted())) {
-            if (removeConceptInfoVO.getIsDeleted().equals("Y")) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR, "该数据已删除！");
+            if (removeConceptInfoVO.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "该数据已删除！");
             }
-            if (removeConceptInfoVO.getIsDeleted().equals("N")) {
-                throw new CommonException(CommonErrorCode.RPC_ERROR, "该数据已恢复！");
+            if (removeConceptInfoVO.getIsDeleted().equals(IsDeleteEnum.N.getKey())) {
+                throw new CommonException(CommonErrorCode.IS_EXISTS, "该数据已恢复！");
             }
         }
 
@@ -330,7 +325,7 @@ public class ConceptFacade extends ConceptServiceImpl {
      */
     public GetConceptInfoDTO getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO) {
         GetConceptInfoDTO getConceptInfoDTO = new GetConceptInfoDTO();
-        
+
         Concept concept = this.getById(getConceptInfoDetailVO.getConceptId());
         if (concept == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS);
@@ -339,8 +334,8 @@ public class ConceptFacade extends ConceptServiceImpl {
         QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
         libraryInfoQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
         List<GetConceptInfoDetailDTO> getConceptInfoDetailDTOList = BeanUtil.listCopyTo(libraryinfoFacade.list(libraryInfoQe), GetConceptInfoDetailDTO.class);
-        getConceptInfoDetailDTOList.forEach(i->{
-        	i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+        getConceptInfoDetailDTOList.forEach(i -> {
+            i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
         });
 
         getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
@@ -380,9 +375,9 @@ public class ConceptFacade extends ConceptServiceImpl {
                 throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无法输入纯数字或者纯字符，请输入正确数据！");
             }
         }
-        
-        if(addConceptInfoVO.getMaxAge()<addConceptInfoVO.getMinAge()){
-        	throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "症状发生的最小年龄大于症状发生的最大年龄！");
+
+        if (addConceptInfoVO.getMaxAge() < addConceptInfoVO.getMinAge()) {
+            throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "症状发生的最小年龄大于症状发生的最大年龄！");
         }
 
         if (addConceptInfoVO.getDetailList().stream().distinct().count() != addConceptInfoVO.getDetailList().size()) {
@@ -391,17 +386,17 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         List<AddConceptInfoDetailVO> addConceptInfoDetailVOMainList = addConceptInfoVO.getDetailList().stream().filter(i -> i.getIsConcept() == 1).collect(Collectors.toList());
         if (addConceptInfoDetailVOMainList.size() == 0) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "无标准术语！");
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, lineNumStr + "无标准术语！");
         }
         if (addConceptInfoDetailVOMainList.size() > 1) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "标准术语只能有一个！");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, lineNumStr + "标准术语只能有一个！");
         }
 
         QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
         lexiconQe.eq("name", addConceptInfoVO.getType());
         Lexicon lexicon = lexiconFacade.getOne(lexiconQe);
         if (lexicon == null) {
-            throw new CommonException(CommonErrorCode.RPC_ERROR, lineNumStr + "数据有误，该类型信息在数据库中不存在！");
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, lineNumStr + "数据有误，该类型信息在数据库中不存在！");
         }
 
         List<LibraryInfo> saveOrUpdateLibraryInfoList = new ArrayList<>();
@@ -410,7 +405,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         //查询当前添加的术语是否已经在数据库中
         QueryWrapper<LibraryInfo> libraryInfoQe1 = new QueryWrapper<>();
-        libraryInfoQe1.eq("type", addConceptInfoVO.getType());
+        libraryInfoQe1.eq("type_id", lexicon.getId());
         libraryInfoQe1.in("name", addConceptInfoVO.getDetailList().stream().map(i -> i.getName()).collect(Collectors.toList()));
         List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe1);
 
@@ -479,6 +474,7 @@ public class ConceptFacade extends ConceptServiceImpl {
             }
 
             libraryInfo.setName(i.getName());
+            libraryInfo.setSpell(i.getSpell());
             libraryInfo.setRemark(i.getRemark());
             saveOrUpdateLibraryInfoList.add(libraryInfo);
         }
@@ -490,7 +486,6 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         for (LibraryInfo i : saveOrUpdateLibraryInfoList) {
             i.setId(null);
-            i.setSpell(Cn2SpellUtil.converterToFirstSpell(i.getName()));
             i.setConceptId(conceptId);
             i.setTypeId(lexicon.getId());
             i.setIsConcept(0);
@@ -499,7 +494,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         }
         libraryInfoMain.setIsConcept(1);
         libraryInfoMain.setRemark(addConceptInfoDetailVOMain.getRemark());
-        libraryInfoMain.setSpell(Cn2SpellUtil.converterToFirstSpell(libraryInfoMain.getName()));
+        libraryInfoMain.setSpell(libraryInfoMain.getSpell());
         libraryInfoMain.setConceptId(conceptId);
         libraryInfoMain.setGmtModified(now);
         libraryInfoMain.setModifier(currentUser);
@@ -530,7 +525,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
         return true;
     }
-    
+
     /**
      * 医学术语命名excel文件导入
      *
@@ -561,7 +556,7 @@ public class ConceptFacade extends ConceptServiceImpl {
 
                             Sheet sheet = wb.getSheetAt(0);
                             int count = 0;
-                            String libName, libType, otherNames, remark,sexType,minAge,maxAge;
+                            String libName, libType, otherNames, remark, sexType, minAge, maxAge;
                             String regEx = "[0-9]+|[`~·!@#$%^&*()+=|{}':;',\\[\\].<>/?~！@#￥%……&*（）——+|{}【】‘；：”“’。，、？]+";
                             String regExAge = "[0-9]|[1-9][0-9]|1[0-9]{2}|200";
                             for (Row row : sheet) {
@@ -595,18 +590,18 @@ public class ConceptFacade extends ConceptServiceImpl {
                                     sbf.append("第" + count + "行导入错误，说明最大可输入120个字；").append("<br/>");
                                     continue;
                                 }
-                                if(StringUtil.isNotEmpty(sexType)&&!sexType.matches("男|女|通用")){
-                                	sbf.append("第" + count + "行导入错误，性别须是男、女或者通用；").append("<br/>");
+                                if (StringUtil.isNotEmpty(sexType) && !sexType.matches("男|女|通用")) {
+                                    sbf.append("第" + count + "行导入错误，性别须是男、女或者通用；").append("<br/>");
                                 }
-                                if((StringUtil.isNotEmpty(minAge)&&!minAge.matches(regExAge))
-                                		||(StringUtil.isNotEmpty(maxAge)&&!maxAge.matches(regExAge))){
-                                	 sbf.append("第" + count + "行导入错误，年龄须是0-200；").append("<br/>");
-                                     continue;
+                                if ((StringUtil.isNotEmpty(minAge) && !minAge.matches(regExAge))
+                                        || (StringUtil.isNotEmpty(maxAge) && !maxAge.matches(regExAge))) {
+                                    sbf.append("第" + count + "行导入错误，年龄须是0-200；").append("<br/>");
+                                    continue;
                                 }
-                                if(StringUtil.isNotEmpty(minAge)
-                                		&&StringUtil.isNotEmpty(maxAge)
-                                		&&Integer.parseInt(minAge)>Integer.parseInt(maxAge)){
-                                	sbf.append("第" + count + "行导入错误，症状发生的最小年龄大于症状发生的最大年龄；").append("<br/>");
+                                if (StringUtil.isNotEmpty(minAge)
+                                        && StringUtil.isNotEmpty(maxAge)
+                                        && Integer.parseInt(minAge) > Integer.parseInt(maxAge)) {
+                                    sbf.append("第" + count + "行导入错误，症状发生的最小年龄大于症状发生的最大年龄；").append("<br/>");
                                     continue;
                                 }
 
@@ -616,12 +611,12 @@ public class ConceptFacade extends ConceptServiceImpl {
                                 addConceptInfoVO.setType(libType);
                                 addConceptInfoVO.setMinAge(Integer.parseInt(minAge));
                                 addConceptInfoVO.setMaxAge(Integer.parseInt(maxAge));
-                                if(sexType.equals("男")){
-                                	addConceptInfoVO.setSexType(1);
-                                }else if(sexType.equals("女")){
-                                	addConceptInfoVO.setSexType(2);
-                                }else{
-                                	addConceptInfoVO.setSexType(3);
+                                if (sexType.equals("男")) {
+                                    addConceptInfoVO.setSexType(1);
+                                } else if (sexType.equals("女")) {
+                                    addConceptInfoVO.setSexType(2);
+                                } else {
+                                    addConceptInfoVO.setSexType(3);
                                 }
                                 List<AddConceptInfoDetailVO> detailList = new ArrayList<>();
                                 for (String nm : otherNames.split("，")) {
@@ -639,6 +634,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                                     AddConceptInfoDetailVO addConceptInfoDetailVO = new AddConceptInfoDetailVO();
                                     addConceptInfoDetailVO.setName(nm);
                                     addConceptInfoDetailVO.setType(libType);
+                                    addConceptInfoDetailVO.setSpell(Cn2SpellUtil.converterToFirstSpell(nm));
                                     if (libName.equals(nm)) {
                                         addConceptInfoDetailVO.setIsConcept(1);
                                         addConceptInfoDetailVO.setRemark(remark);
@@ -782,7 +778,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     public List<Concept> getListByIds(List<Long> ids) {
         QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-        if (ids.size() == 1){
+        if (ids.size() == 1) {
             conceptQueryWrapper.eq("id", ids.get(0));
         } else {
             conceptQueryWrapper.in("id", ids);
@@ -893,7 +889,7 @@ public class ConceptFacade extends ConceptServiceImpl {
                 = this.getListByNamesAndType(conceptExistVO.getNameList(), conceptExistVO.getLibType());
         Map<String, List<Concept>> map1 = EntityUtil.makeEntityListMap(concepts, "libName");
         Map<String, List<Integer>> typeMap = new HashMap<>();
-        for(String key : map1.keySet()) {
+        for (String key : map1.keySet()) {
             List<Concept> list = map1.get(key);
             List<Integer> typeList = new ArrayList<>();
             if (ListUtil.isNotEmpty(list)) {
@@ -935,6 +931,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         indexVO.setLibType(libType);
         return this.index(indexVO);
     }
+
     /**
      * 根据概念Id列表获取概念列表Map
      *

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

@@ -28,7 +28,7 @@ public class LisSonContactFacade extends RelationServiceImpl {
 	
 	/**
      * 化验子项维护-列表
-     * @param relationContactListVO
+     * @param lisSonContactListVO
      * @return
      */
     public IPage<LisSonContactListDTO> lisSonContactList(LisSonContactListVO lisSonContactListVO) {

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

@@ -1,12 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.MultContactListDTO;
@@ -14,6 +7,12 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.service.impl.RelationServiceImpl;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.MultContactListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 医学术语关联业务层
@@ -22,17 +21,18 @@ import com.diagbot.vo.MultContactListVO;
  */
 @Component
 public class MultContactFacade extends RelationServiceImpl {
-	
-	@Autowired
+
+    @Autowired
     private UserServiceClient userServiceClient;
-	
-	/**
+
+    /**
      * 医学术语多层关联维护-列表
-     * @param relationContactListVO
+     *
+     * @param multContactListVO
      * @return
      */
     public IPage<MultContactListDTO> multContactList(MultContactListVO multContactListVO) {
-    	IPage<MultContactListDTO> ipage = this.baseMapper.multContactList(multContactListVO);
+        IPage<MultContactListDTO> ipage = this.baseMapper.multContactList(multContactListVO);
         if (ipage.getRecords().size() > 0) {
             List<String> ids = ipage.getRecords().stream().map(i -> i.getOperName()).distinct().collect(Collectors.toList());
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoDetailVO.java

@@ -24,7 +24,12 @@ public class AddConceptInfoDetailVO {
 	@ApiModelProperty(value="术语名称",required=true)
 	@NotBlank(message="术语名称必传")
     private String name;
-
+	
+    /**
+     * 术语拼音
+     */
+	@ApiModelProperty(value="术语拼音")
+    private String spell;
 	
     /**
      * 是否标准词,1:是,0:否

knowledgeman-service/src/main/java/com/diagbot/web/ConceptDetailController.java

@@ -2,15 +2,15 @@ package com.diagbot.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.GetConceptDetailListDTO;
 import com.diagbot.dto.ConceptDetailDTO;
 import com.diagbot.dto.ConceptIndexDTO;
+import com.diagbot.dto.GetConceptDetailListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptDetailFacade;
 import com.diagbot.vo.AddConceptDetailVO;
+import com.diagbot.vo.ConceptIndexVO;
 import com.diagbot.vo.GetConceptDetailListVO;
 import com.diagbot.vo.GetConceptDetailVO;
-import com.diagbot.vo.ConceptIndexVO;
 import com.diagbot.vo.RemoveConceptDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -26,7 +26,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Weixuan Huang
@@ -37,17 +37,17 @@ import java.util.List;
 @SuppressWarnings("unchecked")
 @Api(value = "知识库标准化-医学术语静态知识维护相关API", tags = { "知识库标准化-医学术语静态知识维护相关API" })
 public class ConceptDetailController {
-	
+
     @Autowired
     private ConceptDetailFacade conceptDetailFacade;
-    
+
     @ApiOperation(value = "知识库标准化-获取医学术语静态知识列表[by:rengb]")
     @PostMapping("/page")
     @SysLogger("page")
     public RespDTO<IPage<GetConceptDetailListDTO>> page(@RequestBody GetConceptDetailListVO getConceptDetailListVO) {
         return RespDTO.onSuc(conceptDetailFacade.getListFac(getConceptDetailListVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语静态知识删除|恢复[by:rengb]")
     @PostMapping("/delete")
     @SysLogger("delete")
@@ -55,14 +55,14 @@ public class ConceptDetailController {
     public RespDTO<Boolean> delete(@Valid @RequestBody RemoveConceptDetailVO removeConceptDetailVO) {
         return RespDTO.onSuc(conceptDetailFacade.delete(removeConceptDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-获取医学术语静态知识详情[by:rengb]")
     @PostMapping("/getByConceptId")
     @SysLogger("getByConceptId")
     public RespDTO<ConceptDetailDTO> getByConceptId(@Valid @RequestBody GetConceptDetailVO getConceptDetailVO) {
         return RespDTO.onSuc(conceptDetailFacade.getByConceptId(getConceptDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语静态知识添加或者编辑[by:rengb]")
     @PostMapping("/insertOrUpdate")
     @SysLogger("insertOrUpdate")

knowledgeman-service/src/main/java/com/diagbot/web/DisclaimerInformationController.java

@@ -1,15 +1,6 @@
 package com.diagbot.web;
 
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.DisclaimerInformationDTO;
@@ -19,9 +10,16 @@ import com.diagbot.vo.DisclaimerInformationAllVO;
 import com.diagbot.vo.DisclaimerInformationIdVO;
 import com.diagbot.vo.DisclaimerInformationTitleVO;
 import com.diagbot.vo.DisclaimerInformationVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 
 /**
@@ -43,9 +41,7 @@ public class DisclaimerInformationController {
     @SysLogger("getDisclaimerInformations")
     @Transactional
     public RespDTO<IPage<DisclaimerInformationDTO>> getDisclaimerInformations(@RequestBody DisclaimerInformationTitleVO disclaimerInformationTitleVO) {
-
-    	IPage<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
-
+        IPage<DisclaimerInformationDTO> data = disclaimerInformationFacade.getDisclaimerInformation(disclaimerInformationTitleVO, disclaimerInformationTitleVO.getTitle());
         return RespDTO.onSuc(data);
     }
 
@@ -54,9 +50,7 @@ public class DisclaimerInformationController {
     @SysLogger("addDisclaimerInformations")
     @Transactional
     public RespDTO<Boolean> addDisclaimerInformations(@Valid @RequestBody DisclaimerInformationVO disclaimerInformationVO) {
-
         boolean res = disclaimerInformationFacade.addDisclaimerInformation(disclaimerInformationVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -65,9 +59,7 @@ public class DisclaimerInformationController {
     @SysLogger("updateDisclaimerInformations")
     @Transactional
     public RespDTO<Boolean> updateDisclaimerInformations(@Valid @RequestBody DisclaimerInformationAllVO disclaimerInformationAllVO) {
-
         boolean res = disclaimerInformationFacade.updateDisclaimerInformation(disclaimerInformationAllVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -76,9 +68,7 @@ public class DisclaimerInformationController {
     @SysLogger("cancelDisclaimerInformations")
     @Transactional
     public RespDTO<Boolean> cancelDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
-
         boolean res = disclaimerInformationFacade.cancelDisclaimerInformation(disclaimerInformationIdVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -87,9 +77,7 @@ public class DisclaimerInformationController {
     @SysLogger("startDisclaimerInformations")
     @Transactional
     public RespDTO<Boolean> startDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationIdVO) {
-
         boolean res = disclaimerInformationFacade.startDisclaimerInformations(disclaimerInformationIdVO);
-
         return RespDTO.onSuc(res);
     }
 
@@ -98,9 +86,7 @@ public class DisclaimerInformationController {
     @SysLogger("endDisclaimerInformations")
     @Transactional
     public RespDTO<Boolean> endDisclaimerInformations(@Valid @RequestBody DisclaimerInformationIdVO disclaimerInformationEndVO) {
-
         boolean res = disclaimerInformationFacade.endDisclaimerInformations(disclaimerInformationEndVO);
-
         return RespDTO.onSuc(res);
     }
 }

knowledgeman-service/src/main/java/com/diagbot/web/IndexConfigController.java

@@ -58,7 +58,7 @@ public class IndexConfigController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "知识库标准化-慢病指标值关联维护——修改关联[by:wangfeng]", notes = "指标公表名+indexUnique; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
+    @ApiOperation(value = "知识库标准化-慢病指标值关联维护——修改关联[by:wangfeng]", notes = "术语id+conceptId; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
     @PostMapping("/updateIndexConfigList")
     @SysLogger("updateIndexConfigList")
     @Transactional
@@ -67,7 +67,7 @@ public class IndexConfigController {
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "知识库标准化-慢病指标值关联维护——添加关联[by:wangfeng]", notes = "指标公表名+indexUnique; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
+    @ApiOperation(value = "知识库标准化-慢病指标值关联维护——添加关联[by:wangfeng]", notes = "术语id+conceptId; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
     @PostMapping("/saveIndexConfigLists")
     @SysLogger("saveIndexConfigLists")
     @Transactional

knowledgeman-service/src/main/java/com/diagbot/web/LexiconController.java

@@ -37,8 +37,6 @@ import springfox.documentation.annotations.ApiIgnore;
 @RequestMapping("/lexicon")
 @SuppressWarnings("unchecked")
 @Api(value = "术语类型维护相关API", tags = { "术语类型维护相关API" })
-@ApiIgnore
-@Deprecated
 public class LexiconController {
 	
     @Autowired
@@ -54,6 +52,8 @@ public class LexiconController {
     @ApiOperation(value = "获取术语类型列表[by:rengb]")
     @PostMapping("/getLexiconList")
     @SysLogger("getLexiconList")
+    @ApiIgnore
+    @Deprecated
     public RespDTO<IPage<GetLexiconListDTO>> getLexiconList(@RequestBody GetLexiconListVO getLexiconListVO) {
         return RespDTO.onSuc(lexiconFacade.getLexiconList(getLexiconListVO));
     }
@@ -62,6 +62,8 @@ public class LexiconController {
     @PostMapping("/addLexicon")
     @SysLogger("addLexicon")
     @Transactional
+    @ApiIgnore
+    @Deprecated
     public RespDTO<Boolean> addLexicon(@Valid @RequestBody AddLexiconVO addLexiconVO) {
         return RespDTO.onSuc(lexiconFacade.addLexicon(addLexiconVO));
     }

knowledgeman-service/src/main/java/com/diagbot/web/LisSonContactController.java

@@ -1,14 +1,5 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.LisSonContactListDTO;
@@ -20,13 +11,20 @@ import com.diagbot.vo.LisSonContactListVO;
 import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Weixuan Huang
@@ -37,19 +35,19 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 @Api(value = "化验子项维护相关API", tags = { "知识库标准化-化验子项维护相关API" })
 public class LisSonContactController {
-	
+
     @Autowired
     private RelationContactFacade relationContactFacade;
     @Autowired
     private LisSonContactFacade lisSonContactFacade;
-    
+
     @ApiOperation(value = "知识库标准化-化验子项维护-列表[by:rengb]")
     @PostMapping("/lisSonContactList")
     @SysLogger("lisSonContactList")
     public RespDTO<IPage<LisSonContactListDTO>> lisSonContactList(@RequestBody LisSonContactListVO lisSonContactListVO) {
         return RespDTO.onSuc(lisSonContactFacade.lisSonContactList(lisSonContactListVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-化验子项维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")
     @SysLogger("addRelation")
@@ -57,14 +55,14 @@ public class LisSonContactController {
     public RespDTO<Boolean> addRelation(@Valid @RequestBody RelationNodeVO relationNodeVO) {
         return RespDTO.onSuc(relationContactFacade.addRelation(relationNodeVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-化验子项维护-详情[by:rengb]")
     @PostMapping("/relationContactDetail")
     @SysLogger("relationContactDetail")
     public RespDTO<RelationNodeDTO> relationContactDetail(@Valid @RequestBody RelationContactDetailVO relationContactDetailVO) {
         return RespDTO.onSuc(relationContactFacade.relationContactDetail(relationContactDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-化验子项维护-删除或者恢复[by:rengb]")
     @PostMapping("/removeRelationContact")
     @SysLogger("removeRelationContact")
@@ -72,5 +70,5 @@ public class LisSonContactController {
     public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody RemoveRelationContactVO removeRelationContactVO) {
         return RespDTO.onSuc(relationContactFacade.removeRelationContact(removeRelationContactVO));
     }
-    
+
 }

knowledgeman-service/src/main/java/com/diagbot/web/MultContactController.java

@@ -1,14 +1,5 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.MultContactListDTO;
@@ -20,13 +11,20 @@ import com.diagbot.vo.MultContactListVO;
 import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Weixuan Huang
@@ -37,19 +35,19 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 @Api(value = "医学术语多层关联维护相关API", tags = { "知识库标准化-医学术语多层关联维护相关API" })
 public class MultContactController {
-	
+
     @Autowired
     private RelationContactFacade relationContactFacade;
     @Autowired
     private MultContactFacade multContactFacade;
-    
+
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-列表[by:rengb]")
     @PostMapping("/multContactList")
     @SysLogger("multContactList")
     public RespDTO<IPage<MultContactListDTO>> multContactList(@RequestBody MultContactListVO multContactListVO) {
         return RespDTO.onSuc(multContactFacade.multContactList(multContactListVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")
     @SysLogger("addRelation")
@@ -57,14 +55,14 @@ public class MultContactController {
     public RespDTO<Boolean> addRelation(@Valid @RequestBody RelationNodeVO relationNodeVO) {
         return RespDTO.onSuc(relationContactFacade.addRelation(relationNodeVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-详情[by:rengb]")
     @PostMapping("/relationContactDetail")
     @SysLogger("relationContactDetail")
     public RespDTO<RelationNodeDTO> relationContactDetail(@Valid @RequestBody RelationContactDetailVO relationContactDetailVO) {
         return RespDTO.onSuc(relationContactFacade.relationContactDetail(relationContactDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语多层关联维护-删除或者恢复[by:rengb]")
     @PostMapping("/removeRelationContact")
     @SysLogger("removeRelationContact")
@@ -72,5 +70,5 @@ public class MultContactController {
     public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody RemoveRelationContactVO removeRelationContactVO) {
         return RespDTO.onSuc(relationContactFacade.removeRelationContact(removeRelationContactVO));
     }
-    
+
 }

knowledgeman-service/src/main/java/com/diagbot/web/RelationContactController.java

@@ -1,14 +1,5 @@
 package com.diagbot.web;
 
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RelationContactListDTO;
@@ -19,13 +10,20 @@ import com.diagbot.vo.RelationContactDetailVO;
 import com.diagbot.vo.RelationContactListVO;
 import com.diagbot.vo.RelationNodeVO;
 import com.diagbot.vo.RemoveRelationContactVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.validation.Valid;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Weixuan Huang
@@ -36,17 +34,17 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 @Api(value = "医学术语关联维护相关API", tags = { "知识库标准化-医学术语关联维护相关API" })
 public class RelationContactController {
-	
+
     @Autowired
     private RelationContactFacade relationContactFacade;
-    
+
     @ApiOperation(value = "医学术语关联维护-列表[by:rengb]")
     @PostMapping("/relationContactList")
     @SysLogger("relationContactList")
     public RespDTO<IPage<RelationContactListDTO>> relationContactList(@RequestBody RelationContactListVO relationContactListVO) {
         return RespDTO.onSuc(relationContactFacade.relationContactList(relationContactListVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语关联维护-添加或者编辑[by:rengb]")
     @PostMapping("/addRelation")
     @SysLogger("addRelation")
@@ -54,14 +52,14 @@ public class RelationContactController {
     public RespDTO<Boolean> addRelation(@Valid @RequestBody RelationNodeVO relationNodeVO) {
         return RespDTO.onSuc(relationContactFacade.addRelation(relationNodeVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语关联维护-详情[by:rengb]")
     @PostMapping("/relationContactDetail")
     @SysLogger("relationContactDetail")
     public RespDTO<RelationNodeDTO> relationContactDetail(@Valid @RequestBody RelationContactDetailVO relationContactDetailVO) {
         return RespDTO.onSuc(relationContactFacade.relationContactDetail(relationContactDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语关联维护-删除或者恢复[by:rengb]")
     @PostMapping("/removeRelationContact")
     @SysLogger("removeRelationContact")
@@ -69,5 +67,5 @@ public class RelationContactController {
     public RespDTO<Boolean> removeRelationContact(@Valid @RequestBody RemoveRelationContactVO removeRelationContactVO) {
         return RespDTO.onSuc(relationContactFacade.removeRelationContact(removeRelationContactVO));
     }
-    
+
 }

knowledgeman-service/src/main/java/com/diagbot/web/RelationController.java

@@ -1,17 +1,5 @@
 package com.diagbot.web;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetRelationInfoDetailDTO;
@@ -22,14 +10,24 @@ import com.diagbot.vo.AddRelationInfoVO;
 import com.diagbot.vo.GetRelationInfoDetailVO;
 import com.diagbot.vo.GetRelationInfoListVO;
 import com.diagbot.vo.RemoveRelationInfoVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 import springfox.documentation.annotations.ApiIgnore;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.validation.Valid;
+
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author Weixuan Huang
@@ -40,17 +38,17 @@ import springfox.documentation.annotations.ApiIgnore;
 @SuppressWarnings("unchecked")
 @Api(value = "医学术语关系维护相关API", tags = { "知识库标准化-医学术语关系维护相关API" })
 public class RelationController {
-	
+
     @Autowired
     private RelationFacade relationFacade;
-    
+
     @ApiOperation(value = "知识库标准化-获取医学术语关系列表[by:rengb]")
     @PostMapping("/getRelationInfoList")
     @SysLogger("getRelationInfoList")
     public RespDTO<IPage<GetRelationInfoListDTO>> getRelationInfoList(@RequestBody GetRelationInfoListVO getRelationInfoListVO) {
         return RespDTO.onSuc(relationFacade.getRelationInfoList(getRelationInfoListVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语关系删除或者恢复[by:rengb]")
     @PostMapping("/removeRelationInfo")
     @SysLogger("removeRelationInfo")
@@ -58,7 +56,7 @@ public class RelationController {
     public RespDTO<Boolean> removeRelationInfo(@Valid @RequestBody RemoveRelationInfoVO removeRelationInfoVO) {
         return RespDTO.onSuc(relationFacade.removeRelationInfo(removeRelationInfoVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-获取医学术语关系详情[by:rengb]")
     @PostMapping("/getRelationInfoDetail")
     @SysLogger("getRelationInfoDetail")
@@ -66,7 +64,7 @@ public class RelationController {
     public RespDTO<GetRelationInfoDetailDTO> getRelationInfoDetail(@Valid @RequestBody GetRelationInfoDetailVO getRelationInfoDetailVO) {
         return RespDTO.onSuc(relationFacade.getRelationInfoDetail(getRelationInfoDetailVO));
     }
-    
+
     @ApiOperation(value = "知识库标准化-医学术语关系添加或者编辑[by:rengb]")
     @PostMapping("/addRelationInfo")
     @SysLogger("addRelationInfo")
@@ -74,12 +72,12 @@ public class RelationController {
     public RespDTO<Boolean> addRelationInfo(@Valid @RequestBody AddRelationInfoVO addRelationInfoVO) {
         return RespDTO.onSuc(relationFacade.addRelationInfo(addRelationInfoVO));
     }
-    
+
     @ApiOperation(value = "医学术语关系excel文件导入[by:rengb]")
     @PostMapping("/relationInfoExcelIm")
     @Transactional
-    public RespDTO<Boolean> relationInfoExcelIm(@RequestParam("uploadfile") MultipartFile file,HttpServletRequest request) {
+    public RespDTO<Boolean> relationInfoExcelIm(@RequestParam("uploadfile") MultipartFile file, HttpServletRequest request) {
         return RespDTO.onSuc(relationFacade.relationInfoExcelIm(file));
     }
-    
+
 }

knowledgeman-service/src/main/java/com/diagbot/web/ScaleContentController.java

@@ -83,7 +83,7 @@ public class ScaleContentController {
                     "        恢复传值'N'")
     @PostMapping("/delete")
     @SysLogger("delete")
-    public  RespDTO<Boolean> delete(@Valid @RequestBody DeleteScaleVO deleteScaleVO) {
+    public RespDTO<Boolean> delete(@Valid @RequestBody DeleteScaleVO deleteScaleVO) {
         scaleContentFacade.delete(deleteScaleVO);
         return RespDTO.onSuc(true);
     }

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

@@ -10,7 +10,7 @@
         <result column="gmt_modified" property="gmtModified" />
         <result column="creator" property="creator" />
         <result column="modifier" property="modifier" />
-        <result column="index_unique" property="indexUnique" />
+        <result column="concept_id" property="conceptId" />
         <result column="disease_id" property="diseaseId" />
         <result column="index_desc" property="indexDesc" />
         <result column="order_no" property="orderNo" />
@@ -32,7 +32,7 @@
 	<if test="indexConfigVO.diseaseName != null">
 		AND b.lib_name LIKE CONCAT('%', #{indexConfigVO.diseaseName}, '%')
 	</if>
-	GROUP BY a.concept_id
+	GROUP BY a.disease_id
 	ORDER BY a.gmt_create DESC
 </select>
 <select id="queryIndexConfigDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">

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

@@ -17,7 +17,7 @@
     <select id="getLexiconList" resultType="com.diagbot.dto.GetLexiconListDTO">
     	SELECT  
 			gmt_modified,modifier,name
-		FROM `lexicon`
+		FROM `kl_lexicon`
 		WHERE is_deleted="N"
     	<if test="name!=null and name!=''">
     		and name like concat('%',#{name},'%')