Merge remote-tracking branch 'origin/push-grade' into push-test

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

@@ -124,11 +124,11 @@ public class PreProcess {
                         medicalIndicationDetail.setType(4);
                         JSONObject jsonObject = new JSONObject();
                         jsonObject.put("controlType",2);
-                        jsonObject.put("name",rules.get(0).getIdx_name()+"："+rules.get(0).getRemind());
+                        jsonObject.put("name",pacsResult);
                         medicalIndicationDetail.setContent(jsonObject);
                         mds.add(medicalIndicationDetail);
                         MedicalIndication medicalIndication = new MedicalIndication();
-                        medicalIndication.setName(pacsResult);
+                        medicalIndication.setName(rules.get(0).getIdx_name()+"："+rules.get(0).getRemind());
                         medicalIndication.setDetails(mds);
                         reminder.add(medicalIndication);
                     }