修改知识图谱页面诊断参数获取出错BUG

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -22,6 +22,7 @@ public class PretreatmentRule {
         //症状规则 主诉、现病史提取
         if (!StringUtils.isEmpty(searchData.getChief())) {
             searchData.setChief(add2PreResultList(new PretreatmentSymptom(), searchData.getChief(), "symptom", searchData));
+            add2PreResultList(new PretreatmentSymptom(), searchData.getSymptom(), "symptom", searchData);
         }
         //现病史 提取手术史和过敏史
         if (!StringUtils.isEmpty(searchData.getSymptom())) {
@@ -36,7 +37,8 @@ public class PretreatmentRule {
         if (searchData.getDiag() != null && searchData.getDiag().size() > 0) {
             List<PreResult> preResults = searchData.getDiag();
             for (PreResult result : preResults) {
-                result.setUniqueName("诊断--" + result.getUniqueName());
+                result.setValue(result.getUniqueName());
+                result.setUniqueName("诊断--");
             }
             searchData.setDiagString(add2PreResultList(searchData.getDiag(), searchData.getDiagString(), "diag", searchData));
             add2PreResultList(new PretreatmentDiag(), searchData.getPasts(), "diag", searchData);
@@ -48,7 +50,8 @@ public class PretreatmentRule {
         if (searchData.getDrug() != null && searchData.getDrug().size() > 0) {
             List<PreResult> preResults = searchData.getDrug();
             for (PreResult result : preResults) {
-                result.setUniqueName("药品--" + result.getUniqueName());
+                result.setValue(result.getUniqueName());
+                result.setUniqueName("药品--");
             }
             searchData.setDrugString(add2PreResultList(searchData.getDrug(), searchData.getDrugString(), "drug", searchData));
             add2PreResultList(new PretreatmentDrug(), searchData.getPasts(), "drug", searchData);
@@ -59,6 +62,8 @@ public class PretreatmentRule {
         //既往史
         if (!StringUtils.isEmpty(searchData.getPasts())) {
             add2PreResultList(new PretreatmentPast(), searchData.getPasts(), "pasts", searchData);
+            add2PreResultList(new PretreatmentOperation(), searchData.getPasts(), "operation", searchData);
+            add2PreResultList(new PretreatmentAllergy(), searchData.getPasts(), "allergy", searchData);
         }
         //手术外伤史 现病史、手术史
         if (!StringUtils.isEmpty(searchData.getOperation())) {
@@ -88,7 +93,8 @@ public class PretreatmentRule {
         if (searchData.getPacs() != null && searchData.getPacs().size() > 0) {
             List<PreResult> preResults = searchData.getPacs();
             for (PreResult result : preResults) {
-                result.setUniqueName("检查--" + result.getUniqueName());
+                result.setValue(result.getResult());
+                result.setUniqueName("检查--");
             }
             searchData.setPacsString(add2PreResultList(searchData.getPacs(), searchData.getPacsString(), "pacs", searchData));
         } else if (!StringUtils.isEmpty(searchData.getPacsString())) {

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

@@ -74,9 +74,9 @@ public class GraphCalculate {
         String webDiag = "";
         for (PreResult preResult : searchData.getDiagOrder()) {
             if (StringUtils.isEmpty(webDiag)) {
-                webDiag = preResult.getUniqueName();
+                webDiag = preResult.getValue();
             } else {
-                webDiag = webDiag + "," + preResult.getUniqueName();
+                webDiag = webDiag + "," + preResult.getValue();
             }
         }
         logger.info("页面诊断为 :"+webDiag);

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -2070,9 +2070,9 @@ public class Neo4jAPI {
         String webDiag = "";
         for (PreResult preResult : searchData.getDiagOrder()) {
             if (StringUtils.isEmpty(webDiag)) {
-                webDiag = preResult.getUniqueName();
+                webDiag = preResult.getValue();
             } else {
-                webDiag = webDiag + "," + preResult.getUniqueName();
+                webDiag = webDiag + "," + preResult.getValue();
             }
         }
         List<String> webDiagList = null;