命名维护修改2

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

@@ -0,0 +1,54 @@
+package com.diagbot.dto;
+
+import java.util.List;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2018年12月5日下午5:00:34
+ */
+@Getter
+@Setter
+public class GetConceptInfoDTO {
+       
+	/**
+	 * 标准词
+	 */
+	@ApiModelProperty(value="标准词")
+    private List<GetConceptInfoDetailDTO> libName;
+    
+    /**
+     * 同义词
+     */
+	@ApiModelProperty(value="同义词")
+    private List<GetConceptInfoDetailDTO> otherNames;
+	
+	/**
+     * 是否有通用扩展：0-无，1-有
+     */
+	@ApiModelProperty(value="是否有通用扩展：0-无，1-有")
+    private Integer isHasCommon;
+    
+    /**
+     * 性别：1:男, 2:女, 3:通用
+     */
+    @ApiModelProperty(value="性别：1:男, 2:女, 3:通用")
+    private Integer sexType;
+
+    /**
+     * 症状发生的最小年龄
+     */
+    @ApiModelProperty(value="症状发生的最小年龄")
+    private Integer minAge;
+
+    /**
+     * 症状发生的最大年龄
+     */
+    @ApiModelProperty(value="症状发生的最大年龄")
+    private Integer maxAge;
+    
+}

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

@@ -1,5 +1,27 @@
 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;
@@ -8,9 +30,11 @@ import com.diagbot.dto.ConceptRes;
 import com.diagbot.dto.GetAllConceptDTO;
 import com.diagbot.dto.GetAllInformationDTO;
 import com.diagbot.dto.GetAllLisConceptDTO;
+import com.diagbot.dto.GetConceptInfoDTO;
 import com.diagbot.dto.GetConceptInfoDetailDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
+import com.diagbot.entity.ConceptCommon;
 import com.diagbot.entity.Lexicon;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.Medical;
@@ -40,27 +64,6 @@ 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: 术语查询业务层
@@ -85,6 +88,8 @@ public class ConceptFacade extends ConceptServiceImpl {
     private UserServiceClient userServiceClient;
     @Autowired
     private LexiconFacade lexiconFacade;
+    @Autowired
+    private ConceptCommonFacade conceptCommonFacade;
 
     /**
      * 获取所有化验公表项
@@ -256,16 +261,29 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @param getConceptInfoDetailVO
      * @return libName-标准术语，otherNames-同义词
      */
-    public Map<String, List<GetConceptInfoDetailDTO>> getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO) {
+    public GetConceptInfoDTO getConceptInfoDetail(GetConceptInfoDetailVO getConceptInfoDetailVO) {
+    	GetConceptInfoDTO getConceptInfoDTO = new GetConceptInfoDTO();
+    	
         QueryWrapper<LibraryInfo> libraryInfoQe = new QueryWrapper<LibraryInfo>();
         libraryInfoQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
         List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
-
-        Map<String, List<GetConceptInfoDetailDTO>> retMap = new HashMap<>();
-        retMap.put("otherNames", BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
-        retMap.put("libName", BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
-
-        return retMap;
+        
+        getConceptInfoDTO.setLibName(BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
+        getConceptInfoDTO.setOtherNames(BeanUtil.listCopyTo(libraryInfoList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()), GetConceptInfoDetailDTO.class));
+
+        Integer isHasCommon = lexiconFacade.getById(libraryInfoList.get(0).getTypeId()).getIsHasCommon();
+        if(isHasCommon==1){
+        	QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
+            conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
+            ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
+            if(conceptCommon!=null){
+            	getConceptInfoDTO.setSexType(conceptCommon.getSexType());
+            	getConceptInfoDTO.setMinAge(conceptCommon.getMinAge());
+            	getConceptInfoDTO.setMaxAge(conceptCommon.getMaxAge());
+            }
+        }
+        
+        return getConceptInfoDTO;
     }
 
     /**

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

@@ -1,12 +1,27 @@
 package com.diagbot.web;
 
+import java.util.List;
+import java.util.Map;
+
+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.ConceptBaseDTO;
 import com.diagbot.dto.GetAllConceptDTO;
 import com.diagbot.dto.GetAllInformationDTO;
 import com.diagbot.dto.GetAllLisConceptDTO;
-import com.diagbot.dto.GetConceptInfoDetailDTO;
+import com.diagbot.dto.GetConceptInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.ConceptFacade;
 import com.diagbot.vo.AddConceptInfoVO;
@@ -17,21 +32,9 @@ import com.diagbot.vo.GetAllInformationVO;
 import com.diagbot.vo.GetAllLisConceptVO;
 import com.diagbot.vo.GetConceptInfoDetailVO;
 import com.diagbot.vo.RemoveConceptInfoVO;
+
 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 javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
-import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -82,7 +85,7 @@ public class ConceptController {
     @ApiOperation(value = "获取医学术语命名详情[by:rengb]")
     @PostMapping("/getConceptInfoDetail")
     @SysLogger("getConceptInfoDetail")
-    public RespDTO<Map<String, List<GetConceptInfoDetailDTO>>> getConceptInfoDetail(@Valid @RequestBody GetConceptInfoDetailVO getConceptInfoDetailVO) {
+    public RespDTO<GetConceptInfoDTO> getConceptInfoDetail(@Valid @RequestBody GetConceptInfoDetailVO getConceptInfoDetailVO) {
         return RespDTO.onSuc(conceptFacade.getConceptInfoDetail(getConceptInfoDetailVO));
     }