Merge branch 'develop' into dev/triage20191101_upload

aipt-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -13,6 +13,8 @@ import java.util.List;
  */
 @Getter
 @Setter
-public class ConceptIntroduceDTO extends ConceptBaseDTO{
+public class ConceptIntroduceDTO extends ConceptBaseDTO {
     private List<ConceptDetailDTO> details = ListUtil.newArrayList();
+    private Long libType;
+    private Integer type;
 }

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

@@ -83,6 +83,8 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         ConceptIntroduceDTO conceptIntroduceDTO = new ConceptIntroduceDTO();
         conceptIntroduceDTO.setConceptId(concept.getId());
         conceptIntroduceDTO.setName(concept.getLibName());
+        conceptIntroduceDTO.setLibType(concept.getLibType());
+        conceptIntroduceDTO.setType(ParamConvertUtil.libConvert2Concept(concept.getLibType().intValue()));
         conceptIntroduceDTO.setDetails(conceptDetailDTOList);
         return conceptIntroduceDTO;
     }

data-service/src/main/java/com/diagbot/dto/ConceptIntroduceDTO.java

@@ -14,4 +14,6 @@ import java.util.List;
 @Setter
 public class ConceptIntroduceDTO extends ConceptBaseDTO {
     private List<ConceptDetailDTO> details;
+    private Long libType;
+    private Integer type;
 }