1、诊断、手术、中医疾病、中医证候预匹配增加医院术语不为空判断

2、科室唯一性校验改为医院科室名称+医院科室编码

src/main/java/com/diagbot/facade/MappingConfigFacade.java

@@ -443,6 +443,17 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
                         && StringUtil.isNotBlank(item.getHisDetailName())) {
                     emptyNumList.add(rowId);
                 }
+            } else if (type.equals(ConceptTypeEnum.Disease.getKey())
+                    || type.equals(ConceptTypeEnum.Operation.getKey())
+                    || type.equals(ConceptTypeEnum.Tcmdisease.getKey())
+                    || type.equals(ConceptTypeEnum.Tcmsyndrome.getKey())) {
+                if (StringUtil.isBlank(item.getHisName())
+                        && StringUtil.isBlank(item.getCode())) {
+                    continue;
+                } else if (StringUtil.isBlank(item.getHisName())
+                        && StringUtil.isNotBlank(item.getCode())) {
+                    emptyNumList.add(rowId);
+                }
             } else {
                 if (StringUtil.isNotBlank(item.getHisName())) {
                     item.setHisName(item.getHisName().trim());
@@ -470,7 +481,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "预匹配失败，上传文件内行（"
                     + emptyNumList.stream().map(Object::toString)
                     .collect(Collectors.joining("、"))
-                    + "）医院术语的检验套餐项不可为空。\n");
+                    + "）医院术语" + (type.equals(ConceptTypeEnum.LisPack.getKey()) ? "的检验套餐项" : "") + "不可为空。\n");
         }
 
         if (ListUtil.isEmpty(dataList)) {
@@ -1234,6 +1245,14 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             queryWrapper
                     .eq("his_detail_name", mappingConfig.getHisDetailName());
         }
+        if (StringUtil.isBlank(mappingConfig.getHisCode())) {
+            queryWrapper.and(i -> i.isNull("his_code")
+                    .or()
+                    .eq("his_code", ""));
+        } else {
+            queryWrapper
+                    .eq("his_code", mappingConfig.getHisCode());
+        }
         if (mappingConfig.getFormConceptId() != null) {
             queryWrapper.eq("form_concept_id", mappingConfig.getFormConceptId());
         } else {
@@ -1294,6 +1313,14 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         } else {
             queryWrapper.eq("his_detail_name", mappingConfig.getHisDetailName());
         }
+        if (StringUtil.isBlank(mappingConfig.getHisCode())) {
+            queryWrapper.and(i -> i.isNull("his_code")
+                    .or()
+                    .eq("his_code", ""));
+        } else {
+            queryWrapper
+                    .eq("his_code", mappingConfig.getHisCode());
+        }
         if (mappingConfig.getFormConceptId() != null) {
             queryWrapper.eq("form_concept_id", mappingConfig.getFormConceptId());
         } else {
@@ -1333,6 +1360,14 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         } else {
             qwUnMaptch.eq("his_detail_name", mappingConfig.getHisDetailName());
         }
+        if (StringUtil.isBlank(mappingConfig.getHisCode())) {
+            qwUnMaptch.and(i -> i.isNull("his_code")
+                    .or()
+                    .eq("his_code", ""));
+        } else {
+            qwUnMaptch
+                    .eq("his_code", mappingConfig.getHisCode());
+        }
         this.remove(qwUnMaptch);
 
         mappingConfig.setIsMatch(1);