Merge branch 'develop' into dev/allergen20210907

# Conflicts:
#	src/main/java/com/diagbot/facade/BillFacade.java
#	src/main/java/com/diagbot/rule/OtherRule.java

src/main/java/com/diagbot/facade/BillFacade.java

@@ -12,6 +12,7 @@ import com.diagbot.process.BillProcess;
 import com.diagbot.rule.DrugRule;
 import com.diagbot.rule.OtherRule;
 import com.diagbot.util.MsgNewUtil;
+import com.diagbot.rule.OtherRule;
 import com.diagbot.util.RedisUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.Drug;
@@ -60,11 +61,13 @@ public class BillFacade {
         // 【特殊规则】过敏原自身过敏
         otherRule.allergy(wordCrfDTO, res);
 
+        // 【特殊规则】七院：非阻塞性睡眠呼吸暂停综合征且非混合性睡眠呼吸暂停综合征，不宜同时开立睡眠呼吸监测和眼电图（EOG）（双眼）
+        otherRule.smhxjcAndYdteog(wordCrfDTO, res);
+
         // 结果去重处理
         commonFacade.dealMsg(res.getBillMsgList());
     }
 
-
     /**
      * 获取开单项入参
      *

src/main/java/com/diagbot/model/ai/process/EntityProcessLis.java

@@ -111,8 +111,10 @@ public class EntityProcessLis extends EntityProcess {
         if (value.trim().length() > 0) {
             val_unit = extract_digit_new(value);
         }
-        pd.setValue(val_unit[0]);
-        pd.setUnit(val_unit[1]);
+        if (val_unit != null && val_unit.length == 2) {
+            pd.setValue(val_unit[0]);
+            pd.setUnit(val_unit[1].trim()); // 单位去空格
+        }
         return pd;
     }