Преглед на файлове

抗生素名称不截取中括号

wangsy преди 4 години
родител
ревизия
0149ec59c3
променени са 1 файла, в които са добавени 2 реда и са изтрити 4 реда
  1. 2 4
      kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02985.java

+ 2 - 4
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02985.java

@@ -10,7 +10,6 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.doc.*;
 import com.lantone.qc.pub.model.doc.consultation.ConsultationDoc;
-import com.lantone.qc.pub.model.doc.consultation.ConsultationResultsDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDiscussionDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationDoc;
 import com.lantone.qc.pub.model.doc.operation.OperationRecordDoc;
@@ -173,7 +172,7 @@ public class THR02985 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());
             /**********************************************先文本匹配************************************************/
@@ -210,9 +209,8 @@ public class THR02985 extends QCCatalogue {
                     break;
                 }
             }
-
             if (StringUtil.isNotBlank(missDrug) && !modelFind && CatalogueUtil.compareTime(doctorAdviceDate, new Date(), 48 * 60L)) {
-                infoAppend(sb, splitDrugs.toString().replaceAll("[\\[\\]]", ""), DateUtil.formatDate(doctorAdviceDate));
+                infoAppend(sb, drugs, DateUtil.formatDate(doctorAdviceDate));
                 data.put(doctorAdviceDate, splitDrugs.toString().replaceAll("[\\[\\]]", ""));
             }
         }