显示位置增加药品说明书

icss-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,7 +76,7 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书
      */
     private String position;
 

icss-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -12,7 +12,8 @@ public enum IntroducePositionEnum implements KeyedNamed {
     Push(1, "推送展示"),
     More(2, "更多展示"),
     CommonTreatment(3, "一般治疗展示"),
-    SurgeryTreatment(4, "手术治疗展示");
+    SurgeryTreatment(4, "手术治疗展示"),
+    Drug(5, "药品说明书");
     @Setter
     private Integer key;
 

icssman-service/src/main/java/com/diagbot/entity/IntroduceDetail.java

@@ -76,7 +76,7 @@ public class IntroduceDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书
      */
     private String position;
 

icssman-service/src/main/java/com/diagbot/enums/IntroducePositionEnum.java

@@ -12,7 +12,8 @@ public enum IntroducePositionEnum implements KeyedNamed {
     Push(1, "推送展示"),
     More(2, "更多展示"),
     CommonTreatment(3, "一般治疗展示"),
-    SurgeryTreatment(4, "手术治疗展示");
+    SurgeryTreatment(4, "手术治疗展示"),
+    Drug(5, "药品说明书");
 
     @Setter
     private Integer key;

icssman-service/src/main/java/com/diagbot/facade/IntroduceInfoFacade.java

@@ -293,7 +293,9 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
 
         //未关联的标签
         QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
-        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).notIn("id", questionIds);
+        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("sub_type",0)
+                .notIn("id", questionIds);
         List<QuestionInfo> unRelatedQuestionList = questionFacade.list(unRelatedQuestionWrapper);
         List<QuestionShortDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
         for (QuestionInfo questionInfo : unRelatedQuestionList) {
@@ -313,7 +315,8 @@ public class IntroduceInfoFacade extends IntroduceInfoServiceImpl {
      */
     public List<QuestionShortDTO> getAllQuestionList() {
         QueryWrapper<QuestionInfo> unRelatedQuestionWrapper = new QueryWrapper<>();
-        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+        unRelatedQuestionWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("sub_type",0);
         List<QuestionInfo> unRelatedQuestionList = questionFacade.list(unRelatedQuestionWrapper);
         List<QuestionShortDTO> unRelatedQuestionDTOList = Lists.newLinkedList();
         for (QuestionInfo questionInfo : unRelatedQuestionList) {