featureType判断更新

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

@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.diagbot.common.javabean.MedicalIndication;
 import org.diagbot.common.javabean.MedicalIndicationDetail;
+import org.diagbot.graph.util.CacheUtil;
 import org.diagbot.graphWeb.util.MapValueComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,6 +39,8 @@ public class GraphCalculate {
 //        ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
 //        paramsDataProxy.createSearchData(request, searchData);
         List<String> inputList = new ArrayList<>();
+        //获取缓存
+        Map<String, String> lexionCache = CacheUtil.getLexionCache();
         Map<String, Map<String, String>> inputs = searchData.getInputs();
         Set<String> ss = new HashSet<>();
         if(inputs.size()>0){
@@ -61,7 +64,7 @@ public class GraphCalculate {
         logger.info("页面诊断为 :"+webDiag);
         //计算诊断
         Map<String, Map<String,String>> condition =null;
-        if(featureTypeList.contains("7")){
+        if(featureTypeList.contains("2")){
             condition = neo4jAPI.getNewCondition((String[]) inputList.toArray(new String[inputList.size()]),webDiag );
         }
         List<FeatureRate> featureRates = new ArrayList<>();
@@ -98,7 +101,7 @@ public class GraphCalculate {
         logger.info("页面导入的所有化验项为 :" +lisSet);
 
         //走治疗
-        if (webDiag !=null && webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
+        if (webDiag !=null && webDiag.trim() != null && webDiag.trim() != "" && featureTypeList.contains("5")) {
             // 查找页面诊断里是否有不良反应
             String[] webDiagList = webDiag.split(",|，|、|;|:|；");
             Map<String, List<String>> disUE = neo4jAPI.getDisUE(webDiagList, diseaseType);

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

@@ -1063,7 +1063,7 @@ public class Neo4jAPI {
                         String diseaseName = df.getKey();//疾病
                         ArrayList value = df.getValue();//其他条件
                         StringBuffer s1 = new StringBuffer();
-                        s1.append("match (d:Disease{name:'" + disease + "'})-[r0:推荐]->(m:Drugs)-[:包含]->(n:Medicine),(d)-[r1:推荐]->(n)");
+                        s1.append("match (d:Disease{name:'" + disease + "'})-[r0:推荐]->(m:Drugs)-[:包含]->(n:Medicine),(d:Disease)-[r1:推荐]->(n)");
                         s1.append("\n");
                         s1.append("where r0.p<6").append("\n");
                         s1.append("return m.name as 类, r0.p as sort, n.name as 药物, r1.rate as a order by sort , a desc");
@@ -1671,7 +1671,7 @@ public class Neo4jAPI {
                         //化验计算
                         String query1 = "match(e:Effect)-[r:指标]->(l:LIS)-[r1:计算结果]->(k:Result) where e.name='血脂控制情况'\n" +
                                 "return l.name as name,r1.between as between ,k.name as res";
-                        System.out.println(query1);
+                        logger.info(query1);
                         StatementResult result1 = session.run(query1);
                         while (result1.hasNext()) {
                             Record next = result1.next();

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

@@ -473,7 +473,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         logger.info("推出的合并pacs为: " + pacs);
         ArrayList<FeatureRate> lisFeature = new ArrayList<>();
         ArrayList<FeatureRate> pacsFeature = new ArrayList<>();
-        if (lis != null && lis.size() > 0 && featureList.contains("5")) {
+        if (lis != null && lis.size() > 0 && featureList.contains("3")) {
             List<String> newLis = new ArrayList<>();
             if(lis.size()>searchData.getLength()){
                 for (String l:lis) {
@@ -490,7 +490,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 lisFeature.add(featureRate);
             }
         }
-        if (pacs != null && pacs.size() > 0 && featureList.contains("6")) {
+        if (pacs != null && pacs.size() > 0 && featureList.contains("4")) {
             for (String p : pacs) {
                 FeatureRate featureRate = new FeatureRate();
                 featureRate.setFeatureName(p);