指标整合

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

@@ -158,9 +158,10 @@ public class GraphCalculate {
             //查找指标
             Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]));
             logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
-            List<MedicalIndication> idn = neo4jAPI.getIdn(indSet, age, sex);
-            responseData.setMedicalIndications(idn);
-
+            if(indSet.contains("肾功能不全")){
+                List<MedicalIndication> idn = neo4jAPI.getIdn(indSet, age, sex);
+                responseData.setMedicalIndications(idn);
+            }
         }
 
         //诊断推送

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -160,9 +160,19 @@ public class AlgorithmController extends BaseController {
         searchData.setPushDiags(pushDiags);
         bigDataResponseData.setTreat(graphResponseData.getTreat());
         //量表和指标推送
+        List<MedicalIndication> ruleMedicalIndications = RuleResponseData.getMedicalIndications();
         List<MedicalIndication> medicalIndications = graphResponseData.getMedicalIndications();
         if (medicalIndications != null && medicalIndications.size() > 0) {
             logger.info("指标推送!!!!!!!!!");
+            if(ruleMedicalIndications.size()>0){
+                for (MedicalIndication m:ruleMedicalIndications
+                     ) {
+                    MedicalIndication mI = new MedicalIndication();
+                    mI.setName(m.getName());
+                    medicalIndications.add(mI);
+                }
+            }
+
             bigDataResponseData.setMedicalIndications(medicalIndications);
         }
         //推送管理评估