|
|
@@ -12,8 +12,11 @@ import org.diagbot.graph.jdbc.Neo4jAPI;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
import java.util.*;
|
|
|
import org.diagbot.graphWeb.util.MapValueComparator;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
|
|
|
public class GraphCalculate {
|
|
|
+ Logger logger = LoggerFactory.getLogger(GraphCalculate.class);
|
|
|
/**
|
|
|
* 返回诊断和治疗
|
|
|
* @param request
|
|
|
@@ -95,8 +98,10 @@ public class GraphCalculate {
|
|
|
for (FeatureRate fe:bigdataDiagFeature) {
|
|
|
if("neo4j".equals(fe.getRate())){
|
|
|
bigdataDiagList.add(fe.getFeatureName());
|
|
|
+ logger.info("图谱推出的诊断为: "+fe.getFeatureName());
|
|
|
}else {
|
|
|
bigdataDiagList.add(fe.getFeatureName());
|
|
|
+ logger.info("大数据推出的诊断为: "+fe.getFeatureName());
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -107,7 +112,8 @@ public class GraphCalculate {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+ logger.info("界面诊断为: " + webDiagList);
|
|
|
+ logger.info("推出的诊断合并为: " + bigdataDiagList);
|
|
|
Map<String, Set<String>> weblisPacs1 =null;
|
|
|
Map<String, Set<String>> biglisPacs1 =null;
|
|
|
if(webDiagList !=null && webDiagList.size()>0){
|
|
|
@@ -122,16 +128,24 @@ public class GraphCalculate {
|
|
|
if(weblisPacs1 !=null && weblisPacs1.values().size()>0){
|
|
|
lis = weblisPacs1.get("LIS");
|
|
|
pacs = weblisPacs1.get("PACS");
|
|
|
+ logger.info("界面有诊断的情况下,界面诊断推出的lis为: "+lis);
|
|
|
+ logger.info("界面有诊断的情况下,界面诊断推出的pacs为: "+pacs);
|
|
|
if(biglisPacs1 !=null && biglisPacs1.values().size()>0){
|
|
|
Set<String> bl = biglisPacs1.get("LIS");
|
|
|
Set<String> bp= biglisPacs1.get("PACS");
|
|
|
+ logger.info("界面有诊断的情况下,推出诊断的lis为: "+bl);
|
|
|
+ logger.info("界面有诊断的情况下,推出诊断的pacs为: "+bp);
|
|
|
lis.addAll(bl);
|
|
|
pacs.addAll(bp);
|
|
|
}
|
|
|
}else {
|
|
|
lis = biglisPacs1.get("LIS");
|
|
|
pacs = biglisPacs1.get("PACS");
|
|
|
+ logger.info("界面无诊断的情况下,推出诊断的lis为: "+lis);
|
|
|
+ logger.info("界面无诊断的情况下,推出诊断的lis为: "+pacs);
|
|
|
}
|
|
|
+ logger.info("推出的合并lis为: " + lis);
|
|
|
+ logger.info("推出的合并pacs为: " + pacs);
|
|
|
ArrayList<FeatureRate> lisFeature = new ArrayList<>();
|
|
|
ArrayList<FeatureRate> pacsFeature = new ArrayList<>();
|
|
|
for (String l:lis) {
|
kongwz