Merge remote-tracking branch 'origin/bug/mix20190729' into bug/mix20190729

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

@@ -74,6 +74,11 @@ public class RelationNodeDTO {
 	 */
 	private String relationName;
 	
+	/**
+     * 状态：Y-已删除，N-启用中
+     */
+	private String isDeletedConcept;
+	
 	/**
 	 * 下一级概念
 	 */

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.IsDeleteEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
@@ -202,8 +203,9 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationNodeDTO.setConceptTypeId(concept.getLibType());
 		relationNodeDTO.setConceptTypeName(LexiconTypeEnum.getName(concept.getLibType().intValue()));
 		relationNodeDTO.setConceptNameType(concept.getLibName()+"("+LexiconTypeEnum.getName(concept.getLibType().intValue())+")");
+		relationNodeDTO.setIsDeletedConcept(concept.getIsDeleted());
 		
-		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId(),null));
+		relationNodeDTO.setNodeList(repairRelationDataForQuery(relationContactDetailVO.getConceptId(), relationContactDetailVO.getRelationId(),null,concept.getIsDeleted()));
 		
 		return relationNodeDTO;
 	}
@@ -213,9 +215,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 	 * @param conceptId
 	 * @param relationId
 	 * @param hookConceptIds
+	 * @param isDeletedParent
 	 * @return
 	 */
-	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId,List<Long> hookConceptIds){
+	private List<RelationNodeDTO> repairRelationDataForQuery(Long conceptId,Long relationId,List<Long> hookConceptIds,String isDeletedParent){
 		if(hookConceptIds==null){
 			hookConceptIds = new ArrayList<>();
 			hookConceptIds.add(conceptId);
@@ -228,12 +231,13 @@ public class RelationContactFacade extends RelationServiceImpl {
 			i.setConceptNameType(i.getConceptName()+"("+LexiconTypeEnum.getName(i.getConceptTypeId().intValue())+")");
 			i.setParentConceptTypeName(LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue()));
 			i.setParentConceptNameType(i.getParentConceptName()+"("+LexiconTypeEnum.getName(i.getParentConceptTypeId().intValue())+")");
+			i.setIsDeletedConcept(isDeletedParent.equals(IsDeleteEnum.Y.getKey())?IsDeleteEnum.Y.getKey():i.getIsDeletedConcept());
 			
 			if(!hookConceptIds.contains(i.getConceptId())){
 				List<Long> hookConceptIds_ = new ArrayList<>();
 				hookConceptIds_.addAll(hookConceptIds);
 				hookConceptIds_.add(i.getConceptId());
-				i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId,hookConceptIds_));
+				i.setNodeList(repairRelationDataForQuery(i.getConceptId(), relationId,hookConceptIds_,i.getIsDeletedConcept()));
 			}
 		}
 		

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

@@ -33,7 +33,7 @@
 		AND b.lib_name LIKE CONCAT('%', #{indexConfigVO.diseaseName}, '%')
 	</if>
 	GROUP BY a.disease_id
-	ORDER BY a.gmt_create DESC
+	ORDER BY state ASC,gmtModified DESC
 </select>
 <select id="queryIndexConfigDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
 	SELECT DISTINCT

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

@@ -57,6 +57,7 @@
 			d.id AS conceptId,
 			d.lib_name AS conceptName,
 			d.lib_type AS conceptTypeId,
+			d.is_deleted AS isDeletedConcept,
 			c.id AS parentConceptId,
 			c.lib_name AS parentConceptName,
 			c.lib_type AS parentConceptTypeId,
@@ -68,8 +69,6 @@
 		JOIN kl_lexicon_relationship e ON a.relation_id=e.id
 		WHERE 1=1
  		AND a.is_deleted='N' 
- 		AND c.is_deleted='N'
- 		AND d.is_deleted='N'
  		AND e.is_deleted='N'
  		AND a.start_id=#{conceptId} 
  		<if test="relationId!=null">