工具类

src/main/java/com/diagbot/process/BillProcess.java

@@ -5,9 +5,10 @@ import com.diagbot.dto.BillMsg;
 import com.diagbot.dto.BillNeoDTO;
 import com.diagbot.dto.DrugBillNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
-import com.diagbot.rule.SexRule;
 import com.diagbot.rule.AgeRule;
 import com.diagbot.rule.DiseaseRule;
+import com.diagbot.rule.SexRule;
+import com.diagbot.util.CoreUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -67,18 +68,16 @@ public class BillProcess {
             List<DrugBillNeoDTO> drugBillNeoDTOList = bill.getDrugBillNeoDTOList();
             for (DrugBillNeoDTO drug : drugBillNeoDTOList) {
                 // 性别
-                BillMsg billMsg = AgeRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
+                BillMsg sexMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
+                CoreUtil.addBeanToList(drugBill, sexMsg);
+
                 // 诊断
                 BillMsg billMsg_disease = DiseaseRule.compareDiseaseWithBill(drug.getDisease(), wordCrfDTO, bill.getName());
-                BillMsg billMsg = SexRule.compareSexWithBill(drug.getGender(), wordCrfDTO, bill.getName());
-                if (billMsg != null) {
-                    drugBill.add(billMsg);
-                }
+                CoreUtil.addBeanToList(drugBill, billMsg_disease);
 
                 // 年龄
-                if(billMsg_disease != null){
-                    drugBill.add(billMsg_disease);
-                }
+                BillMsg ageMsg = AgeRule.compareAgeWithBill(drug.getAgeNeoDTO(), wordCrfDTO, bill.getName());
+                CoreUtil.addBeanToList(drugBill, ageMsg);
             }
         }
         billDTO.setDrugBill(drugBill);

src/main/java/com/diagbot/util/CoreUtil.java

@@ -195,6 +195,21 @@ public class CoreUtil {
         return billMsg;
     }
 
+    /**
+     * 将对象添加到列表中
+     *
+     * @param list
+     * @param t
+     * @param <T>
+     */
+    public static <T> void addBeanToList(List<T> list, T t) {
+        if (ListUtil.isNotEmpty(list)) {
+            if (t != null) {
+                list.add(t);
+            }
+        }
+    }
+
     public static void main(String[] args) {
 
         System.out.println(getCommonBillMsg("男性", "尿常规"));