Browse Source

1、术语关联映射-分页查询剂型启用禁用筛选
2、术语关联映射-导入时剂型非标准词允许导入,不导出错误结果

zhaops 3 years ago
parent
commit
65ef13bf60
1 changed files with 8 additions and 2 deletions
  1. 8 2
      src/main/java/com/diagbot/facade/MappingConfigFacade.java

+ 8 - 2
src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -187,6 +187,8 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                 conceptRespDTO = cdssCoreClient.getConceptNames(conceptVO);
                 if (RespDTOUtil.respIsOK(conceptRespDTO)) {
                     conceptIds = conceptRespDTO.data.stream().map(IndexBatchDTO::getId).collect(Collectors.toList());
+                }
+                if (ListUtil.isNotEmpty(conceptIds)) {
                     mappingConfigPageVO.setConceptIds(conceptIds);
                 } else {
                     //没有启用禁用记录时返回空而不是全量
@@ -202,6 +204,9 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                 conceptRespDTO = cdssCoreClient.getConceptNames(conceptVO);
                 if (RespDTOUtil.respIsOK(conceptRespDTO)) {
                     formConceptIds = conceptRespDTO.data.stream().map(IndexBatchDTO::getId).collect(Collectors.toList());
+
+                }
+                if (ListUtil.isNotEmpty(formConceptIds)) {
                     mappingConfigPageVO.setFormConceptIds(formConceptIds);
                 } else {
                     //没有启用禁用记录时返回空而不是全量
@@ -1739,10 +1744,11 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                         if (formMap.containsKey(item.getForm())) {
                             item.setFormConceptId(formMap.get(item.getForm()).get(0));
                         } else {
-                            if (item.getIsMatch().equals(1)) {
+                            //标准词已匹配,剂型未匹配,不做错误数据
+                            /*if (item.getIsMatch().equals(1)) {
                                 item.setIsMatch(0);
                                 errorList.add(item);
-                            }
+                            }*/
                         }
                     }
                 }