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