1、featureType统一转换

bigdata-web/src/main/java/org/diagbot/bigdata/util/BigDataConstants.java

@@ -20,6 +20,8 @@ public class BigDataConstants {
     public final static String feature_type_pacs = "5";     //检查
     public final static String feature_type_treat = "6";       //治疗
     public final static String feature_type_history = "7";       //历史
+    public final static String feature_type_labelpush = "22";       //指标推送
+    public final static String feature_type_manju = "11";       //管理评估
     public final static String feature_type_feature = "9"; //症状描述中的特征信息 如部位、性质等
 
 //    public final static String standard_info_diag_cache = "standardInfoDiagMap";                    //词典库疾病缓存

bigdata-web/src/main/java/org/diagbot/bigdata/work/ParamsDataProxy.java

@@ -71,7 +71,12 @@ public class ParamsDataProxy {
         searchData.setSymptom(searchData.getSymptom().trim());
         //一次推送多个类别信息
         String[] featureTypes = searchData.getFeatureType().split(",");
-        searchData.setFeatureTypes(featureTypes);
+        //featureType统一转换
+        String[] convertFeatureTypes = new String[featureTypes.length];
+        for (int i = 0;i<featureTypes.length; i++) {
+            convertFeatureTypes[i] = convertFeatureType(searchData.getSysCode(), featureTypes[i]);
+        }
+        searchData.setFeatureTypes(convertFeatureTypes);
 
         //获取入参中的特征信息
         FeatureAnalyze fa = new FeatureAnalyze();
@@ -106,7 +111,7 @@ public class ParamsDataProxy {
         //下了诊断且其他信息全为空 反推标识
         boolean reverse = !StringUtils.isEmpty(searchData.getDiag()) && StringUtils.isEmpty(searchData.getSymptom());
         for (int i = 0; i < featureTypes.length; i++) {
-            featureTypes[i] = convertFeatureType(sysCode, featureTypes[i]);
+//            featureTypes[i] = convertFeatureType(sysCode, featureTypes[i]);
             if (featureTypes[i] != null) {
                 //模型
                 switch (FeatureType.parse(featureTypes[i])) {
@@ -195,6 +200,12 @@ public class ParamsDataProxy {
             if ("8".equals(featureType)) {
                 return BigDataConstants.feature_type_treat;
             }
+            if ("22".equals(featureType)) {
+                return BigDataConstants.feature_type_labelpush;
+            }
+            if ("11".equals(featureType)) {
+                return BigDataConstants.feature_type_manju;
+            }
             return null;
         }
         return featureType;