月经期规则修改，关闭化验，辅检，手术同义词转换

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

@@ -14,6 +14,7 @@ import com.diagbot.model.ai.AIAnalyze;
 import com.diagbot.model.entity.BodyPart;
 import com.diagbot.model.entity.Clinical;
 import com.diagbot.model.entity.Modification;
+import com.diagbot.model.entity.Operation;
 import com.diagbot.model.entity.Pacs;
 import com.diagbot.model.entity.Vital;
 import com.diagbot.model.label.ChiefLabel;
@@ -22,7 +23,6 @@ import com.diagbot.model.label.PacsLabel;
 import com.diagbot.model.label.PastLabel;
 import com.diagbot.model.label.PresentLabel;
 import com.diagbot.model.label.VitalLabel;
-import com.diagbot.model.label.*;
 import com.diagbot.rule.CommonRule;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.CoreUtil;
@@ -33,14 +33,25 @@ import com.diagbot.vo.NeoPushVO;
 import com.diagbot.vo.RuleVO;
 import com.diagbot.vo.SearchData;
 import com.diagbot.vo.StandConvert;
-import com.diagbot.vo.neoPushEntity.*;
+import com.diagbot.vo.neoPushEntity.ChiefPushVo;
+import com.diagbot.vo.neoPushEntity.Diag;
+import com.diagbot.vo.neoPushEntity.DiagVo;
+import com.diagbot.vo.neoPushEntity.Drug;
+import com.diagbot.vo.neoPushEntity.LisPushVo;
+import com.diagbot.vo.neoPushEntity.PacsPushVo;
+import com.diagbot.vo.neoPushEntity.PresentPushVo;
+import com.diagbot.vo.neoPushEntity.Symptom;
 import com.google.common.collect.Lists;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**

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

@@ -7,6 +7,7 @@ import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.MsgUtil;
+import com.diagbot.util.RegexUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -14,8 +15,6 @@ import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * @description: 人群规则
@@ -88,12 +87,9 @@ public class GroupRule {
                 break;
             case "月经期":
                 String regex = "月经第(([零一二三四五六七八九十]{0,3})||([0-9]{0,2}))天";
-                Pattern pattern = Pattern.compile(regex);
-                Matcher matcher = pattern.matcher(symptom);
-                boolean rs = matcher.find();
-                Matcher matcher1 = pattern.matcher(menstrual);
-                boolean rs1 = matcher1.find();
-                if (rs || rs1 || symptom.contains("经期") || menstrual.contains("经期")) {
+                String regex2 = "(?<!上一次)经期";
+                if (RegexUtil.getRegexRes(symptom, regex) || RegexUtil.getRegexRes(menstrual, regex)
+                        || RegexUtil.getRegexRes(symptom, regex2) || RegexUtil.getRegexRes(menstrual, regex2)) {
                     flag = true;
                 }
                 break;

src/main/java/com/diagbot/util/CoreUtil.java

@@ -254,6 +254,23 @@ public class CoreUtil {
 
     }
 
+    /**
+     * 将列表中uniqueName为空的值，用其他属性值赋值
+     *
+     * @param list
+     * @param targetProperty
+     * @param <T>
+     */
+    public static <T> void setUninameFromDetail(List<T> list, String targetProperty) {
+        for (T r : list) {
+            String value = (String)getFieldValue(r, "uniqueName");
+            if (StringUtil.isBlank(value)) {
+                String detailName = (String) getFieldValue(r, targetProperty);
+                setFieldValue(r, targetProperty, detailName);
+            }
+        }
+    }
+
     /**
      * 对象赋值
      *