化验大小项与公表映射迁移

knowledgeman-service/src/main/java/com/diagbot/facade/LisMappingFacade.java

@@ -10,12 +10,14 @@ import com.diagbot.entity.Concept;
 import com.diagbot.entity.LisMapping;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.LisMappingServiceImpl;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.GetUniqueNameVO;
 import com.diagbot.vo.IdVO;
@@ -190,26 +192,40 @@ public class LisMappingFacade extends LisMappingServiceImpl {
      */
     public String getLisUniqueName(GetUniqueNameVO getUniqueNameVO) {
         String uniqueName = "";
-        Concept mealConcept = conceptFacade.getById(getUniqueNameVO.getMealName());
+        QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
+        conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("lib_name", getUniqueNameVO.getMealName())
+                .eq("lib_type", LexiconTypeEnum.LIS_PACKAGE.getKey());
+        Concept mealConcept = conceptFacade.getOne(conceptQueryWrapper);
+        if (mealConcept == null) {
+            throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验大项【" + getUniqueNameVO.getMealName() + "】不存在");
+        }
         Concept itemConcept = null;
-        if (getUniqueNameVO.getItemName() != null && !getUniqueNameVO.getItemName().equals(0L)) {
-            itemConcept = conceptFacade.getById(getUniqueNameVO.getItemName());
+        if (StringUtil.isNotBlank(getUniqueNameVO.getItemName())) {
+            conceptQueryWrapper = new QueryWrapper<>();
+            conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("lib_name", getUniqueNameVO.getItemName())
+                    .eq("lib_type", LexiconTypeEnum.LIS_DETAILS.getKey());
+            itemConcept = conceptFacade.getOne(conceptQueryWrapper);
+            if (itemConcept == null) {
+                throw new CommonException(CommonErrorCode.NOT_EXISTS, "化验小项【" + getUniqueNameVO.getItemName() + "】不存在");
+            }
         }
         QueryWrapper<LisMapping> lisMappingQueryWrapper = new QueryWrapper<>();
         lisMappingQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("meal_id", mealConcept.getId());
         if (itemConcept == null) {
-            lisMappingQueryWrapper.and(i -> i.isNull("item_id").or(j -> j.eq("item_id", 0)));
+            lisMappingQueryWrapper.and(i -> i.isNull("item_id").or(j -> j.eq("item_id", 0L)));
         } else {
             lisMappingQueryWrapper.eq("item_id", itemConcept.getId());
         }
         List<LisMapping> lisMappingList = this.list(lisMappingQueryWrapper);
         if (ListUtil.isNotEmpty(lisMappingList)) {
-            Concept uniqueConcept = conceptFacade.getById(lisMappingList.get(0).getId());
+            Concept uniqueConcept = conceptFacade.getById(lisMappingList.get(0).getUniqueId());
             if (uniqueConcept != null) {
                 uniqueName = uniqueConcept.getLibName();
             }
         }
         return uniqueName;
     }
-}
+}

knowledgeman-service/src/main/java/com/diagbot/vo/LisMappingVO.java

@@ -3,7 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
-import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
 
 /**
  * @Description: 化验公表项保存参数
@@ -13,9 +13,8 @@ import javax.validation.constraints.NotBlank;
 @Getter
 @Setter
 public class LisMappingVO {
-    @NotBlank(message = "请输入化验套餐ID")
+    @NotNull(message = "请输入化验套餐ID")
     private Long mealId;
     private Long itemId;
-    @NotBlank(message = "请输入化验公表ID")
     private Long uniqueId;
 }