|
@@ -9,7 +9,6 @@ import com.diagbot.dto.ExportCommonTestDTO;
|
|
|
import com.diagbot.dto.ExportLisStaticTestDTO;
|
|
|
import com.diagbot.dto.ExportLisTestDTO;
|
|
|
import com.diagbot.dto.RespDTO;
|
|
|
-import com.diagbot.entity.ConceptInfo;
|
|
|
import com.diagbot.entity.DiseaseConfig;
|
|
|
import com.diagbot.entity.DrugConfig;
|
|
|
import com.diagbot.entity.KlConcept;
|
|
@@ -21,7 +20,6 @@ import com.diagbot.entity.PacsConfig;
|
|
|
import com.diagbot.entity.ResultStaticInfo;
|
|
|
import com.diagbot.entity.ResultStaticKnowledge;
|
|
|
import com.diagbot.enums.ConceptTypeEnum;
|
|
|
-import com.diagbot.enums.GraphLabelEnum;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
import com.diagbot.enums.LexiconEnum;
|
|
|
import com.diagbot.enums.StatusEnum;
|
|
@@ -64,9 +62,6 @@ import java.util.stream.Collectors;
|
|
|
public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImpl {
|
|
|
@Autowired
|
|
|
private CdssCoreClient cdssCoreClient;
|
|
|
- @Autowired
|
|
|
- private ConceptInfoFacade conceptInfoFacade;
|
|
|
-
|
|
|
@Autowired
|
|
|
private KlConceptFacade klConceptFacade;
|
|
|
@Autowired
|
|
@@ -229,18 +224,18 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
|
}
|
|
|
|
|
|
//验证静态知识
|
|
|
- List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
|
|
|
+ List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
|
|
|
if (ListUtil.isEmpty(infoList)) {
|
|
|
infoList = Lists.newLinkedList();
|
|
|
}
|
|
|
List<String> lisStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.LisName.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.LisSubName.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
List<String> lisPackStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.LisSet.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.LisName.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
@@ -419,18 +414,18 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
|
}
|
|
|
|
|
|
//静态知识
|
|
|
- List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
|
|
|
+ List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
|
|
|
if (ListUtil.isEmpty(infoList)) {
|
|
|
infoList = Lists.newLinkedList();
|
|
|
}
|
|
|
List<String> pacsStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.PacsName.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.PacsName.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
List<String> subPacsPackStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.PacsSubName.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.PacsSubName.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
@@ -610,13 +605,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
|
}
|
|
|
|
|
|
//验证静态知识
|
|
|
- List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
|
|
|
+ List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
|
|
|
if (ListUtil.isEmpty(infoList)) {
|
|
|
infoList = Lists.newLinkedList();
|
|
|
}
|
|
|
List<String> drugStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.Medicine.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.Medicine.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
@@ -766,13 +761,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
|
}
|
|
|
|
|
|
//验证静态知识
|
|
|
- List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
|
|
|
+ List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
|
|
|
if (ListUtil.isEmpty(infoList)) {
|
|
|
infoList = Lists.newLinkedList();
|
|
|
}
|
|
|
List<String> diseaseStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.YiBaoDiseaseName.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibName().equals(LexiconEnum.Disease.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
@@ -922,13 +917,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
|
}
|
|
|
|
|
|
//验证静态知识
|
|
|
- List<ConceptInfo> infoList = conceptInfoFacade.getAllConceptInfo();
|
|
|
+ List<KlConcept> infoList = klConceptStaticFacade.getAllConcept();
|
|
|
if (ListUtil.isEmpty(infoList)) {
|
|
|
infoList = Lists.newLinkedList();
|
|
|
}
|
|
|
List<String> diseaseStaticNames = infoList.stream()
|
|
|
- .filter(i -> i.getType().equals(GraphLabelEnum.YiBaoOperationName.getName()))
|
|
|
- .map(i -> i.getName())
|
|
|
+ .filter(i -> i.getLibType().equals(LexiconEnum.Operation.getKey()))
|
|
|
+ .map(i -> i.getLibName())
|
|
|
.distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|