|
@@ -306,11 +306,14 @@ public class THR02986 extends QCCatalogue {
|
|
|
if ((doctorAdviceDate.before(wardDate) && !CatalogueUtil.compareTime(doctorAdviceDate, wardDate, days * 24 * 60L))
|
|
|
|| (wardDate.before(doctorAdviceDate) && !CatalogueUtil.compareTime(wardDate, doctorAdviceDate, 24 * 60L))) {
|
|
|
boolean findDrug = false;
|
|
|
+ String standardDrug = null;
|
|
|
for (String drug : drugs) {
|
|
|
if (StringUtil.isBlank(drug)) {
|
|
|
continue;
|
|
|
}
|
|
|
- if (content.contains(drug.replaceAll("[^\\u4e00-\\u9fa5]", ""))
|
|
|
+ drug = drug.replaceAll("[^\\u4e00-\\u9fa5]", "");
|
|
|
+ standardDrug = similarityUtil.getDrugStandardWord(drug);
|
|
|
+ if (content.contains(drug) || (StringUtil.isNotBlank(content) && StringUtil.isNotBlank(standardDrug) && content.contains(standardDrug))
|
|
|
|| (existDrug.contains(drug) && (regexFind(content, "继续", "治疗") || regexFind(content, "维持", "治疗")
|
|
|
|| regexFind(content, "继续", "抗感染") || regexFind(content, "治疗", "同前")))) {
|
|
|
findDrug = true;
|