义务妇保：新增产科规则对比时添加包含关系

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA03290.java

@@ -63,7 +63,7 @@ public class LEA03290 extends QCCatalogue {
             if (initialDiagLabel != null) {
                 List<Diag> diagLists = initialDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
 
@@ -71,14 +71,14 @@ public class LEA03290 extends QCCatalogue {
             if (revisedDiagLabel != null) {
                 List<Diag> diagLists = revisedDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
             }
             if (suppleDiagLabel != null) {
                 List<Diag> diagLists = suppleDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&( diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
             }
@@ -87,7 +87,7 @@ public class LEA03290 extends QCCatalogue {
         if (firstPageRecordDoc != null) {
             //获取出院诊断
             String leaveDiagStr = firstPageRecordDoc.getStructureMap().get("出院诊断");
-            if(StringUtil.isNotEmpty(leaveDiagStr)) {
+            if (StringUtil.isNotEmpty(leaveDiagStr)) {
                 List<Map<String, String>> leaveDiagList = (List<Map<String, String>>) JSONArray.parse(leaveDiagStr);
                 leaveDiagList.stream().filter(diagMap -> StringUtil.isNotEmpty(diagMap.get("诊断名称")) && (diagListWords.contains(diagMap.get("诊断名称")) || diagMap.get("诊断名称").matches(rex))).forEach(diagMap ->
                         diagList.add(diagMap.get("诊断名称")));
@@ -105,22 +105,12 @@ public class LEA03290 extends QCCatalogue {
             if (leaveHospitalDoc == null) {
                 return;
             }
-            DiagLabel leaveDiagLabel = leaveHospitalDoc.getLeaveDiagLabel();
-            if (leaveDiagLabel == null) {
-                return;
-            }
-            List<Diag> diags = leaveDiagLabel.getDiags();
-            if (ListUtil.isEmpty(diags)) {
-                return;
-            }
-            for (Diag diag : diags) {
-                String diagName = diag.getHospitalDiagName();
-                for (String diagCollectName : diagCollectList) {
-                    if (StringUtil.isNotEmpty(diagName) && StringUtil.isNotEmpty(diagCollectName)) {
-                        if (getLikeRate(diagName, diagCollectName)) {
-                            status.set("0");
-                            return;
-                        }
+            String leaveDiag = leaveHospitalDoc.getStructureMap().get("出院诊断");
+            for (String diagCollectName : diagCollectList) {
+                if (StringUtil.isNotEmpty(leaveDiag) && StringUtil.isNotEmpty(diagCollectName)) {
+                    if (getLikeRate(leaveDiag, diagCollectName) || leaveDiag.contains(diagCollectName)) {
+                        status.set("0");
+                        return;
                     }
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/leavehospital/LEA03293.java

@@ -63,7 +63,7 @@ public class LEA03293 extends QCCatalogue {
             if (initialDiagLabel != null) {
                 List<Diag> diagLists = initialDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
 
@@ -71,14 +71,14 @@ public class LEA03293 extends QCCatalogue {
             if (revisedDiagLabel != null) {
                 List<Diag> diagLists = revisedDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&(diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
             }
             if (suppleDiagLabel != null) {
                 List<Diag> diagLists = suppleDiagLabel.getDiags();
                 if (ListUtil.isNotEmpty(diagLists)) {
-                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) &&( diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
+                    diagLists.stream().filter(diag -> StringUtil.isNotEmpty(diag.getHospitalDiagName()) && (diagListWords.contains(diag.getHospitalDiagName()) || diag.getHospitalDiagName().matches(rex))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
             }
@@ -87,7 +87,7 @@ public class LEA03293 extends QCCatalogue {
         if (firstPageRecordDoc != null) {
             //获取出院诊断
             String leaveDiagStr = firstPageRecordDoc.getStructureMap().get("出院诊断");
-            if(StringUtil.isNotEmpty(leaveDiagStr)) {
+            if (StringUtil.isNotEmpty(leaveDiagStr)) {
                 List<Map<String, String>> leaveDiagList = (List<Map<String, String>>) JSONArray.parse(leaveDiagStr);
                 leaveDiagList.stream().filter(diagMap -> StringUtil.isNotEmpty(diagMap.get("诊断名称")) && (diagListWords.contains(diagMap.get("诊断名称")) || diagMap.get("诊断名称").matches(rex))).forEach(diagMap ->
                         diagList.add(diagMap.get("诊断名称")));
@@ -106,22 +106,12 @@ public class LEA03293 extends QCCatalogue {
                 return;
             }
             //获取入院诊断
-            DiagLabel beHospitalizedLabel = leaveHospitalDoc.getBeHospitalizedLabel();
-            if (beHospitalizedLabel == null) {
-                return;
-            }
-            List<Diag> diags = beHospitalizedLabel.getDiags();
-            if (ListUtil.isEmpty(diags)) {
-                return;
-            }
-            for (Diag diag : diags) {
-                String diagName = diag.getHospitalDiagName();
-                for (String diagCollectName : diagCollectList) {
-                    if (StringUtil.isNotEmpty(diagName) && StringUtil.isNotEmpty(diagCollectName)) {
-                        if (getLikeRate(diagName, diagCollectName)) {
-                            status.set("0");
-                            return;
-                        }
+            String beHospitalDiag = leaveHospitalDoc.getStructureMap().get("入院诊断");
+            for (String diagCollectName : diagCollectList) {
+                if (StringUtil.isNotEmpty(beHospitalDiag) && StringUtil.isNotEmpty(diagCollectName)) {
+                    if (getLikeRate(beHospitalDiag, diagCollectName) || beHospitalDiag.contains(diagCollectName)) {
+                        status.set("0");
+                        return;
                     }
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03313.java

@@ -120,13 +120,13 @@ public class OPE03313 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagZ)) {
-                            if (getLikeRate(operationDiagZ, diagCollectName)) {
+                            if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }
                         }
                         if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName)) {
+                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03315.java

@@ -121,7 +121,7 @@ public class OPE03315 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if (StringUtil.isNotEmpty(operationDiagO) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName)) {
+                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03316.java

@@ -121,13 +121,13 @@ public class OPE03316 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagZ)) {
-                            if (getLikeRate(operationDiagZ, diagCollectName)) {
+                            if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }
                         }
                         if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName)) {
+                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03319.java

@@ -125,13 +125,13 @@ public class OPE03319 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagZ)) {
-                            if (getLikeRate(operationDiagZ, diagCollectName)) {
+                            if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }
                         }
                         if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName)) {
+                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03321.java

@@ -124,7 +124,7 @@ public class OPE03321 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if ((StringUtil.isNotEmpty(operationDiagZ)) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagZ)) {
-                            if (getLikeRate(operationDiagZ, diagCollectName)) {
+                            if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/operationdiscussion/OPE03322.java

@@ -126,13 +126,13 @@ public class OPE03322 extends QCCatalogue {
                 for (String diagCollectName : diagCollectList) {
                     if ((StringUtil.isNotEmpty(operationDiagZ) || StringUtil.isNotEmpty(operationDiagO)) && StringUtil.isNotEmpty(diagCollectName)) {
                         if (StringUtil.isNotEmpty(operationDiagZ)) {
-                            if (getLikeRate(operationDiagZ, diagCollectName)) {
+                            if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }
                         }
                         if (StringUtil.isNotEmpty(operationDiagO)) {
-                            if (getLikeRate(operationDiagO, diagCollectName)) {
+                            if (getLikeRate(operationDiagO, diagCollectName) || operationDiagO.contains(diagCollectName)) {
                                 status.set("0");
                                 return;
                             }