wangzaijun 3 hete
szülő
commit
9bda2f2a1f

+ 8 - 1
mo-daq/src/main/java/com/smppw/modaq/application/components/OCRReportParser.java

@@ -87,6 +87,13 @@ public class OCRReportParser {
         if ("无".equals(trim) || "否".equals(trim)) {
             return null;
         }
-        return trim;
+        String value = ReportParseUtils.cleaningValue(trim);
+        if (value == null) {
+            return null;
+        }
+        if (value.contains("、") || value.contains(",")) {
+            return value.replaceAll("、,", ",");
+        }
+        return value;
     }
 }

+ 2 - 0
mo-daq/src/main/java/com/smppw/modaq/application/components/ReportParseUtils.java

@@ -228,6 +228,8 @@ public final class ReportParseUtils {
                     .replaceAll(";", ";")
                     .replaceAll(":", ":")
                     .replaceAll(" ", StrUtil.EMPTY)
+                    .replaceAll("【", StrUtil.EMPTY)
+                    .replaceAll("】", StrUtil.EMPTY)
                     .replaceAll(":", StrUtil.EMPTY);
             if (replaceEn) {
                 fieldValue = fieldValue.replaceAll("[a-zA-Z]", StrUtil.EMPTY);