|
@@ -50,8 +50,8 @@ public class THR03137 extends QCCatalogue {
|
|
|
if(medicalOrderName.startsWith("停")){
|
|
|
continue;
|
|
|
}
|
|
|
- String rex1="[\\s\\S]*(?=转)[\\s\\S]{0,6}(?=科)[\\s\\S]*";
|
|
|
- String rex2="[\\s\\S]*(?=科)[\\s\\S]{0,6}(?=转)[\\s\\S]*";
|
|
|
+ String rex1="[\\s\\S]*(?=转)[^,;,;。]*(?=科)[\\s\\S]*";
|
|
|
+ String rex2="[\\s\\S]*(?=科)[^,;,;。]*(?=转)[\\s\\S]*";
|
|
|
if(medicalOrderName.matches(rex1)||medicalOrderName.matches(rex2)) {
|
|
|
flag = true;
|
|
|
break ;
|