Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/dto/BillNeoMaxDTO.java

@@ -42,8 +42,8 @@ public class BillNeoMaxDTO {
     // 禁忌手术
     private List<NodeNeoDTO> operations = new ArrayList<>();
 
-    // 禁忌操作（禁忌医疗器械及物品）
-    private List<NodeNeoDTO> procedures = new ArrayList<>();
+    // 禁忌医疗器械及物品
+    private List<NodeNeoDTO> meddevice = new ArrayList<>();
 
     // 禁忌实验室检查
     private List<NodeNeoDTO> lis = new ArrayList<>();

src/main/java/com/diagbot/rule/MedEquRule.java

@@ -28,7 +28,7 @@ public class MedEquRule {
      */
     public void bill(String text, BillNeoMaxDTO billNeoMaxDTO, List<BillMsg> billMsgList, String type) {
         if (StringUtil.isNotBlank(text)) {
-            List<NodeNeoDTO> medEquList = billNeoMaxDTO.getProcedures();
+            List<NodeNeoDTO> medEquList = billNeoMaxDTO.getMeddevice();
             if (ListUtil.isNotEmpty(medEquList)) {
                 for (NodeNeoDTO node : medEquList) {
                     if (text.contains(node.getName())) {