|
@@ -42,12 +42,28 @@ public class OPE0323 extends QCCatalogue {
|
|
|
if (StringUtil.isBlank(signature)) {
|
|
|
return flag;
|
|
|
}
|
|
|
- signature = StringUtil.removeBlank(signature);
|
|
|
+ String[] signatureSplit=null;
|
|
|
+ signature = StringUtil.removeBlank(signature).replaceAll("]","");
|
|
|
+ if(signature.startsWith("/") || signature.endsWith("/")){
|
|
|
+ signature = StringUtil.removeBlank(signature).replaceAll("/","");
|
|
|
+ }else if(signature.contains("/")){
|
|
|
+ signatureSplit = signature.split("/");
|
|
|
+ }
|
|
|
if (StringUtil.isNotBlank(surgeon) && StringUtil.isNotBlank(assist1)) {
|
|
|
String operator = surgeon + ", " + assist1;
|
|
|
if (!operator.contains(signature)) {
|
|
|
flag = true;
|
|
|
}
|
|
|
+ if(signatureSplit!=null){
|
|
|
+ ss: for (String signatureSplits : signatureSplit) {
|
|
|
+ if(operator.contains(signatureSplits)){
|
|
|
+ flag=false;
|
|
|
+ }else {
|
|
|
+ flag = true;
|
|
|
+ break ss;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return flag;
|