wangsy 3 роки тому
батько
коміт
d660f48bae

+ 12 - 7
kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03315.java

@@ -20,6 +20,7 @@ import com.lantone.qc.pub.model.label.DiagLabel;
 import com.lantone.qc.pub.model.vo.SimilarityVo;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -50,7 +51,7 @@ public class OPE03315 extends QCCatalogue {
         if (beHospitalizedDoc == null && firstPageRecordDoc == null) {
             return;
         }
-        //匹配疾病正则
+        //匹配疾病正则  是否妊娠合并子宫瘢痕的正则
         String rex = Content.PDZZ_RZZGBH;
         //创建存储能匹配疾病的集合
         List<String> diagList = new ArrayList<>();
@@ -99,7 +100,8 @@ public class OPE03315 extends QCCatalogue {
         if (ListUtil.isEmpty(diagList)) {
             return;
         }
-        List<String> diagCollectList = diagList.stream().distinct().collect(Collectors.toList());
+        List<String> diagCollectList = diagList.stream().distinct().collect(Collectors.toList());//去重
+
         if (ListUtil.isNotEmpty(diagCollectList)) {
             status.set("-1");
             //获取手术记录
@@ -121,11 +123,14 @@ public class OPE03315 extends QCCatalogue {
                     continue;
                 }
                 for (String diagCollectName : diagCollectList) {
-                    if (StringUtil.isNotEmpty(operationDiagO) && StringUtil.isNotEmpty(diagCollectName)) {
-                        if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
-                                status.set("0");
-                                return;
+                    String[] split = diagCollectName.split(" ");
+                    for (String diagCollectNames : split) {
+                        if (StringUtil.isNotEmpty(operationDiagO) && StringUtil.isNotEmpty(diagCollectNames)) {
+                            if (StringUtil.isNotEmpty(operationDiagO)) {
+                                if (getLikeRate(operationDiagO, diagCollectNames) || operationDiagO.contains(diagCollectNames)) {
+                                    status.set("0");
+                                    return;
+                                }
                             }
                         }
                     }