检验术语映射维护

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -376,14 +376,21 @@ public class LisConfigFacade{
         RespDTOUtil.respNGDealCover(respLisDTO, "标准术语校验失败");
         List<String> lisNames = respLisDTO.data;
         for (int i = 0; i < lisConfigList.size(); i++) {
-            if (!lisPackNames.contains(lisConfigList.get(i).getUniqueName())
-                    && !lisNames.contains(lisConfigList.get(i).getUniqueName())) {
-                errorNumList.add(String.valueOf(i + 2));
+            if (StringUtil.isBlank(lisConfigList.get(i).getHisDetailName())) {
+                //检验套餐对应套餐
+                if (!lisPackNames.contains(lisConfigList.get(i).getUniqueName())) {
+                    errorNumList.add(String.valueOf(i + 2));
+                }
+            } else {
+                //检验细项对应细项
+                if (!lisNames.contains(lisConfigList.get(i).getUniqueName())) {
+                    errorNumList.add(String.valueOf(i + 2));
+                }
             }
         }
         if (ListUtil.isNotEmpty(errorNumList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL,
-                    "以下行数（不计空行）标准术语在数据库中不存在："
+                    "以下行数（不计空行）标准术语（检验套餐或检验细项）在数据库中不存在："
                             + errorNumList.stream().collect(Collectors.joining("、"))
                             + "。导入取消，请修改后再试。");
         }