|
@@ -154,6 +154,7 @@ public class GraphCalculate {
|
|
String pacsOrder = searchData.getPacsOrder();
|
|
String pacsOrder = searchData.getPacsOrder();
|
|
//指标推送
|
|
//指标推送
|
|
if (featureTypeList.contains("22") ) {
|
|
if (featureTypeList.contains("22") ) {
|
|
|
|
+ List<MedicalIndication> idns =new ArrayList<>();
|
|
// List<MedicalIndication> pacsMi = getPacsMi(pacsOrder, inputList,webDiag);
|
|
// List<MedicalIndication> pacsMi = getPacsMi(pacsOrder, inputList,webDiag);
|
|
Set<String> newindSet = new HashSet<>();
|
|
Set<String> newindSet = new HashSet<>();
|
|
Set<String> newindSet1 = new HashSet<>();
|
|
Set<String> newindSet1 = new HashSet<>();
|
|
@@ -176,10 +177,12 @@ public class GraphCalculate {
|
|
|
|
|
|
}
|
|
}
|
|
logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
|
|
logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
|
|
|
|
+ List<MedicalIndication> idn =null;
|
|
if(newindSet.contains("肾功能不全")){
|
|
if(newindSet.contains("肾功能不全")){
|
|
- List<MedicalIndication> idn = neo4jAPI.getIdn(newindSet, age, sex);
|
|
|
|
-// pacsMi.addAll(idn);
|
|
|
|
- responseData.setMedicalIndications(idn);
|
|
|
|
|
|
+ idn = neo4jAPI.getIdn(newindSet, age, sex);
|
|
|
|
+ if(idn!= null && idn.size()>0){
|
|
|
|
+ idns.addAll(idn);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if(newindSet1 != null && newindSet1.size()>0){
|
|
if(newindSet1 != null && newindSet1.size()>0){
|
|
for (String ind:newindSet1
|
|
for (String ind:newindSet1
|
|
@@ -197,11 +200,11 @@ public class GraphCalculate {
|
|
medicalIndicationDetail.setContent(jsonObject);
|
|
medicalIndicationDetail.setContent(jsonObject);
|
|
ds.add(medicalIndicationDetail);
|
|
ds.add(medicalIndicationDetail);
|
|
medicalIndication.setDetails(ds);
|
|
medicalIndication.setDetails(ds);
|
|
- boolean add = responseData.getMedicalIndications().add(medicalIndication);
|
|
|
|
|
|
+ idns.add(medicalIndication);
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-// responseData.setMedicalIndications(pacsMi);
|
|
|
|
|
|
+ responseData.setMedicalIndications(idns);
|
|
|
|
|
|
}
|
|
}
|
|
|
|
|