推理featureType字段备注修改，11和22不用

src/main/java/com/diagbot/process/PushProcess.java

@@ -401,9 +401,9 @@ public class PushProcess {
         }
 
         // 第一诊断反推
-        List<String> ruleTypeList = Lists.newArrayList(pushVo.getFeatureType().split(",")); // 需要获取的类型
+        List<String> featureType = Lists.newArrayList(pushVo.getFeatureType().split(",")); // 需要获取的类型
         Map<String, List<PushBaseDTO>> dis = pushDTO.getDis();
-        ReverseVO reverseVO = generateReverseVO(wordCrfDTO, ruleTypeList, dis, diseaseNameEqFirstFirstFlag);
+        ReverseVO reverseVO = generateReverseVO(wordCrfDTO, featureType, dis, diseaseNameEqFirstFirstFlag);
 
         // 输出调试信息
         if (StringUtil.isBlank(selectDisName)) {
@@ -424,13 +424,13 @@ public class PushProcess {
             reverseVO.setLibName(selectDisName);
             // 关联类型
             List<Integer> relationType = new ArrayList<>();
-            if (ruleTypeList.contains("8")) {
+            if (featureType.contains("8")) {
                 relationType.add(RelationshipEnum.R506.getKey()); // 药品
             }
-            if (ruleTypeList.contains("9")) {
+            if (featureType.contains("9")) {
                 relationType.add(RelationshipEnum.R507.getKey()); // 手术
             }
-            if (ruleTypeList.contains("12")) {
+            if (featureType.contains("12")) {
                 relationType.add(RelationshipEnum.R510.getKey()); // 护理
             }
             reverseVO.setRelationType(relationType);
@@ -441,7 +441,7 @@ public class PushProcess {
         // 获取各个类型的界面过滤元素
         Map<String, List<String>> filterMap = getFilterMap(wordCrfDTO);
         // 设置推送信息（过滤已有）
-        setPushItem(pushDTO, ruleTypeList, filterMap, reverseDTOList, pushVo.getLength());
+        setPushItem(pushDTO, featureType, filterMap, reverseDTOList, pushVo.getLength());
     }
 
     /**
@@ -669,15 +669,15 @@ public class PushProcess {
      * 设置其他推送信息
      *
      * @param pushDTO
-     * @param ruleTypeList
+     * @param featureType
      * @param filterMap
      * @param reverseDTOList
      */
-    public void setPushItem(PushDTO pushDTO, List<String> ruleTypeList, Map<String, List<String>> filterMap, List<ReverseDTO> reverseDTOList, int length) {
+    public void setPushItem(PushDTO pushDTO, List<String> featureType, Map<String, List<String>> filterMap, List<ReverseDTO> reverseDTOList, int length) {
         Map<String, List<PushBaseDTO>> dis = pushDTO.getDis();
         Map<Integer, List<ReverseDTO>> map = EntityUtil.makeEntityListMap(reverseDTOList, "sonType");
         // 症状
-        if (ruleTypeList.contains("1")) {
+        if (featureType.contains("1")) {
             if (map.get(LexiconEnum.Symptom.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Symptom.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.symptom.toString())); // 过滤界面已有
@@ -685,7 +685,7 @@ public class PushProcess {
             }
         }
         // 查体结果
-        if (ruleTypeList.contains("4")) {
+        if (featureType.contains("4")) {
             if (map.get(LexiconEnum.VitalResult.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.VitalResult.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.vital.toString())); // 过滤界面已有
@@ -693,7 +693,7 @@ public class PushProcess {
             }
         }
         // 化验套餐
-        if (ruleTypeList.contains("5")) {
+        if (featureType.contains("5")) {
             if (map.get(LexiconEnum.LisName.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.LisName.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.lis.toString())); // 过滤界面已有
@@ -701,7 +701,7 @@ public class PushProcess {
             }
         }
         // 辅检项目
-        if (ruleTypeList.contains("6")) {
+        if (featureType.contains("6")) {
             if (map.get(LexiconEnum.PacsName.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.PacsName.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.pacs.toString())); // 过滤界面已有
@@ -709,7 +709,7 @@ public class PushProcess {
             }
         }
         // 鉴别诊断, 注意这个类型与其他类型不一样
-        if (ruleTypeList.contains("7")) {
+        if (featureType.contains("7")) {
             if (map.get(LexiconEnum.Disease.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Disease.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.disease.toString())); // 过滤界面已有
@@ -720,7 +720,7 @@ public class PushProcess {
             }
         }
         // 药品
-        if (ruleTypeList.contains("8")) {
+        if (featureType.contains("8")) {
             if (map.get(LexiconEnum.Medicine.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Medicine.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.drug.toString())); // 过滤界面已有
@@ -728,7 +728,7 @@ public class PushProcess {
             }
         }
         // 手术
-        if (ruleTypeList.contains("9")) {
+        if (featureType.contains("9")) {
             if (map.get(LexiconEnum.Operation.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Operation.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.operation.toString())); // 过滤界面已有
@@ -736,7 +736,7 @@ public class PushProcess {
             }
         }
         // 量表
-        if (ruleTypeList.contains("11")) {
+        if (featureType.contains("12")) {
             if (map.get(LexiconEnum.Scale.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Scale.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 // CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.operation.toString())); // 过滤界面已有
@@ -744,7 +744,7 @@ public class PushProcess {
             }
         }
         // 护理
-        if (ruleTypeList.contains("12")) {
+        if (featureType.contains("13")) {
             if (map.get(LexiconEnum.Nurse.getKey()) != null) {
                 List<String> list = map.get(LexiconEnum.Nurse.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
                 // CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.operation.toString())); // 过滤界面已有
@@ -779,11 +779,11 @@ public class PushProcess {
      * 生成反推的入参
      *
      * @param wordCrfDTO
-     * @param ruleTypeList
+     * @param featureType
      * @param dis
      * @return
      */
-    public ReverseVO generateReverseVO(WordCrfDTO wordCrfDTO, List<String> ruleTypeList, Map<String, List<PushBaseDTO>> dis, boolean flag) {
+    public ReverseVO generateReverseVO(WordCrfDTO wordCrfDTO, List<String> featureType, Map<String, List<PushBaseDTO>> dis, boolean flag) {
         ReverseVO reverseVO = new ReverseVO();
         String disName = "";
         // 按以下顺序获取一个诊断: 下的诊断->可能诊断第一个
@@ -803,34 +803,34 @@ public class PushProcess {
             reverseVO.setLibType(LexiconEnum.Disease.getKey());
             // 关联类型
             List<Integer> relationType = new ArrayList<>();
-            if (ruleTypeList.contains("1")) {
+            if (featureType.contains("1")) {
                 relationType.add(RelationshipEnum.R501.getKey()); // 主症状
                 relationType.add(RelationshipEnum.R502.getKey()); // 次症状
             }
-            if (ruleTypeList.contains("4")) {
+            if (featureType.contains("4")) {
                 relationType.add(RelationshipEnum.R503.getKey()); // 查体结果
             }
-            if (ruleTypeList.contains("5")) {
+            if (featureType.contains("5")) {
                 relationType.add(RelationshipEnum.R504.getKey()); // 化验套餐
             }
-            if (ruleTypeList.contains("6")) {
+            if (featureType.contains("6")) {
                 relationType.add(RelationshipEnum.R505.getKey()); // 辅助检查项目
             }
-            if (ruleTypeList.contains("7")) {
+            if (featureType.contains("7")) {
                 relationType.add(RelationshipEnum.R508.getKey()); // 鉴别诊断
             }
             if (flag) {
-                if (ruleTypeList.contains("8")) {
+                if (featureType.contains("8")) {
                     relationType.add(RelationshipEnum.R506.getKey()); // 药品
                 }
-                if (ruleTypeList.contains("9")) {
+                if (featureType.contains("9")) {
                     relationType.add(RelationshipEnum.R507.getKey()); // 手术
                 }
-                if (ruleTypeList.contains("12")) {
+                if (featureType.contains("13")) {
                     relationType.add(RelationshipEnum.R510.getKey()); // 护理
                 }
             }
-            if (ruleTypeList.contains("11")) {
+            if (featureType.contains("12")) {
                 relationType.add(RelationshipEnum.R509.getKey()); // 量表
             }
             reverseVO.setRelationType(relationType);

src/main/java/com/diagbot/web/CoreController.java

@@ -42,8 +42,10 @@ public class CoreController {
         return RespDTO.onSuc(indicationDTO);
     }
 
-    @ApiOperation(value = "推送API[zhoutg]", notes = "featureType 类型(多选必填)，1：症状，4：查体结果，5：检验，6：检查，" +
-            "7：诊断，8：药品，9：手术，10：一般治疗, 11：量表，12：护理")
+    @ApiOperation(value = "推送API[zhoutg]", notes = "" +
+            "featureType 类型(多选必填)，1：症状，4：查体结果，5：检验，6：检查，" +
+            "7：诊断，8：药品，9：手术，10：一般治疗, 12：量表，13：护理" +
+            "注意：11：管理评估，22：指标推送 这2个类型原5.0系统已占")
     @PostMapping("/push")
     public RespDTO<PushDTO> push(@RequestBody PushVO pushVo) {
         PushDTO pushDTO = pushFacade.pushFac(pushVo);