提示信息

aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -6,6 +6,8 @@ import com.diagbot.dto.ConceptIntroduceDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptDetail;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.LexiconTypeEnum;
+import com.diagbot.enums.PositionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.ConceptDetailServiceImpl;
@@ -19,13 +21,9 @@ import com.diagbot.vo.ConceptIntroduceVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
-import java.util.Comparator;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 /**
@@ -57,9 +55,16 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
                 .orderByAsc("order_no");
-        if (conceptIntroduceVO.getPosition() != null) {
-            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        if (conceptIntroduceVO.getPosition() == null) {
+            if (conceptIntroduceVO.getLibType().equals(LexiconTypeEnum.DRUGS.getKey())) {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T5.getKey());
+            } else if (conceptIntroduceVO.getLibType().equals(LexiconTypeEnum.SIDE_EFFECTS.getKey())) {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T6.getKey());
+            } else {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T2.getKey());
+            }
         }
+        conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
         if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
             conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
         }
@@ -91,9 +96,16 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("concept_id", concept.getId())
                 .orderByAsc("order_no");
-        if (conceptIntroduceVO.getPosition() != null) {
-            conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
+        if (conceptIntroduceVO.getPosition() == null) {
+            if (conceptIntroduceVO.getLibType().equals(LexiconTypeEnum.DRUGS.getKey())) {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T5.getKey());
+            } else if (conceptIntroduceVO.getLibType().equals(LexiconTypeEnum.SIDE_EFFECTS.getKey())) {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T6.getKey());
+            } else {
+                conceptIntroduceVO.setPosition(PositionTypeEnum.T2.getKey());
+            }
         }
+        conceptDetailQueryWrapper.apply("find_in_set({0},position)", conceptIntroduceVO.getPosition());
         if (ListUtil.isNotEmpty(conceptIntroduceVO.getTitles())) {
             conceptDetailQueryWrapper.in("title", conceptIntroduceVO.getTitles());
         }