修改智能分诊错误,featureRate增加source存储诊断来源

common-service/src/main/java/org/diagbot/common/work/FeatureRate.java

@@ -8,6 +8,7 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 
     public String getFeatureName() {
         return featureName;
@@ -40,4 +41,12 @@ public class FeatureRate {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 }

graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -88,11 +88,11 @@ public class GraphCalculate {
                         if(min_age <age && age<=max_age){
                             FeatureRate featureRate = new FeatureRate();
                             featureRate.setFeatureName(dis);
-                            featureRate.setExtraProperty("");
                             Map<String, String> value = d.getValue();
                             String s = JSON.toJSONString(value);
                             featureRate.setDesc(s);
-                            featureRate.setRate("neo4j");
+//                            featureRate.setRate("neo4j");
+                            featureRate.setSource("neo4j");
                             featureRates.add(featureRate);
                         }
 

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -239,7 +239,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         logger.info("分词系统传来的词: " + ss);
         logger.info("图谱开始根据传来的分词计算诊断.....");
         //开始推送诊断逻辑,包括推送疑诊,急诊,鉴别诊断
-        if (featureTypeList != null && featureTypeList.contains("7")) {
+        if (featureTypeList != null && featureTypeList.contains("2")) {
             //第一,二步查询输入的词所在number
             Set<String> fildInNumber = this.getNumber(ss);
             //第三步查找疑诊
@@ -298,11 +298,11 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 for (Map.Entry<String, Map<String, String>> d : diseaseCondition.entrySet()) {
                     FeatureRate featureRate = new FeatureRate();
                     featureRate.setFeatureName(d.getKey());
-                    featureRate.setExtraProperty("");
+                    featureRate.setExtraProperty("neo4j");
                     Map<String, String> value = d.getValue();
                     String s = JSON.toJSONString(value);
                     featureRate.setDesc(s);
-                    featureRate.setRate("neo4j");
+//                    featureRate.setRate("neo4j");
                     featureRates.add(featureRate);
                 }
             }
@@ -312,7 +312,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         logger.info("图谱计算出来的诊断(包含疑诊,急诊,鉴别诊断)为: " + que);
 
         //推送治疗,包含不良反应
-        if (webDiag != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
+        if (webDiag != null && webDiag.trim() != "" && featureTypeList.contains("6")) {
             logger.info("界面有诊断,并且features包含8,可以走治疗方案");
             //查找页面诊断里是否有不良反应(慢病的情况下)
             Map<String, List<String>> disUE = new HashMap<>();
@@ -390,7 +390,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         List<String> bigdataDiagList = new LinkedList<>();//大数据诊断
         if (bigdataDiagFeature.size() > 0) {
             for (FeatureRate fe : bigdataDiagFeature) {
-                if ("neo4j".equals(fe.getRate()) && fe.getDesc().contains("确诊")) {
+                if ("neo4j".equals(fe.getSource()) && fe.getDesc().contains("确诊")) {
                     neo4jDiagList.add(fe.getFeatureName());
                 } else if (fe.getDesc() == null) {
                     bigdataDiagList.add(fe.getFeatureName());

graphdb/src/main/java/org/diagbot/vo/domain/FeatureRate.java

@@ -10,4 +10,5 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 }