|
@@ -90,24 +90,24 @@ public class LEA02987 extends QCCatalogue {
|
|
|
boolean isFind = false;
|
|
|
String drugStandardWord = similarityUtil.getDrugStandardWord(drug);
|
|
|
if (StringUtil.isNotBlank(drugStandardWord) && (leaveDrugStandard.contains(drugStandardWord)
|
|
|
- || dischargeOrder.contains(drugStandardWord))) {
|
|
|
- isFind = true;
|
|
|
- }
|
|
|
- Set<String> splitDrugs = CatalogueUtil.getRegexWords(drug, "[((\\[][^\\[\\]()()]+[\\]))]");
|
|
|
- for (String sd : splitDrugs) {
|
|
|
- if (dischargeOrder.contains(sd)) {
|
|
|
+ || dischargeOrder.contains(drugStandardWord) || dischargeOrder.contains(drug))) {
|
|
|
isFind = true;
|
|
|
- break;
|
|
|
+ }
|
|
|
+ Set<String> splitDrugs = CatalogueUtil.getRegexWords(drug, "[((\\[][^\\[\\]()()]+[\\]))]");
|
|
|
+ for (String sd : splitDrugs) {
|
|
|
+ if (dischargeOrder.contains(sd)) {
|
|
|
+ isFind = true;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!isFind) {
|
|
|
+ infoStr = CatalogueUtil.concatInfo(infoStr, drug);
|
|
|
}
|
|
|
}
|
|
|
- if (!isFind) {
|
|
|
- infoStr = CatalogueUtil.concatInfo(infoStr, drug);
|
|
|
+ if (StringUtil.isNotBlank(infoStr)) {
|
|
|
+ status.set("-1");
|
|
|
+ info.set(infoStr);
|
|
|
}
|
|
|
}
|
|
|
- if (StringUtil.isNotBlank(infoStr)) {
|
|
|
- status.set("-1");
|
|
|
- info.set(infoStr);
|
|
|
- }
|
|
|
- }
|
|
|
|
|
|
-}
|
|
|
+ }
|