Merge remote-tracking branch 'origin/push-dev-edite' into push-test

graph/src/main/java/org/diagbot/graph/medicationProcess/PushTreat.java

@@ -70,6 +70,8 @@ public class PushTreat {
             treatmentPlanList = treatmentPlanList_otherrule;
         }else if(treatDetailList_rule.size() == 1 && !disName.equals(name)){
             treatmentPlanList =treatDetailList_rule;
+        }else {
+            treatmentPlanList = treatDetailList_rule;
         }
         // TODO: 2019/11/19     规则不满足的情况下，返回主诊断的用药情况
         if(treatmentPlanList.size() == 0){