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

aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -1,24 +1,23 @@
 package com.diagbot.client;
 
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.hystrix.TranServiceHystrix;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.HospitalDeptInfoDTO;
-import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
+import com.diagbot.vo.HospitalDeptInfoVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * @Description: 调用信息对接层服务
@@ -44,7 +43,7 @@ public interface TranServiceClient {
      */
     @PostMapping("/diseaseIcd/getDiseaseIcds")
     RespDTO<List<GetDiseaseIcdDTO>> getDiseaseIcds(@RequestBody GetDiseaseIcdVO getDiseaseIcdVO);
-    
+
     /**
      * 获取页面顶部病人医生科室信息
      *
@@ -102,10 +101,11 @@ public interface TranServiceClient {
     /**
      * 数据服务模式是否对外对接
      *
+     * @param hosCodeVO
      * @return
      */
-    @PostMapping("/dataService/isDocking")
-    RespDTO<Boolean> isDocking();
+    @PostMapping("/dataService/isConnect")
+    RespDTO<Boolean> isConnect(HosCodeVO hosCodeVO);
 
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
@@ -125,19 +125,21 @@ public interface TranServiceClient {
     @PostMapping("/pacsConfig/getPacsConfigByUniqueNameAndHosCode")
     RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO);
 
-	/**
-	 * 指标数据获取
-	 * @param indexDataFindVO
-	 * @return
-	 */
-	@PostMapping(value = "/indexData/getIndexDatas")
-	RespDTO<List<IndexDataDTO>> getIndexDatas(@RequestBody IndexDataiIds indexDataFindVO);
+    /**
+     * 指标数据获取
+     *
+     * @param indexDataFindVO
+     * @return
+     */
+    @PostMapping(value = "/indexData/getIndexDatas")
+    RespDTO<List<IndexDataDTO>> getIndexDatas(@RequestBody IndexDataiIds indexDataFindVO);
 
-	/**
-	 * 指标数据保存
-	 * @param indexDataSaveVO
-	 * @return
-	 */
-	@PostMapping(value = "/indexData/saveIndexDatas")
-	RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
+    /**
+     * 指标数据保存
+     *
+     * @param indexDataSaveVO
+     * @return
+     */
+    @PostMapping(value = "/indexData/saveIndexDatas")
+    RespDTO<Boolean> saveIndexDatas(@RequestBody IndexDataSaveVO indexDataSaveVO);
 }

aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -42,7 +42,7 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "getDiseaseIcds");
         return null;
     }
