|
@@ -21,7 +21,13 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Arrays;
|
|
|
+import java.util.HashSet;
|
|
|
+import java.util.Iterator;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -263,7 +269,7 @@ public class BEH0011 extends QCCatalogue {
|
|
|
}
|
|
|
long diabetes = initDiags.stream().filter(x -> x.contains("糖尿病")).count();
|
|
|
for (String diabetesDrug : diabetesDrugs) {
|
|
|
- if (checkText.contains(diabetesDrug) && diabetes == 0) {
|
|
|
+ if (checkText.contains(diabetesDrug) && checkText.contains("糖尿病") && diabetes == 0) {
|
|
|
if (StringUtil.isBlank(info.get()) || !info.get().contains("糖尿病")) {
|
|
|
info.set(CatalogueUtil.concatInfo(info.get(), "糖尿病"));
|
|
|
status.set("-1");
|
|
@@ -274,7 +280,7 @@ public class BEH0011 extends QCCatalogue {
|
|
|
}
|
|
|
long hypertension = initDiags.stream().filter(x -> x.contains("高血压")).count();
|
|
|
for (String feritinDrug : feritinDrugs) {
|
|
|
- if (checkText.contains(feritinDrug) && hypertension == 0) {
|
|
|
+ if (checkText.contains(feritinDrug) && checkText.contains("高血压") && hypertension == 0) {
|
|
|
if (StringUtil.isBlank(info.get()) || !info.get().contains("高血压")) {
|
|
|
info.set(CatalogueUtil.concatInfo(info.get(), "高血压"));
|
|
|
status.set("-1");
|