Browse Source

取消图谱的注释

kongwz 5 years ago
parent
commit
d31a9dde46

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

@@ -96,10 +96,10 @@ public class GraphCalculate {
         starttime = System.currentTimeMillis();
         if(featureTypeList.contains(Constants.feature_type_diag)){
             // 暂停图谱查询服务
-//            condition = neo4jAPI.getNewCondition((String[]) inputList.toArray(new String[inputList.size()]),webDiag );
+            condition = neo4jAPI.getNewCondition((String[]) inputList.toArray(new String[inputList.size()]),webDiag );
             System.out.println("推送诊断消耗:"+(System.currentTimeMillis()-starttime)+"s");
             // 查找需要排除的诊断
-//            excludelist = neo4jAPI.getExcludeDiag(inputList);
+            excludelist = neo4jAPI.getExcludeDiag(inputList);
             responseData.setExcludeDiag(Arrays.asList(excludelist.keySet().stream().toArray(String[]::new)));
         }
         //包装推送出来的诊断
@@ -121,7 +121,6 @@ public class GraphCalculate {
             logger.info("featureTypeList 包含11,走管理评估!!!");
             starttime = System.currentTimeMillis();
             // 暂停图谱查询服务
-            /*
             if(webDiag != null){
 //                MangementEvaluation mangementEvaluation = neo4jAPI.pushMe(webDiagList,lis_Result);
                 MangementEvaluation mangementEvaluation_new = neo4jAPI.pushMe_new(diseaseName,crisisDetails);
@@ -129,7 +128,6 @@ public class GraphCalculate {
                 Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation_new.getMangementEvaluation();
                 responseData.setManagementEvaluation(mangementEvaluation1);
             }
-            */
         }
         //指标推送
         if (featureTypeList.contains("22") ) {
@@ -139,8 +137,8 @@ public class GraphCalculate {
             Set<String> newindSet1 = new HashSet<>();
             //查找指标
             // 暂停图谱查询服务
-            Set<String> indSet = new HashSet<>();
-//            Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]),sex,age,webDiagList);
+//            Set<String> indSet = new HashSet<>();
+            Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]),sex,age,webDiagList);
             if(indSet != null && indSet.size()>0){
                 for (String ind:indSet) {
                     if("肾功能不全".equals(ind)){
@@ -152,23 +150,19 @@ public class GraphCalculate {
             }
             Map<String, String> indLiang =null;
             // 暂停图谱查询服务
-            /*
             if(newindSet1 != null && newindSet1.size()>0){
                 indLiang =neo4jAPI.getIndLiang(newindSet1);
 
             }
-            */
             logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
             List<MedicalIndication> idn =null;
             // 暂停图谱查询服务
-            /*
             if(newindSet.contains("肾功能不全")){
                 idn = neo4jAPI.getIdn(newindSet, age, sex,serumCreatinine);
                 if(idn!= null && idn.size()>0){
                     idns.addAll(idn);
                 }
             }
-            */
             newindSet1 = mergerIndex(newindSet1, mergeMap);
             if(newindSet1 != null && newindSet1.size()>0){
                 for (String ind:newindSet1
@@ -335,7 +329,7 @@ public class GraphCalculate {
 
         Map<String, List<FeatureRate>> lisPacs = new HashMap<>();
         // 暂停图谱查询服务
-//        lisPacs = neo4jAPI.getLisPacs(searchData);
+        lisPacs = neo4jAPI.getLisPacs(searchData);
         return lisPacs;
     }
     /**