|
@@ -207,12 +207,13 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
lisNames = respLisDTO.data;
|
|
lisNames = respLisDTO.data;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ //判断是否有标准术语
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() != null && result.getHasStandName().equals(0)) {
|
|
|
|
|
|
+ if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
continue;
|
|
continue;
|
|
} else {
|
|
} else {
|
|
if (lisPackNames.contains(result.getName()) || lisNames.contains(result.getName())) {
|
|
if (lisPackNames.contains(result.getName()) || lisNames.contains(result.getName())) {
|
|
-
|
|
|
|
|
|
+ result.setHasStandName(1);
|
|
} else {
|
|
} else {
|
|
result.setHasStandName(0);
|
|
result.setHasStandName(0);
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
@@ -237,42 +238,40 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
|
|
- saveList.add(result);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
//静态知识是否存在
|
|
//静态知识是否存在
|
|
- if (lisStaticNames.contains(result.getName())
|
|
|
|
- || lisPackStaticNames.contains(result.getName())) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- //查找上级静态知识是否存在
|
|
|
|
- List<LisName> lisNameList = lisNameRepository.findByNameIs(result.getName());
|
|
|
|
- if (ListUtil.isEmpty(lisNameList)) {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
|
|
+ if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
|
|
|
|
+ if (lisStaticNames.contains(result.getName())
|
|
|
|
+ || lisPackStaticNames.contains(result.getName())) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
} else {
|
|
} else {
|
|
- lisNameList.forEach(lisName -> {
|
|
|
|
- Boolean isExist = false;
|
|
|
|
- Set<LisNameLisSet> lisNameLisSetSet = lisName.getLisNamelissets();
|
|
|
|
- if (lisNameLisSetSet != null && lisNameLisSetSet.size() > 0) {
|
|
|
|
- List<String> lisPacks = lisNameLisSetSet.stream().map(i -> i.getLisSet()).collect(Collectors.toList())
|
|
|
|
- .stream().map(i -> i.getName()).sorted().collect(Collectors.toList());
|
|
|
|
- for (String lisPack : lisPacks) {
|
|
|
|
- if (lisPackStaticNames.contains(lisPack)) {
|
|
|
|
- isExist = true;
|
|
|
|
- result.setMessage(result.getMessage() + "取上级(" + lisPack + ")静态知识;");
|
|
|
|
- break;
|
|
|
|
|
|
+ //查找上级静态知识是否存在
|
|
|
|
+ List<LisName> lisNameList = lisNameRepository.findByNameIs(result.getName());
|
|
|
|
+ if (ListUtil.isEmpty(lisNameList)) {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ } else {
|
|
|
|
+ lisNameList.forEach(lisName -> {
|
|
|
|
+ Boolean isExist = false;
|
|
|
|
+ Set<LisNameLisSet> lisNameLisSetSet = lisName.getLisNamelissets();
|
|
|
|
+ if (lisNameLisSetSet != null && lisNameLisSetSet.size() > 0) {
|
|
|
|
+ List<String> lisPacks = lisNameLisSetSet.stream().map(i -> i.getLisSet()).collect(Collectors.toList())
|
|
|
|
+ .stream().map(i -> i.getName()).sorted().collect(Collectors.toList());
|
|
|
|
+ for (String lisPack : lisPacks) {
|
|
|
|
+ if (lisPackStaticNames.contains(lisPack)) {
|
|
|
|
+ isExist = true;
|
|
|
|
+ result.setMessage(result.getMessage() + "取上级(" + lisPack + ")静态知识;");
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
- if (isExist) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ if (isExist) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
|
|
+ } else {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
saveList.add(result);
|
|
saveList.add(result);
|
|
@@ -387,11 +386,11 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
names = respDTO.data;
|
|
names = respDTO.data;
|
|
}
|
|
}
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() != null && result.getHasStandName().equals(0)) {
|
|
|
|
|
|
+ if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
continue;
|
|
continue;
|
|
} else {
|
|
} else {
|
|
if (names.contains(result.getName())) {
|
|
if (names.contains(result.getName())) {
|
|
-
|
|
|
|
|
|
+ result.setHasStandName(1);
|
|
} else {
|
|
} else {
|
|
result.setHasStandName(0);
|
|
result.setHasStandName(0);
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
@@ -416,42 +415,40 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
|
|
- saveList.add(result);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
//静态知识是否存在
|
|
//静态知识是否存在
|
|
- if (pacsStaticNames.contains(result.getName())
|
|
|
|
- || subPacsPackStaticNames.contains(result.getName())) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- //查找上级静态知识是否存在
|
|
|
|
- List<PacsSubName> pacsSubNameList = pacsSubNameRepository.findByNameIs(result.getName());
|
|
|
|
- if (ListUtil.isEmpty(pacsSubNameList)) {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
|
|
+ if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
|
|
|
|
+ if (pacsStaticNames.contains(result.getName())
|
|
|
|
+ || subPacsPackStaticNames.contains(result.getName())) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
} else {
|
|
} else {
|
|
- pacsSubNameList.forEach(pacsSubName -> {
|
|
|
|
- Boolean isExist = false;
|
|
|
|
- Set<PacsNamePacsSubName> pacsNamePacsSubNameSet = pacsSubName.getPacsNamePacsSubNames();
|
|
|
|
- if (pacsNamePacsSubNameSet != null && pacsNamePacsSubNameSet.size() > 0) {
|
|
|
|
- List<String> pacsNames = pacsNamePacsSubNameSet.stream().map(i -> i.getPacsName()).collect(Collectors.toList())
|
|
|
|
- .stream().map(i -> i.getName()).sorted().collect(Collectors.toList());
|
|
|
|
- for (String pacsName : pacsNames) {
|
|
|
|
- if (pacsStaticNames.contains(pacsName)) {
|
|
|
|
- isExist = true;
|
|
|
|
- result.setMessage(result.getMessage() + "取上级(" + pacsName + ")静态知识;");
|
|
|
|
- break;
|
|
|
|
|
|
+ //查找上级静态知识是否存在
|
|
|
|
+ List<PacsSubName> pacsSubNameList = pacsSubNameRepository.findByNameIs(result.getName());
|
|
|
|
+ if (ListUtil.isEmpty(pacsSubNameList)) {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ } else {
|
|
|
|
+ pacsSubNameList.forEach(pacsSubName -> {
|
|
|
|
+ Boolean isExist = false;
|
|
|
|
+ Set<PacsNamePacsSubName> pacsNamePacsSubNameSet = pacsSubName.getPacsNamePacsSubNames();
|
|
|
|
+ if (pacsNamePacsSubNameSet != null && pacsNamePacsSubNameSet.size() > 0) {
|
|
|
|
+ List<String> pacsNames = pacsNamePacsSubNameSet.stream().map(i -> i.getPacsName()).collect(Collectors.toList())
|
|
|
|
+ .stream().map(i -> i.getName()).sorted().collect(Collectors.toList());
|
|
|
|
+ for (String pacsName : pacsNames) {
|
|
|
|
+ if (pacsStaticNames.contains(pacsName)) {
|
|
|
|
+ isExist = true;
|
|
|
|
+ result.setMessage(result.getMessage() + "取上级(" + pacsName + ")静态知识;");
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- }
|
|
|
|
- if (isExist) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
- }
|
|
|
|
- });
|
|
|
|
|
|
+ if (isExist) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
|
|
+ } else {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
saveList.add(result);
|
|
saveList.add(result);
|
|
@@ -567,11 +564,11 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
names = respDTO.data;
|
|
names = respDTO.data;
|
|
}
|
|
}
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() != null && result.getHasStandName().equals(0)) {
|
|
|
|
|
|
+ if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
continue;
|
|
continue;
|
|
} else {
|
|
} else {
|
|
if (names.contains(result.getName())) {
|
|
if (names.contains(result.getName())) {
|
|
-
|
|
|
|
|
|
+ result.setHasStandName(1);
|
|
} else {
|
|
} else {
|
|
result.setHasStandName(0);
|
|
result.setHasStandName(0);
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
@@ -591,16 +588,14 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
|
|
- saveList.add(result);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
//静态知识是否存在
|
|
//静态知识是否存在
|
|
- if (drugStaticNames.contains(result.getName())) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
|
|
+ if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
|
|
|
|
+ if (drugStaticNames.contains(result.getName())) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
|
|
+ } else {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
saveList.add(result);
|
|
saveList.add(result);
|
|
}
|
|
}
|
|
@@ -715,11 +710,11 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
names = respDTO.data;
|
|
names = respDTO.data;
|
|
}
|
|
}
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() != null && result.getHasStandName().equals(0)) {
|
|
|
|
|
|
+ if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
continue;
|
|
continue;
|
|
} else {
|
|
} else {
|
|
if (names.contains(result.getName())) {
|
|
if (names.contains(result.getName())) {
|
|
-
|
|
|
|
|
|
+ result.setHasStandName(1);
|
|
} else {
|
|
} else {
|
|
result.setHasStandName(0);
|
|
result.setHasStandName(0);
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
@@ -739,16 +734,14 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
|
|
- saveList.add(result);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
//静态知识是否存在
|
|
//静态知识是否存在
|
|
- if (diseaseStaticNames.contains(result.getName())) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
|
|
+ if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
|
|
|
|
+ if (diseaseStaticNames.contains(result.getName())) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
|
|
+ } else {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
saveList.add(result);
|
|
saveList.add(result);
|
|
}
|
|
}
|
|
@@ -863,11 +856,11 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
names = respDTO.data;
|
|
names = respDTO.data;
|
|
}
|
|
}
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() != null && result.getHasStandName().equals(0)) {
|
|
|
|
|
|
+ if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
continue;
|
|
continue;
|
|
} else {
|
|
} else {
|
|
if (names.contains(result.getName())) {
|
|
if (names.contains(result.getName())) {
|
|
-
|
|
|
|
|
|
+ result.setHasStandName(1);
|
|
} else {
|
|
} else {
|
|
result.setHasStandName(0);
|
|
result.setHasStandName(0);
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
result.setMessage(result.getMessage() + "标准术语不存在;");
|
|
@@ -887,16 +880,14 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
for (ResultStaticKnowledge result : mappingList) {
|
|
- if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
|
|
|
|
- saveList.add(result);
|
|
|
|
- continue;
|
|
|
|
- }
|
|
|
|
//静态知识是否存在
|
|
//静态知识是否存在
|
|
- if (diseaseStaticNames.contains(result.getName())) {
|
|
|
|
- result.setHasStaticKnowledge(1);
|
|
|
|
- } else {
|
|
|
|
- result.setHasStaticKnowledge(0);
|
|
|
|
- result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
|
|
+ if (result.getHasStandName() != null && result.getHasStandName().equals(1)) {
|
|
|
|
+ if (diseaseStaticNames.contains(result.getName())) {
|
|
|
|
+ result.setHasStaticKnowledge(1);
|
|
|
|
+ } else {
|
|
|
|
+ result.setHasStaticKnowledge(0);
|
|
|
|
+ result.setMessage(result.getMessage() + "缺少静态知识;");
|
|
|
|
+ }
|
|
}
|
|
}
|
|
saveList.add(result);
|
|
saveList.add(result);
|
|
}
|
|
}
|