-    
+
     @Override
     public RespDTO<GetTopPatientInfoDTO> getTopPatientInfo(GetTopPatientInfoVO getTopPatientInfoVO) {
         log.error("【hystrix】调用{}异常", "getTopPatientInfo");
@@ -112,11 +112,12 @@ public class TranServiceHystrix implements TranServiceClient {
     /**
      * 数据服务模式是否对外对接
      *
+     * @param hosCodeVO
      * @return
      */
     @Override
-    public RespDTO<Boolean> isDocking() {
-        log.error("【hystrix】调用{}异常", "isDocking");
+    public RespDTO<Boolean> isConnect(HosCodeVO hosCodeVO) {
+        log.error("【hystrix】调用{}异常", "isConnect");
         return null;
     }
 
@@ -144,16 +145,15 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-	@Override
-	public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid IndexDataiIds indexDataFindVO) {
-		log.error("【hystrix】调用{}异常", "getIndexDatas");
-		return null;
-	}
-
-	@Override
-	public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
-		log.error("【hystrix】调用{}异常", "saveIndexDatas");
-		return null;
-	}
+    @Override
+    public RespDTO<List<IndexDataDTO>> getIndexDatas(@Valid IndexDataiIds indexDataFindVO) {
+        log.error("【hystrix】调用{}异常", "getIndexDatas");
+        return null;
+    }
 
+    @Override
+    public RespDTO<Boolean> saveIndexDatas(@Valid IndexDataSaveVO indexDataSaveVO) {
+        log.error("【hystrix】调用{}异常", "saveIndexDatas");
+        return null;
+    }
 }

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -108,8 +108,8 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId());
-        List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
-        if (ListUtil.isNotEmpty(conceptDetailList)) {
+        Integer res = this.count(conceptDetailQueryWrapper);
+        if (res > 0) {
             return true;
         } else {
             return false;
@@ -127,15 +127,18 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         List<Concept> concepts = conceptFacade.getListByNamesAndType(nameList, libType);
         Map<String, Concept> retMap = new LinkedHashMap<>();
         if (ListUtil.isNotEmpty(concepts)) {
-            List<Long> conceptIds = concepts.stream().map(concept -> concept.getId()).collect(Collectors.toList());
+            List<Long> conceptIds
+                    = concepts.stream().map(concept -> concept.getId()).collect(Collectors.toList());
             QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
             conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("concept_id", conceptIds);
             List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
             if (ListUtil.isNotEmpty(conceptDetailList)) {
-                Map<Long, ConceptDetail> conceptDetailMap = EntityUtil.makeEntityMap(conceptDetailList, "conceptId");
+                Map<Long, List<ConceptDetail>> conceptDetailMap
+                        = EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
                 for (Concept concept : concepts) {
-                    if (conceptDetailMap.containsKey(concept.getId()) && conceptDetailMap.get(concept.getId()) != null) {
+                    if (conceptDetailMap.containsKey(concept.getId())
+                            && ListUtil.isNotEmpty(conceptDetailMap.get(concept.getId()))) {
                         retMap.put(concept.getLibName(), concept);
                     }
                 }

aipt-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -64,18 +64,18 @@ public class PushFacade {
     public PushDTO pushInner(SearchVo searchVo) {
         PushDTO pushDTO = new PushDTO();
         //是否对接
-        RespDTO<Boolean> dockingRes = tranServiceClient.isDocking();
-        Boolean isDocking = false;
-        if (RespDTOUtil.respIsOK(dockingRes)) {
-            isDocking = dockingRes.data;
-            if (isDocking) {
-                if (StringUtil.isBlank(searchVo.getHosCode())) {
-                    throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
-                }
+        Boolean isConnect = false;
+        if (StringUtil.isNotBlank(searchVo.getHosCode())) {
+            HosCodeVO hosCodeVO = new HosCodeVO();
+            hosCodeVO.setHosCode(searchVo.getHosCode());
+            RespDTO<Boolean> connectRes = tranServiceClient.isConnect(hosCodeVO);
+            if (RespDTOUtil.respIsOK(connectRes)) {
+                isConnect = connectRes.data;
             }
         }
+
         //化验转公表项处理
-        if (isDocking) {
+        if (isConnect) {
             List<LisResult> lisArr = searchVo.getLisArr();
             lisArr = addUniqueName(lisArr, searchVo.getHosCode());
             searchVo.setLisArr(lisArr);
@@ -118,7 +118,7 @@ public class PushFacade {
                 List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey());
-                    if (isDocking) {
+                    if (isConnect) {
                         lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
                     }
                     pushDTO.setLab(lisDTO);
@@ -132,7 +132,7 @@ public class PushFacade {
                 List<String> nameList = pacs.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(nameList)) {
                     List<ConceptPushDTO> pacsDTO = getConceptDTOList(nameList, LexiconTypeEnum.PACS_ITEMS.getKey());
-                    if (isDocking) {
+                    if (isConnect) {
                         pacsDTO = addClientName(pacsDTO, searchVo.getHosCode(), ConceptTypeEnum.Pacs.getKey());
                     }
                     pushDTO.setPacs(pacsDTO);
@@ -162,7 +162,7 @@ public class PushFacade {
                         }
                         if (ListUtil.isNotEmpty(hrNameList)) {
                             List<ConceptPushDTO> hrDisDTO = getConceptDTOList(hrNameList, LexiconTypeEnum.DIAGNOSIS.getKey());
-                            if (isDocking) {
+                            if (isConnect) {
                                 hrDisDTO = addClientName(hrDisDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
                             }
                             disMapDTO.put("警惕", hrDisDTO);
@@ -188,7 +188,7 @@ public class PushFacade {
                     List<String> nameListByDisClass = entry.getValue().stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
                     if (ListUtil.isNotEmpty(nameListByDisClass)) {
                         List<ConceptPushDTO> disDTO = getConceptDTOList(nameListByDisClass, LexiconTypeEnum.DIAGNOSIS.getKey());
-                        if (isDocking) {
+                        if (isConnect) {
                             disDTO = addClientName(disDTO, searchVo.getHosCode(), ConceptTypeEnum.Disease.getKey());
                         }
                         disMapDTO.put(entry.getKey(), disDTO);

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -28,6 +28,7 @@ public class SearchVo {
     private String past;
     private String other;
     private String vital;
+    @ApiModelProperty(hidden = true)
     private String lis;
     private List<LisResult> lisArr;
     private String pacs;

config-server/src/main/resources/shared/knowledgeman-service-dev.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-man?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

config-server/src/main/resources/shared/knowledgeman-service-local.yml

@@ -7,7 +7,7 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://192.168.2.235:3306/med-dev?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
+      url: jdbc:mysql://192.168.2.235:3306/med-man?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false
       username: root
       password: diagbot@20180822
       # 连接池的配置信息

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -160,14 +160,6 @@ public interface TranServiceClient {
     @PostMapping("/diseaseIcd/getDiseaseIcdByHosCode")
     RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO);
 
-    /**
-     * 数据服务模式是否对外对接
-     *
-     * @return
-     */
-    @PostMapping("/dataService/isDocking")
-    RespDTO<Boolean> isDocking();
-
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
      *

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -157,17 +157,6 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
-    /**
-     * 数据服务模式是否对外对接
-     *
-     * @return
-     */
-    @Override
-    public RespDTO<Boolean> isDocking() {
-        log.error("【hystrix】调用{}异常", "isDocking");
-        return null;
-    }
-
     /**
      * 根据医院编码获取化验公表映射关系，公表项做key
      *

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

@@ -16,6 +16,21 @@ public class ConceptIndexDTO {
      * 名称
      */
     private String name;
+    
+    /**
+     * 名称(类型)
+     */
+    private String nameType;
+    
+    /**
+     * 类型id
+     */
+    private Long typeId;
+    
+    /**
+     * 类型
+     */
+    private String type;
 
     /**
      * 量表概念id

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

@@ -25,6 +25,12 @@ public class GetAllForRelationDTO {
 	@ApiModelProperty(value="概念名称")
 	private String conceptName;
 	
+	/**
+	 * 概念名称(类型)
+	 */
+	@ApiModelProperty(value="概念名称(类型)")
+	private String conceptNameType;
+	
 	
 
 }

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

@@ -46,6 +46,24 @@ public class GetConceptDetailListDTO {
      */
     @ApiModelProperty(value="概念名称")
     private String libName;
+    
+    /**
+     * 概念名称(类型)
+     */
+    @ApiModelProperty(value="概念名称(类型)")
+    private String nameType;
+    
+    /**
+     * 类型id
+     */
+    @ApiModelProperty(value="类型id")
+    private Long typeId;
+    
+    /**
+     * 类型名称
+     */
+    @ApiModelProperty(value="类型名称")
+    private String type;
 
 
     /**

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

@@ -10,6 +10,7 @@ import com.diagbot.dto.ConceptIndexDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.ConceptDetailService;
@@ -63,6 +64,8 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
             }
             ipage.getRecords().forEach(i -> {
                 i.setModifier(respDTO.data.get(i.getModifier()));
+                i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+                i.setNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getTypeId().intValue())+")");
             });
         }
         return ipage;
@@ -151,7 +154,12 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
      * @return
      */
     public List<ConceptIndexDTO> indexFac(ConceptIndexVO conceptIndexVO) {
-        return this.index(conceptIndexVO);
+    	List<ConceptIndexDTO> retList = this.index(conceptIndexVO);
+    	retList.forEach(i->{
+    		i.setType(LexiconTypeEnum.getName(i.getTypeId().intValue()));
+    		i.setNameType(i.getName()+"("+LexiconTypeEnum.getName(i.getTypeId().intValue())+")");
+    	});
+        return retList;
     }
 
 }

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

@@ -218,6 +218,7 @@ public class ConceptFacade extends ConceptServiceImpl {
             GetAllForRelationDTO getAllForRelationDTO = new GetAllForRelationDTO();
             getAllForRelationDTO.setConceptId(i.getId());
             getAllForRelationDTO.setConceptName(i.getLibName());
+            getAllForRelationDTO.setConceptNameType(i.getLibName()+"("+LexiconTypeEnum.getName(i.getLibType().intValue())+")");
             retList.add(getAllForRelationDTO);
         }
 

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

@@ -1,13 +1,5 @@
 package com.diagbot.facade;
 
-import java.util.Date;
-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.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
@@ -15,6 +7,7 @@ import com.diagbot.dto.GetAllLexiconDTO;
 import com.diagbot.dto.GetLexiconListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Lexicon;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LexiconServiceImpl;
@@ -25,6 +18,13 @@ import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddLexiconVO;
 import com.diagbot.vo.GetAllLexiconVO;
 import com.diagbot.vo.GetLexiconListVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 术语类型业务层
@@ -33,73 +33,76 @@ import com.diagbot.vo.GetLexiconListVO;
  */
 @Component
 public class LexiconFacade extends LexiconServiceImpl {
-	
+
     @Autowired
     private UserServiceClient userServiceClient;
-	
-	 /**
+
+    /**
      * 获取所有术语类型
+     *
      * @param getAllLexiconVO
      * @return
      */
-    public List<GetAllLexiconDTO> getAllLexicon(GetAllLexiconVO getAllLexiconVO){
-    	QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
-    	lexiconQe.eq("is_deleted", "N");
-    	if(StringUtil.isNotBlank(getAllLexiconVO.getName())){
-    		lexiconQe.like("name", getAllLexiconVO.getName());
-    	}
-    	
-    	return BeanUtil.listCopyTo(list(lexiconQe), GetAllLexiconDTO.class);
+    public List<GetAllLexiconDTO> getAllLexicon(GetAllLexiconVO getAllLexiconVO) {
+        QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
+        lexiconQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        if (StringUtil.isNotBlank(getAllLexiconVO.getName())) {
+            lexiconQe.like("name", getAllLexiconVO.getName());
+        }
+
+        return BeanUtil.listCopyTo(list(lexiconQe), GetAllLexiconDTO.class);
     }
-    
+
     /**
      * 获取术语类型列表
+     *
      * @param getLexiconListVO
      * @return
      */
     public IPage<GetLexiconListDTO> getLexiconList(GetLexiconListVO getLexiconListVO) {
-    	IPage<GetLexiconListDTO> ipage = this.baseMapper.getLexiconList(getLexiconListVO);
-    	if(ipage.getRecords().size()>0){
-    		List<String> ids = ipage.getRecords().stream().map(i->i.getModifier()).distinct().collect(Collectors.toList());
-        	RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
-        	if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
+        IPage<GetLexiconListDTO> ipage = this.baseMapper.getLexiconList(getLexiconListVO);
+        if (ipage.getRecords().size() > 0) {
+            List<String> ids = ipage.getRecords().stream().map(i -> i.getModifier()).distinct().collect(Collectors.toList());
+            RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
+            if (respDTO == null || !CommonErrorCode.OK.getCode().equals(respDTO.code)) {
                 throw new CommonException(CommonErrorCode.RPC_ERROR,
                         "获取用户信息失败");
             }
-        	ipage.getRecords().forEach(i->{
-        		i.setModifier(respDTO.data.get(i.getModifier()));
-        	});	
-    	}
+            ipage.getRecords().forEach(i -> {
+                i.setModifier(respDTO.data.get(i.getModifier()));
+            });
+        }
         return ipage;
     }
-    
+
     /**
      * 术语类型添加
+     *
      * @param addLexiconVO
      * @return
      */
-	public Boolean addLexicon(AddLexiconVO addLexiconVO){
-		String currentUser = UserUtils.getCurrentPrincipleID();
-		Date now = DateUtil.now();
-		
-		QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
-		lexiconQe.eq("name", addLexiconVO.getName());
-		Lexicon lexicon = getOne(lexiconQe);
-		if(lexicon==null){
-			lexicon = new Lexicon();
-			lexicon.setName(addLexiconVO.getName());
-			lexicon.setCreator(currentUser);
-			lexicon.setGmtCreate(now);
-		}else if(lexicon.getIsDeleted().equals("Y")){
-			lexicon.setIsDeleted("N");
-		}else{
-			throw new CommonException(CommonErrorCode.IS_EXISTS);
-		}
-		
-		lexicon.setGmtModified(now);
-		lexicon.setModifier(currentUser);
+    public Boolean addLexicon(AddLexiconVO addLexiconVO) {
+        String currentUser = UserUtils.getCurrentPrincipleID();
+        Date now = DateUtil.now();
+
+        QueryWrapper<Lexicon> lexiconQe = new QueryWrapper<>();
+        lexiconQe.eq("name", addLexiconVO.getName());
+        Lexicon lexicon = getOne(lexiconQe);
+        if (lexicon == null) {
+            lexicon = new Lexicon();
+            lexicon.setName(addLexiconVO.getName());
+            lexicon.setCreator(currentUser);
+            lexicon.setGmtCreate(now);
+        } else if (lexicon.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
+            lexicon.setIsDeleted(IsDeleteEnum.N.getKey());
+        } else {
+            throw new CommonException(CommonErrorCode.IS_EXISTS);
+        }
+
+        lexicon.setGmtModified(now);
+        lexicon.setModifier(currentUser);
 
-		return saveOrUpdate(lexicon);
+        return saveOrUpdate(lexicon);
     }
 
 

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

@@ -1,16 +1,16 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetAllLexiconRelationshipDTO;
 import com.diagbot.entity.LexiconRelationship;
+import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.LexiconRelationshipServiceImpl;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetAllLexiconRelationshipVO;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
 
 /**
  * @Description: 术语关系类型业务层
@@ -19,22 +19,23 @@ import com.diagbot.vo.GetAllLexiconRelationshipVO;
  */
 @Component
 public class LexiconRelationshipFacade extends LexiconRelationshipServiceImpl {
-	
-	 /**
+
+    /**
      * 获取所有关系类型
+     *
      * @param getAllLexiconRelationshipVO
      * @return
      */
-    public List<GetAllLexiconRelationshipDTO> getAllLexiconRelationship(GetAllLexiconRelationshipVO getAllLexiconRelationshipVO){
-    	QueryWrapper<LexiconRelationship> lexiconRelationshipQe = new QueryWrapper<>();
-    	lexiconRelationshipQe.eq("is_deleted", "N");
-    	if(StringUtil.isNotBlank(getAllLexiconRelationshipVO.getName())){
-    		lexiconRelationshipQe.like("name", getAllLexiconRelationshipVO.getName());
-    	}
-    	if(StringUtil.isNotBlank(getAllLexiconRelationshipVO.getCode())){
-    		lexiconRelationshipQe.eq("code", getAllLexiconRelationshipVO.getCode());
-    	}
-    	return BeanUtil.listCopyTo(list(lexiconRelationshipQe), GetAllLexiconRelationshipDTO.class);
+    public List<GetAllLexiconRelationshipDTO> getAllLexiconRelationship(GetAllLexiconRelationshipVO getAllLexiconRelationshipVO) {
+        QueryWrapper<LexiconRelationship> lexiconRelationshipQe = new QueryWrapper<>();
+        lexiconRelationshipQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        if (StringUtil.isNotBlank(getAllLexiconRelationshipVO.getName())) {
+            lexiconRelationshipQe.like("name", getAllLexiconRelationshipVO.getName());
+        }
+        if (StringUtil.isNotBlank(getAllLexiconRelationshipVO.getCode())) {
+            lexiconRelationshipQe.eq("code", getAllLexiconRelationshipVO.getCode());
+        }
+        return BeanUtil.listCopyTo(list(lexiconRelationshipQe), GetAllLexiconRelationshipDTO.class);
     }
 
 

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

@@ -19,6 +19,7 @@ import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.Relation;
 import com.diagbot.entity.RelationOrder;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.RelationService;
@@ -194,7 +195,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		
 		Concept concept = conceptFacade.getById(relationContactDetailVO.getConceptId());
 		relationNodeDTO.setConceptId(concept.getId());
-		relationNodeDTO.setConceptName(concept.getLibName());
+		relationNodeDTO.setConceptName(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
 		
 		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId()));
 		

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

@@ -14,7 +14,7 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class ConceptIndexVO {
-    @ApiModelProperty(value = "检索名称")
+    @ApiModelProperty(value = "检索名称",required=true)
     @NotBlank(message="名称不能为空")
     private String name;
 

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

@@ -72,7 +72,7 @@ public class ConceptDetailController {
     }
 
 
-    @ApiOperation(value = "知识库标准化-内容检索[by:zhoutg]", notes = "")
+    @ApiOperation(value = "知识库标准化-内容检索[by:rengb]", notes = "")
     @PostMapping("/index")
     @SysLogger("index")
     public RespDTO<List<ConceptIndexDTO>> index(@Valid @RequestBody ConceptIndexVO conceptIndexVO) {

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

@@ -36,13 +36,13 @@ import springfox.documentation.annotations.ApiIgnore;
 @RestController
 @RequestMapping("/lexicon")
 @SuppressWarnings("unchecked")
-@Api(value = "术语类型维护相关API", tags = { "术语类型维护相关API" })
+@Api(value = "术语类型维护相关API", tags = { "知识库标准化-术语类型维护相关API" })
 public class LexiconController {
 	
     @Autowired
     private LexiconFacade lexiconFacade;
     
-    @ApiOperation(value = "获取所有术语类型[by:rengb]")
+    @ApiOperation(value = "知识库标准化-获取所有术语类型[by:rengb]")
     @PostMapping("/getAllLexicon")
     @SysLogger("getAllLexicon")
     public RespDTO<List<GetAllLexiconDTO>> getAllLexicon(@RequestBody GetAllLexiconVO getAllLexiconVO) {

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

@@ -20,7 +20,7 @@
     </resultMap>
 
    	<select id="getConceptDetailList" resultType="com.diagbot.dto.GetConceptDetailListDTO">
-   		SELECT b.id concept_id, b.lib_name, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
+   		SELECT b.id concept_id, b.lib_name,b.lib_type as typeId, group_concat(title) title, a.is_deleted, a.modifier, a.gmt_modified
 		FROM kl_concept_detail a ,kl_concept b
 		WHERE   b.is_deleted='N' and a.concept_id=b.id
 		<if test="conceptName!=null and conceptName!=''">
@@ -43,12 +43,17 @@
 
 
     <select id="index" resultType="com.diagbot.dto.ConceptIndexDTO">
-        SELECT a.lib_name name, a.id concept_id FROM `kl_concept` a
-        where a.is_deleted = 'N'
-        <if test="name != null and name != ''">
-            and a.lib_name like concat('%',#{name} ,'%' )
+        SELECT
+			DISTINCT 
+			a.id AS conceptId,
+			a.lib_name AS name,
+			a.lib_type AS typeId
+		FROM kl_concept a LEFT JOIN kl_concept_detail b
+		ON a.id=b.concept_id
+		WHERE b.id IS NULL 
+		<if test="name != null and name != ''">
+            AND a.lib_name like concat('%',#{name} ,'%' )
         </if>
-        and not EXISTS(select 1 from kl_concept_detail where a.id = concept_id)
-        order by a.gmt_modified desc
+		ORDER BY a.gmt_modified DESC
     </select>
 </mapper>

tran-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -86,6 +86,11 @@ public class HospitalInfo implements Serializable {
      */
     private String remark;
 
+    /**
+     * 是否对接（0-不对接，1-对接）
+     */
+    private Integer connect;
+
     public Long getId() {
         return id;
     }
@@ -93,6 +98,7 @@ public class HospitalInfo implements Serializable {
     public void setId(Long id) {
         this.id = id;
     }
+
     public String getIsDeleted() {
         return isDeleted;
     }
@@ -100,6 +106,7 @@ public class HospitalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
+
     public Date getGmtCreate() {
         return gmtCreate;
     }
@@ -107,6 +114,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
+
     public Date getGmtModified() {
         return gmtModified;
     }
@@ -114,6 +122,7 @@ public class HospitalInfo implements Serializable {
     public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
+
     public String getCreator() {
         return creator;
     }
@@ -121,6 +130,7 @@ public class HospitalInfo implements Serializable {
     public void setCreator(String creator) {
         this.creator = creator;
     }
+
     public String getModifier() {
         return modifier;
     }
@@ -128,6 +138,7 @@ public class HospitalInfo implements Serializable {
     public void setModifier(String modifier) {
         this.modifier = modifier;
     }
+
     public String getCode() {
         return code;
     }
@@ -135,6 +146,7 @@ public class HospitalInfo implements Serializable {
     public void setCode(String code) {
         this.code = code;
     }
+
     public String getName() {
         return name;
     }
@@ -142,6 +154,7 @@ public class HospitalInfo implements Serializable {
     public void setName(String name) {
         this.name = name;
     }
+
     public String getAddress() {
         return address;
     }
@@ -149,6 +162,7 @@ public class HospitalInfo implements Serializable {
     public void setAddress(String address) {
         this.address = address;
     }
+
     public String getSpell() {
         return spell;
     }
@@ -156,6 +170,7 @@ public class HospitalInfo implements Serializable {
     public void setSpell(String spell) {
         this.spell = spell;
     }
+
     public Integer getStatus() {
         return status;
     }
@@ -163,6 +178,7 @@ public class HospitalInfo implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
+
     public Integer getOrderNo() {
         return orderNo;
     }
@@ -170,6 +186,7 @@ public class HospitalInfo implements Serializable {
     public void setOrderNo(Integer orderNo) {
         this.orderNo = orderNo;
     }
+
     public String getRemark() {
         return remark;
     }
@@ -178,22 +195,31 @@ public class HospitalInfo implements Serializable {
         this.remark = remark;
     }
 
+    public Integer getConnect() {
+        return connect;
+    }
+
+    public void setConnect(Integer connect) {
+        this.connect = connect;
+    }
+
     @Override
     public String toString() {
         return "HospitalInfo{" +
-        "id=" + id +
-        ", isDeleted=" + isDeleted +
-        ", gmtCreate=" + gmtCreate +
-        ", gmtModified=" + gmtModified +
-        ", creator=" + creator +
-        ", modifier=" + modifier +
-        ", code=" + code +
-        ", name=" + name +
-        ", address=" + address +
-        ", spell=" + spell +
-        ", status=" + status +
-        ", orderNo=" + orderNo +
-        ", remark=" + remark +
-        "}";
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", code=" + code +
+                ", name=" + name +
+                ", address=" + address +
+                ", spell=" + spell +
+                ", status=" + status +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                ", connect=" + connect +
+                "}";
     }
 }

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

@@ -0,0 +1,48 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.entity.HospitalInfo;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.HosCodeVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.management.Query;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/20 13:09
+ */
+@Component
+public class DataServiceFacade {
+    @Autowired
+    HospitalInfoFacade hospitalInfoFacade;
+
+    /**
+     * 对接
+     *
+     * @param hosCodeVO
+     * @return
+     */
+    public Boolean isConnect(HosCodeVO hosCodeVO) {
+        if (StringUtil.isBlank(hosCodeVO.getHosCode())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
+        }
+        QueryWrapper<HospitalInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("code", hosCodeVO.getHosCode());
+        HospitalInfo hospitalInfo = hospitalInfoFacade.getOne(queryWrapper);
+        if (hospitalInfo == null) {
+            return false;
+        } else {
+            if (hospitalInfo.getConnect().equals(1)) {
+                return true;
+            } else {
+                return false;
+            }
+        }
+    }
+}

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

@@ -2,9 +2,14 @@ package com.diagbot.web;
 
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.DataServiceFacade;
+import com.diagbot.vo.HosCodeVO;
+import com.sun.org.apache.xpath.internal.operations.Bool;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
 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;
 
@@ -18,10 +23,14 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "数据服务对外接口相关API", tags = { "数据服务对外接口相关API" })
 public class DataServiceController {
 
+    @Autowired
+    DataServiceFacade dataServiceFacade;
+
     @ApiOperation(value = "是否对接:[by:zhaops]")
-    @PostMapping("/isDocking")
-    @SysLogger("isDocking")
-    public RespDTO<Boolean> isDocking() {
-        return RespDTO.onSuc(false);
+    @PostMapping("/isConnect")
+    @SysLogger("isConnect")
+    public RespDTO<Boolean> isConnect(@RequestBody HosCodeVO hosCodeVO) {
+        Boolean data = dataServiceFacade.isConnect(hosCodeVO);
+        return RespDTO.onSuc(data);
     }
-}
+}