|
@@ -13,8 +13,8 @@ import com.diagbot.dto.StaticKnowledgeDetailDTO;
|
|
|
import com.diagbot.dto.StaticKnowledgeIndexDTO;
|
|
|
import com.diagbot.entity.ConceptDetail;
|
|
|
import com.diagbot.entity.ConceptInfo;
|
|
|
-import com.diagbot.enums.StaticTypeEnum;
|
|
|
import com.diagbot.enums.IsDeleteEnum;
|
|
|
+import com.diagbot.enums.StaticTypeEnum;
|
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.ConceptDetailService;
|
|
@@ -162,8 +162,6 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
n += 1000;
|
|
|
} while (conceptInfoList.size() < 100 && n < conNameList.size());*/
|
|
|
|
|
|
- //staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList.subList(0, n);
|
|
|
-
|
|
|
if (ListUtil.isNotEmpty(conceptInfoList)) {
|
|
|
//typeName转换
|
|
|
conceptInfoList.forEach(item -> {
|
|
@@ -224,11 +222,11 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
|
= EntityUtil.makeEntityListMap(staticKnowledgeIndexDTOList, "typeName");
|
|
|
for (DictionaryInfoDTO dic : dicStaticIndexList) {
|
|
|
if (dic.getName().equals("检验")) {
|
|
|
- if (map.containsKey(ConceptTypeEnum.LisPack.getName())) {
|
|
|
- retList.addAll(map.get(ConceptTypeEnum.LisPack.getName()));
|
|
|
+ if (map.containsKey(StaticTypeEnum.LisPack.getName())) {
|
|
|
+ retList.addAll(map.get(StaticTypeEnum.LisPack.getName()));
|
|
|
}
|
|
|
- if (map.containsKey(ConceptTypeEnum.Lis.getName())) {
|
|
|
- retList.addAll(map.get(ConceptTypeEnum.Lis.getName()));
|
|
|
+ if (map.containsKey(StaticTypeEnum.Lis.getName())) {
|
|
|
+ retList.addAll(map.get(StaticTypeEnum.Lis.getName()));
|
|
|
}
|
|
|
} else if (map.containsKey(dic.getName())) {
|
|
|
retList.addAll(map.get(dic.getName()));
|