Merge remote-tracking branch 'origin/master'

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

@@ -10,6 +10,8 @@ import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.model.entity.Clinical;
 import com.diagbot.model.entity.Diag;
+import com.diagbot.model.entity.Medicine;
+import com.diagbot.model.entity.Operation;
 import com.diagbot.model.label.ChiefLabel;
 import com.diagbot.model.label.DiagLabel;
 import com.diagbot.model.label.PresentLabel;
@@ -74,6 +76,8 @@ public class BillProcess {
         PresentLabel presentLabel = wordCrfDTO.getPresentLabel();
         List<Diag> diags = new ArrayList<>();
         List<Clinical> clinicals = new ArrayList<>();
+        List<Operation> operations = presentLabel.getOperations();
+        List<Medicine> medicines = presentLabel.getMedicines();
         if(diagLabel != null){
             diags = diagLabel.getDiags();
         }
@@ -104,6 +108,15 @@ public class BillProcess {
             //临床表现
             DiagRule.compareDiseaseWithBill(bill.getClinicfindings(), clinicals, bill, billMsgList);
 
+            //手术
+            DiagRule.compareDiseaseWithBill(bill.getOperations(), operations, bill, billMsgList);
+
+            //禁忌过敏药品
+            DiagRule.compareDiseaseWithBill(bill.getAllergicmeds(), medicines, bill, billMsgList);
+
+            //服用药品
+            DiagRule.compareDiseaseWithBill(bill.getOralmeds(), medicines, bill, billMsgList);
+
             // 年龄
             AgeRule.compareAgeWithBill(wordCrfDTO, bill, billMsgList);