指标整合，包括指标的来源和描述信息

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

@@ -164,16 +164,7 @@ public class AlgorithmController extends BaseController {
         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);
+           bigDataResponseData.getMedicalIndications().addAll(medicalIndications);
         }
         //推送管理评估
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());

push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -196,7 +196,7 @@ public class PreProcess {
                         MedicalIndication medind = new MedicalIndication();
                         medind.setSource(2);
                         medind.setName(rule.getRemind());
-                        medind.setDescription(detailname + ": " + otherval);
+                        medind.setDescription(detailname + ": " + otherval+ ", " +rule.getRemind() );
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());
@@ -238,7 +238,7 @@ public class PreProcess {
                         MedicalIndication medind = new MedicalIndication();
                         medind.setSource(2);
                         medind.setName(rule.getRemind());
-                        medind.setDescription(detailname + ": " + numval + " " + unit);
+                        medind.setDescription(detailname + ": " + numval + " " + unit+ "," +rule.getRemind());
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());