代码优化

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

@@ -8,13 +8,14 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2018/11/23 10:12
  */
-public enum IntroducePositionEnum implements KeyedNamed {
-    Push(1, "推送展示"),
-    More(2, "更多展示"),
-    CommonTreatment(3, "一般治疗展示"),
-    SurgeryTreatment(4, "手术治疗展示"),
-    Drug(5, "药品说明书"),
-    AdverseReaction(6, "不良反应");
+public enum PositionTypeEnum implements KeyedNamed {
+    T1(1, "推送展示"),
+    T2(2, "更多展示"),
+    T3(3, "一般治疗展示"),
+    T4(4, "手术治疗展示"),
+    T5(5, "药品说明书"),
+    T6(6, "不良反应"),
+    T7(7, "描述信息");
 
     @Setter
     private Integer key;
@@ -22,13 +23,13 @@ public enum IntroducePositionEnum implements KeyedNamed {
     @Setter
     private String name;
 
-    IntroducePositionEnum(Integer key, String name) {
+    PositionTypeEnum(Integer key, String name) {
         this.key = key;
         this.name = name;
     }
 
-    public static IntroducePositionEnum getEnum(Integer key) {
-        for (IntroducePositionEnum item : IntroducePositionEnum.values()) {
+    public static PositionTypeEnum getEnum(Integer key) {
+        for (PositionTypeEnum item : PositionTypeEnum.values()) {
             if (item.key == key) {
                 return item;
             }
@@ -37,7 +38,7 @@ public enum IntroducePositionEnum implements KeyedNamed {
     }
 
     public static String getName(Integer key) {
-        IntroducePositionEnum item = getEnum(key);
+        PositionTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 

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

@@ -12,7 +12,7 @@ import com.diagbot.entity.ConceptDetail;
 import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.enums.ConceptTypeEnum;
 import com.diagbot.enums.DisTypeEnum;
-import com.diagbot.enums.IntroducePositionEnum;
+import com.diagbot.enums.PositionTypeEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
@@ -71,7 +71,7 @@ public class TreatmentFacade {
         ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
         conceptIntroduceVO.setName(diseaseName);
         conceptIntroduceVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
-        conceptIntroduceVO.setPosition(IntroducePositionEnum.CommonTreatment.getKey());
+        conceptIntroduceVO.setPosition(PositionTypeEnum.T3.getKey());
         List<ConceptDetail> commonTreatmentDetailList = conceptDetailFacade.getConceptDetailList(conceptIntroduceVO);
         if (ListUtil.isNotEmpty(commonTreatmentDetailList)) {
             ConceptDetailDTO commonDetailDTO = new ConceptDetailDTO();
@@ -82,7 +82,7 @@ public class TreatmentFacade {
         }
 
         //手术治疗
-        conceptIntroduceVO.setPosition(IntroducePositionEnum.SurgeryTreatment.getKey());
+        conceptIntroduceVO.setPosition(PositionTypeEnum.T4.getKey());
         List<ConceptDetail> surgeryTreatmentDetailList = conceptDetailFacade.getConceptDetailList(conceptIntroduceVO);
         if (ListUtil.isNotEmpty(surgeryTreatmentDetailList)) {
             ConceptDetailDTO surgeryDetailDTO = new ConceptDetailDTO();

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

@@ -1,53 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description:提示信息展示位置
- * @Author:zhaops
- * @time: 2018/11/23 10:12
- */
-public enum IntroducePositionEnum implements KeyedNamed {
-    Push(1, "推送展示"),
-    More(2, "更多展示"),
-    CommonTreatment(3, "一般治疗展示"),
-    SurgeryTreatment(4, "手术治疗展示"),
-    Drug(5, "药品说明书"),
-    AdverseReaction(6, "不良反应");
-
-    @Setter
-    private Integer key;
-
-    @Setter
-    private String name;
-
-    IntroducePositionEnum(Integer key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static IntroducePositionEnum getEnum(Integer key) {
-        for (IntroducePositionEnum item : IntroducePositionEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer key) {
-        IntroducePositionEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}

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

@@ -1,53 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description:提示信息展示位置
- * @Author:zhaops
- * @time: 2018/11/23 10:12
- */
-public enum IntroducePositionEnum implements KeyedNamed {
-    Push(1, "推送展示"),
-    More(2, "更多展示"),
-    CommonTreatment(3, "一般治疗展示"),
-    SurgeryTreatment(4, "手术治疗展示"),
-    Drug(5, "药品说明书"),
-    AdverseReaction(6, "不良反应");
-
-    @Setter
-    private Integer key;
-
-    @Setter
-    private String name;
-
-    IntroducePositionEnum(Integer key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static IntroducePositionEnum getEnum(Integer key) {
-        for (IntroducePositionEnum item : IntroducePositionEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer key) {
-        IntroducePositionEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}

icssman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,6 +1,5 @@
 package com.diagbot.service.impl;
 
-import com.diagbot.enums.IntroducePositionEnum;
 import com.diagbot.enums.ModuleInfoTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.enums.QuestionUsualTypeEnum;
@@ -28,7 +27,6 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("questionTypeEnum", QuestionTypeEnum.values())
-                .addEnums("introducePositionEnum", IntroducePositionEnum.values())
                 .addEnums("questionUsualTypeEnum", QuestionUsualTypeEnum.values())
                 .addEnums("dataSourcesEnums", QuestionUsualTypeEnum.values())
                 .addEnums("moduleInfoTypeEnum", ModuleInfoTypeEnum.values())

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -1,6 +1,7 @@
 package com.diagbot.service.impl;
 
 import com.diagbot.enums.DisclaimerCodeEnum;
+import com.diagbot.enums.PositionTypeEnum;
 import com.diagbot.service.EnumsDataService;
 import com.diagbot.util.EnumEntriesBuilder;
 import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
                 .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
+                .addEnums("positionTypeEnum", PositionTypeEnum.values())
                 .build();
         return enumMap;
     }