|
@@ -24,6 +24,8 @@ import org.springframework.stereotype.Component;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.regex.Matcher;
|
|
|
+import java.util.regex.Pattern;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -108,7 +110,8 @@ public class OPE03313 extends QCCatalogue {
|
|
|
for (OperationDoc operationDoc : operationDocs) {
|
|
|
OperationDiscussionDoc operationDiscussionDoc = operationDoc.getOperationDiscussionDoc();
|
|
|
if (operationDiscussionDoc == null) {
|
|
|
- continue;
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
}
|
|
|
//获取术后诊断
|
|
|
Map<String, String> structureMap = operationDiscussionDoc.getStructureMap();
|
|
@@ -117,18 +120,21 @@ public class OPE03313 extends QCCatalogue {
|
|
|
if (StringUtil.isEmpty(operationDiagZ) && StringUtil.isEmpty(operationDiagO)) {
|
|
|
continue;
|
|
|
}
|
|
|
- for (String diagCollectName : diagCollectList) {
|
|
|
- if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
- if (StringUtil.isNotEmpty(operationDiagZ)) {
|
|
|
- if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
|
|
|
- status.set("0");
|
|
|
- return;
|
|
|
+ for (String diagCollect : diagCollectList) {
|
|
|
+ String[] split = diagCollect.split(" ");
|
|
|
+ for (String diagCollectName : split) {
|
|
|
+ if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
|
|
|
+ if (StringUtil.isNotEmpty(operationDiagZ)) {
|
|
|
+ if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- if (StringUtil.isNotEmpty(operationDiagO)) {
|
|
|
- if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
|
|
|
- status.set("0");
|
|
|
- return;
|
|
|
+ if (StringUtil.isNotEmpty(operationDiagO)) {
|
|
|
+ if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
|
|
|
+ status.set("0");
|
|
|
+ return;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|