Merge branch 'dev/orderExclusion20210813' into dev/dateValue20210805

doc/016.20210813化验、辅检开单互斥项修改提示语/med2021_init.sql

@@ -0,0 +1,4 @@
+USE `med_2021`;
+
+UPDATE `med_2021`.`kl_dictionary_info` SET `val`='检验项目互斥：[匹配内容]与[开单名称]不宜同时进行[原因及建议]' WHERE name='化验_开单项互斥';
+UPDATE `med_2021`.`kl_dictionary_info` SET `val`='检查项目互斥：[匹配内容]与[开单名称]不宜同时进行[原因及建议]' WHERE name='辅检_开单项互斥';

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

@@ -408,20 +408,15 @@ public class CommonRule {
             List<T> orginNameList = map.get(ruleBaseDTO.getBaseLibName());
             if (map.get(ruleBaseDTO.getBaseLibName()) != null) {
                 for (T bean : orginNameList) {
-                    String orderDateValue = ReflectUtil.getProperty(ruleSimpleDTO, "dateValue");
-                    String beanDateValue = ReflectUtil.getProperty(bean, "dateValue");
-                    int dateFlag = CoreUtil.compareTime(beanDateValue, orderDateValue);
-                    if (dateFlag == 1) {
-                        String orginName = ReflectUtil.getProperty(bean, "name");
-                        // A与B不宜同时进行, B与A不宜同时进行 只能提示一个
-                        // if (!set.contains(ruleSimpleDTO.getLibName() + "******" + orginName)) {
-                        //     set.add(ruleSimpleDTO.getLibName() + "******" + orginName);
-                        //     set.add(orginName + "******" + ruleSimpleDTO.getLibName());
-                            ruleSimpleDTO.setContent(orginName);
-                            ruleSimpleDTO.setConType(conType);
-                            BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
-                            CoreUtil.addBeanToList(billMsgList, billMsg);
-                        // }
+                    String orginName = ReflectUtil.getProperty(bean, "name");
+                    // A与B不宜同时进行, B与A不宜同时进行 只能提示一个
+                    if (!set.contains(ruleSimpleDTO.getLibName() + "******" + orginName)) {
+                        set.add(ruleSimpleDTO.getLibName() + "******" + orginName);
+                        set.add(orginName + "******" + ruleSimpleDTO.getLibName());
+                        ruleSimpleDTO.setContent(orginName);
+                        ruleSimpleDTO.setConType(conType);
+                        BillMsg billMsg = msgNewUtil.getCommonBillMsg(ruleSimpleDTO);
+                        CoreUtil.addBeanToList(billMsgList, billMsg);
                     }
                 }
             }