Merge remote-tracking branch 'origin/shaoyf/dev-wsy' into shaoyf/dev

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02985.java

@@ -217,7 +217,7 @@ public class THR02985 extends QCCatalogue {
         }
         if (StringUtil.isNotBlank(sb.toString())) {
             this.status.set("-1");
-            this.info.set("医嘱:" + sb.toString().substring(0, sb.toString().length() - 1));
+            this.info.set("医嘱：" + sb.toString().substring(0, sb.toString().length() - 1));
             extData.set(data);
         }
     }
@@ -386,7 +386,7 @@ public class THR02985 extends QCCatalogue {
      * @param date
      */
     private void infoAppend(StringBuffer sb, String drugKey, String date) {
-        sb.append(drugKey).append("(").append(date).append(")").append(".");
+        sb.append(drugKey).append("(").append(date).append(")").append("_");
     }
 
     private static final String[] KSS = {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02986.java

@@ -213,7 +213,7 @@ public class THR02986 extends QCCatalogue {
         }
         if (StringUtil.isNotBlank(sb.toString())) {
             this.status.set("-1");
-            this.info.set("医嘱:" + sb.toString().substring(0, sb.toString().length() - 1));
+            this.info.set("医嘱：" + sb.toString().substring(0, sb.toString().length() - 1));
             extData.set(data);
         }
     }
@@ -364,12 +364,12 @@ public class THR02986 extends QCCatalogue {
      * @param str
      * @return
      */
-    private String removeBracket(String str) {
-        if (str.contains("]") && str.indexOf("]") != str.length() - 1) {
-            return str.substring(str.indexOf("]") + 1);
-        }
-        return str;
-    }
+//    private String removeBracket(String str) {
+//        if (str.contains("]") && str.indexOf("]") != str.length() - 1) {
+//            return str.substring(str.indexOf("]") + 1);
+//        }
+//        return str;
+//    }
 
     /**
      * 拼接提示信息
@@ -379,7 +379,7 @@ public class THR02986 extends QCCatalogue {
      * @param date
      */
     private void infoAppend(StringBuffer sb, String drugKey, String date) {
-        sb.append(drugKey).append("(").append(date).append(")").append(".");
+        sb.append(drugKey).append("(").append(date).append(")").append("_");
     }
 
     private static final String[] JS = {

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03070.java

@@ -168,7 +168,7 @@ public class THR03070 extends QCCatalogue {
 
         if (sb.toString().length() > 0) {
             status.set("-1");
-            info.set("化验:" + sb.toString().substring(0, sb.toString().length() - 1));
+            info.set("化验：" + sb.toString().substring(0, sb.toString().length() - 1));
         }
     }
 
@@ -193,7 +193,7 @@ public class THR03070 extends QCCatalogue {
     private void infoAppend(StringBuffer sb, String repNm, Map<String, String> abnormalMap) {
         for (Map.Entry<String, String> map : abnormalMap.entrySet()) {
             if (repNm.equals(map.getKey())) {
-                sb.append(repNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(map.getValue()))).append(")").append(".");
+                sb.append(repNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(map.getValue()))).append(")").append("_");
             }
         }
     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03071.java

@@ -100,7 +100,7 @@ public class THR03071 extends QCCatalogue {
 
         if (sb.toString().length() > 0) {
             status.set("-1");
-            info.set("检查:" + sb.toString().substring(0, sb.toString().length() - 1));
+            info.set("检查：" + sb.toString().substring(0, sb.toString().length() - 1));
         }
     }
 
@@ -133,7 +133,7 @@ public class THR03071 extends QCCatalogue {
         for (Map.Entry<String, Set<String>> map : pacsDate.entrySet()) {
             if (reptNm.equals(map.getKey())) {
                 for (String date : map.getValue()) {
-                    sb.append(reptNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(date))).append(")").append(".");
+                    sb.append(reptNm).append("(").append(DateUtil.formatDateTime(StringUtil.parseDateTime(date))).append(")").append("_");
                 }
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03076.java

@@ -259,7 +259,7 @@ public class THR03076 extends QCCatalogue {
      * @param date
      */
     private void infoAppend(StringBuffer sb, String drugKey, String date) {
-        sb.append(drugKey).append("(").append(date).append(")").append("、");
+        sb.append(drugKey).append("(").append(date).append(")").append("_");
     }
 
     /**