zhoutg 5 anos atrás
pai
commit
4a9d3bfd1d

+ 7 - 4
knowledgeman-service/src/main/java/com/diagbot/facade/DiagnoseFacade.java

@@ -533,9 +533,11 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                         }
                     }
                     // 以上校验全部通过之后再校验业务异常,例如:诊断公式里有化验和辅检编码,则化验和辅检数据必须完整
+                    // TODO 待修改
                     if (!diagnoseName.contains(key)) {
                         for (DiagnoseDetail det : lis) {
-
+                            String regex = "(.*" + det.getCode().replace(".", "\\\\.") + ")|(.*" +
+                                    det.getCode().replace(".", "\\\\.") + "\\\\D.*)";
                         }
                     }
                 }
@@ -900,8 +902,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     }
 
     public static void main(String[] args) {
-        String str = "1.3/1.4";
-        String regex = "(.*3\\.1)|(.*3\\.1\\D.*)";
-        System.out.println(str.matches(regex));
+        String str = "1.3";
+        String regex = "(.*" + str.replace(".", "\\\\.") + ")|(.*" +
+                str.replace(".", "\\\\.") + "\\\\D.*)";
+        System.out.println(regex);
     }
 }