|
@@ -34,8 +34,9 @@ public class BEH0005 extends QCCatalogue {
|
|
|
List<PD> pds = chiefLabel.getPds();
|
|
|
String chiefText = chiefLabel.getText();
|
|
|
if (StringUtil.isNotBlank(chiefText)) {
|
|
|
- chiefText = chiefText.replace("月经", "");/* 月经这个词会影响逻辑判断,这里把月经这个词去除 */
|
|
|
- if (chiefText.contains("检查") || chiefText.contains("术后") || chiefText.contains("药物")) {
|
|
|
+// chiefText = chiefText.replace("月经", "");/* 月经这个词会影响逻辑判断,这里把月经这个词去除 */
|
|
|
+ if (chiefText.contains("检查") || chiefText.contains("术后")
|
|
|
+ || chiefText.contains("药物") || chiefText.contains("月经") || chiefText.contains("停经")) {
|
|
|
return;
|
|
|
} else {
|
|
|
List<String> words = Lists.newArrayList("年", "月", "周", "天", "日", "时", "分");
|
|
@@ -45,25 +46,25 @@ public class BEH0005 extends QCCatalogue {
|
|
|
if (StringUtil.isBlank(name)) {
|
|
|
continue;
|
|
|
}
|
|
|
- for (String word : words) {
|
|
|
+ for (int i = 0; i < words.size(); i++) {
|
|
|
+ String word = words.get(i);
|
|
|
if (name.contains(word)) {
|
|
|
- timeIndex.add(chiefText.indexOf(word));
|
|
|
+ timeIndex.add(i);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
}
|
|
|
- if (timeIndex.size() > 0) {
|
|
|
- int min = timeIndex.get(0);
|
|
|
- for (Integer data : timeIndex) {
|
|
|
- if (data < min) {
|
|
|
- min = data;
|
|
|
+ if (timeIndex.size() <= 1) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ for (int i = 0; i < timeIndex.size(); i++) {
|
|
|
+ for (int j = i + 1; j < timeIndex.size(); j++) {
|
|
|
+ if (timeIndex.get(i) > timeIndex.get(j)) {
|
|
|
+ status.set("-1");
|
|
|
+ return;
|
|
|
}
|
|
|
}
|
|
|
- if (min != timeIndex.get(0)) {
|
|
|
- status.set("-1");
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
}
|