Quellcode durchsuchen

诊断依据导入

zhoutg vor 4 Jahren
Ursprung
Commit
4e86d58b5c

+ 3 - 4
src/main/java/com/diagbot/facade/KlDiagnoseImportFacade.java

@@ -215,13 +215,12 @@ public class KlDiagnoseImportFacade {
 
             //list元素计数
             Map<String, Long> orderNumMap = orderNums.stream().collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));
-            for (Map.Entry<String,Long> on:orderNumMap.entrySet()) {
-                if(on.getValue() > 1){
-                    sb.append(on.getKey().toString()+"序号重复存在;   ");
+            for (Map.Entry<String, Long> on : orderNumMap.entrySet()) {
+                if (on.getValue() > 1) {
+                    sb.append(String.format("%s序号重复;  ", "【" + on.getKey() + "】"));
                 }
             }
 
-
             //格式校验
             if (ListUtil.isNotEmpty(verifies)) {
                 for (String vef : verifies) {

+ 2 - 2
src/main/java/com/diagbot/util/VerifyUtil.java

@@ -40,7 +40,7 @@ public class VerifyUtil {
     	if (StringUtil.isBlank(text)) {
     		return false;
 		}
-		String regex = "任|一|二|三|四|五|六|七|八|九|十|\\[||\\]|\\+|、|\\d";
+		String regex = "任|一|二|三|四|五|六|七|八|九|十|\\[||\\]|\\+|、|\\d|\\.";
 		for (int i = 0; i < text.length(); i++) {
 			String s1 = String.valueOf(text.charAt(i));
 			boolean flag = s1.matches(regex);
@@ -170,7 +170,7 @@ public class VerifyUtil {
 	 * @return
 	 */
 	public static String verifyFormula(List<String> codeList, String s) {
-		String errMsg = String.format("%s 公式格式错误;  ",s);
+		String errMsg = String.format("%s公式格式错误;  ", "【" + s + "】");
 		try {
 			// 1、校验是否包含无效字符
 			if (!verifyText(s)) {