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

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

@@ -43,7 +43,7 @@ public class DisTypeFacade extends DisTypeServiceImpl {
         ConceptWrapper conceptWrapper = new ConceptWrapper();
         conceptWrapper.setStartType(LexiconTypeEnum.DIAGNOSIS.getKey());
         conceptWrapper.setEndType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());
-        conceptWrapper.setRelationType(LexiconRSTypeEnum.BELONG_TO.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.INCLUDE_OF.getKey());
         List<ConceptRes> list = conceptFacade.getConcept(conceptWrapper);
 
         // 出参数据封装
@@ -91,7 +91,7 @@ public class DisTypeFacade extends DisTypeServiceImpl {
         conceptWrapper.setEndId(disTypeConcept.getId());
         conceptWrapper.setEndName(disTypeName);
         conceptWrapper.setEndType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());
-        conceptWrapper.setRelationType(LexiconRSTypeEnum.BELONG_TO.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.INCLUDE_OF.getKey());
         List<ConceptRes> conceptResList = conceptFacade.getConcept(conceptWrapper);
         if (ListUtil.isNotEmpty(conceptResList)) {
             return true;

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

@@ -162,7 +162,7 @@ public class TreatmentFacade {
             conceptWrapper.setEndId(chronicConcept.getId());
             conceptWrapper.setEndName(chronicConcept.getLibName());
             conceptWrapper.setEndType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());
-            conceptWrapper.setRelationType(LexiconRSTypeEnum.BELONG_TO.getKey());
+            conceptWrapper.setRelationType(LexiconRSTypeEnum.INCLUDE_OF.getKey());
             List<ConceptRes> conceptResList = conceptFacade.getConcept(conceptWrapper);
             Boolean isChronic = ListUtil.isNotEmpty(conceptResList);
             if (isChronic) {

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

@@ -147,7 +147,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationIdList.addAll(relationList.stream().map(i->i.getId()).collect(Collectors.toList()));
 		
 		relationList.forEach(i->{
-			relationIdList.addAll(repairRelationDataForDelBeforeAdd(i.getStartId(),relationId));
+			relationIdList.addAll(repairRelationDataForDelBeforeAdd(i.getEndId(),relationId));
 		});
 		
 		if(!remove(relationQe)){
@@ -169,8 +169,8 @@ public class RelationContactFacade extends RelationServiceImpl {
 			List<Relation> relationList = new ArrayList<>();
 			relationNodeVO.getNodeList().forEach(i->{
 				Relation relation = new Relation();
-				relation.setStartId(i.getConceptId());
-				relation.setEndId(relationNodeVO.getConceptId());
+				relation.setStartId(relationNodeVO.getConceptId());
+				relation.setEndId(i.getConceptId());
 				relation.setRelationId(i.getRelationId());
 				relationList.add(relation);
 				
@@ -270,7 +270,7 @@ public class RelationContactFacade extends RelationServiceImpl {
 		}
 		
 		relationList.forEach(i->{
-			repairRelationDataForDel(i.getStartId(), relationId,isDeleted,currentUser,now);
+			repairRelationDataForDel(i.getEndId(), relationId,isDeleted,currentUser,now);
 		});
 	}