|
|
@@ -40,7 +40,6 @@ import com.diagbot.vo.IdVO;
|
|
|
import com.diagbot.vo.MappingConfigPageVO;
|
|
|
import com.diagbot.vo.MappingConfigVO;
|
|
|
import com.google.common.collect.Lists;
|
|
|
-import org.apache.commons.collections4.ListUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
@@ -521,7 +520,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
|
|
|
|
|
|
Map<String, List<MappingConfigWrapper>> map = wrapperList.stream()
|
|
|
- .filter(i->StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
+ .filter(i -> StringUtil.isNotBlank(i.getUniqueName()))
|
|
|
.collect(Collectors.groupingBy(MappingConfigWrapper::getUniqueName));
|
|
|
|
|
|
for (Map.Entry<String, List<MappingConfigWrapper>> entry : map.entrySet()) {
|
|
|
@@ -562,7 +561,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
ConceptVO conceptVO = new ConceptVO();
|
|
|
conceptVO.setSource(-1);
|
|
|
conceptVO.setIds(ids);
|
|
|
- System.out.println(ids.stream().map(i->String.valueOf(i)).collect(Collectors.joining(",")));
|
|
|
+ System.out.println(ids.stream().map(i -> String.valueOf(i)).collect(Collectors.joining(",")));
|
|
|
RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
|
|
|
if (RespDTOUtil.respIsOK(respDTO)) {
|
|
|
Map<Long, IndexBatchDTO> conceptMap
|
|
|
@@ -590,6 +589,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
QueryWrapper<MappingConfig> queryWrapper = new QueryWrapper<>();
|
|
|
queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("hospital_id", hospitalId)
|
|
|
+ .eq("is_match", 1)
|
|
|
.eq("type", type);
|
|
|
List<MappingConfig> list = this.list(queryWrapper);
|
|
|
if (ListUtil.isEmpty(list)) {
|
zhaops