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

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

@@ -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

@@ -169,7 +169,7 @@ public class THR02986 extends QCCatalogue {
             if (drugs.contains(" ")) {
                 drugs = drugs.split(" ")[0];
             }
-            drugs = removeBracket(drugs).replaceAll("[^\u4e00-\u9fa5]", "");
+//            drugs = removeBracket(drugs).replaceAll("[^\u4e00-\u9fa5]", "");
             Set<String> splitDrugs = CatalogueUtil.getRegexWords(drugs, "[(（\\[][^\\[\\]()（）]+[\\]）)]")
                     .stream().filter(x -> !x.equals("合资") && !x.equals("进口") && !x.equals("国产")).collect(Collectors.toSet());
             /**********************************************先文本匹配************************************************/
@@ -206,9 +206,8 @@ public class THR02986 extends QCCatalogue {
                     break;
                 }
             }
-
             if (StringUtil.isNotBlank(missDrug) && !modelFind && CatalogueUtil.compareTime(doctorAdviceDate, new Date(), 48 * 60L)) {
-                infoAppend(sb, splitDrugs.toString().replaceAll("[\\[\\]]", ""), DateUtil.formatDateTime(doctorAdviceDate));
+                infoAppend(sb, drugs, DateUtil.formatDateTime(doctorAdviceDate));
                 data.put(doctorAdviceDate, splitDrugs.toString().replaceAll("[\\[\\]]", ""));
             }
         }
@@ -380,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

@@ -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

@@ -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(".");
                 }
             }
         }