辅检结果正则匹配放入pacslable中的pacsNumList

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

@@ -155,20 +155,15 @@ public class KlRegularConfigFacade extends KlRegularConfigServiceImpl {
         if(ListUtil.isNotEmpty(rulesTepy)){
             for (KlRegularConfig klrc:rulesTepy) {
                 String rulesValue = klrc.getRulesValue();
-                //找出所有匹配的，例如“心率40次/分” ,“心率23.25”
-                List<String> regexDataAll = RegexUtil.getRegexDataAll(pacs, rulesValue);
-                if(ListUtil.isNotEmpty(regexDataAll)){
-                    for (String content:regexDataAll) {
-                        //每个匹配的分组 例如 “心率40次/分” => 心率,40,次/分
-                        List<String> group_contents = RegexUtil.getRegexDataList(content, rulesValue);
+                List<List<String>> regexGroupData = RegexUtil.getRegexGroupData(pacs, rulesValue);
+                if(ListUtil.isNotEmpty(regexGroupData)){
+                    for (List<String> group_contents:regexGroupData) {
                         PacsNum pacsNum = new PacsNum();
                         pacsNum.setName(group_contents.get(0));
                         pacsNum.setStandName(group_contents.get(0));
                         PD pd = new PD();
                         pd.setValue((group_contents.get(1)));
-                        if(group_contents.size() == 3){
-                            pd.setUnit(group_contents.get(2));
-                        }
+                        pd.setUnit(group_contents.get(2));
                         pacsNum.setPd(pd);
                         pacsNumList.add(pacsNum);
                     }