Merge remote-tracking branch 'origin/beilun/dev' into beilun/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/beilun/behospitalized/BEH02980.java

@@ -195,17 +195,17 @@ public class BEH02980 extends QCCatalogue {
                     allergyNum = 2;
                 }
             } else {
-                int index = text.indexOf(dgname);
+                int index = text.lastIndexOf(dgname);
                 text = text.substring(Math.max(0, index - 10), index);
-                if (allergyNum == 0 && !neg_diags.contains(dgname) && !text.contains("其他")) {
+                if (allergyNum == 0 && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
                     neg_diags.add(dgname);
                     dgs.add(dgname);
                 }
-                if (allergyNum == 1 && text.contains("食物") && !neg_diags.contains(dgname) && !text.contains("其他")) {
+                if (allergyNum == 1 && text.contains("食物") && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
                     neg_diags.add(dgname);
                     dgs.add(dgname);
                 }
-                if (allergyNum == 2 && text.contains("药物") && !neg_diags.contains(dgname) && !text.contains("其他")) {
+                if (allergyNum == 2 && text.contains("药物") && !neg_diags.contains(dgname) && !text.contains("其他") && !text.contains("其它")) {
                     neg_diags.add(dgname);
                     dgs.add(dgname);
                 }