义乌规则测试问题修正

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH03302.java

@@ -75,13 +75,13 @@ public class BEH03302 extends QCCatalogue {
                     if (StringUtil.isNotBlank(initDiagLabelText)) {
                         if (initDiagLabelText.contains("胎膜早破") || initDiagLabelText.contains("足月胎膜早破") || initDiagLabelText.contains("早产胎膜早破")
                                 || initDiagLabelText.contains("胎膜早破")) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                         Pattern patterninit = Pattern.compile(diagregex);
                         Matcher matcherinit = patterninit.matcher(initDiagLabelText);
                         if (matcherinit.find()) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }
@@ -93,13 +93,13 @@ public class BEH03302 extends QCCatalogue {
                     if (StringUtil.isNotBlank(revisedDiagLabelText)) {
                         if (revisedDiagLabelText.contains("胎膜早破") || revisedDiagLabelText.contains("足月胎膜早破") || revisedDiagLabelText.contains("早产胎膜早破")
                                 || revisedDiagLabelText.contains("胎膜早破")) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                         Pattern patternrevised = Pattern.compile(diagregex);
                         Matcher matcherrevised = patternrevised.matcher(revisedDiagLabelText);
                         if (matcherrevised.find()) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }
@@ -111,13 +111,13 @@ public class BEH03302 extends QCCatalogue {
                     String suppleDiagLabelText = supplediagLabel.getText();
                     if (StringUtil.isNotBlank(suppleDiagLabelText)) {
                         if (suppleDiagLabelText.contains("胎膜早破") || suppleDiagLabelText.contains("足月胎膜早破") || suppleDiagLabelText.contains("早产胎膜早破")) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                         Pattern patternsupple = Pattern.compile(diagregex);
                         Matcher matchersupple = patternsupple.matcher(suppleDiagLabelText);
                         if (matchersupple.find()) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH03324.java

@@ -103,7 +103,7 @@ public class BEH03324 extends QCCatalogue {
         String[] split = PPT.split("-");
         try {
             if ((strConvertInt(graNum) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]) + 1) ||
-                    (strConvertInt(parityNum) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]))
+                    (strConvertInt(parityNum) != strConvertInt(split[0]) + strConvertInt(split[1]))
             ) {
                 status.set("-1");
                 return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON03305.java

@@ -84,18 +84,18 @@ public class CON03305 extends QCCatalogue {
             List<String> disease_name = Arrays.asList("胎膜早破", "足月胎膜早破", "早产胎膜早破");
             if(inputInfo.getBeHospitalizedDoc() != null) {
 
-                String b = inputInfo.getBeHospitalizedDoc().getStructureMap().get("初步症断");
+                String b = inputInfo.getBeHospitalizedDoc().getStructureMap().get("初步诊断");
                 //遍历每个疾病并与入院记录中的各个字段相匹配
                 for (int i = 0; i < disease_name.size(); i++) {
                     String name = disease_name.get(i);
                     if (StringUtil.isNotBlank(b) && b.contains(name)) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
                 //匹配到胎膜早破正则,则提示，
                 if (getIsCompile(b)) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }
@@ -117,13 +117,13 @@ public class CON03305 extends QCCatalogue {
                         String name = disease_name.get(i);
                         //判断病案首页中的出院诊断字段集合中的诊断名称是否有匹配胎膜早破-疾病列表中任一疾病名称
                         if (StringUtil.isNotBlank(h) && h.contains(name)) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }
                     //判断是否匹配早破正则
                     if (getIsCompile(h)) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
@@ -136,13 +136,13 @@ public class CON03305 extends QCCatalogue {
                     String name = disease_name.get(i);
                     //出院小结中的出院诊断字段是否有匹配胎膜早破-疾病列表中任一疾病名称
                     if (StringUtil.isNotBlank(k) && k.contains(name) ) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
                 //判断是否匹配早破正则
                 if (getIsCompile(k)) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/difficultcasediscuss/DIF03307.java

@@ -99,13 +99,13 @@ public class DIF03307 extends QCCatalogue {
                         String name = disease_name.get(i);
                         //判断病案首页中的出院诊断字段中的诊断名称是否有匹配胎膜早破-疾病列表中任一疾病名称
                         if (StringUtil.isNotBlank(h) && h.contains(name)) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }
                     //判断是否匹配早破正则
                     if (getIsCompile(h)) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
@@ -118,13 +118,13 @@ public class DIF03307 extends QCCatalogue {
                     String name = disease_name.get(i);
                     //出院小结中的出院诊断字段是否有匹配胎膜早破-疾病列表中任一疾病名称
                     if (StringUtil.isNotBlank(k) && k.contains(name) ) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
                 //判断是否匹配早破正则
                 if (getIsCompile(k)) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03303.java

@@ -70,13 +70,13 @@ public class FIRC03303 extends QCCatalogue {
                 String name = disease_name.get(i);
                 //如果匹配到相关列表则提示，程序终止。
                 if ((StringUtil.isNotBlank(d) && d.contains(name)) || (StringUtil.isNotBlank(e) && e.contains(name)) || (StringUtil.isNotBlank(f) && f.contains(name))) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }
             //匹配到胎膜早破正则,输出，
             if ((StringUtil.isNotBlank(d) && getIsCompile(d)) || (StringUtil.isNotBlank(d) && getIsCompile(e)) || (StringUtil.isNotBlank(d) && getIsCompile(f))) {
-                status.set("1");
+                status.set("-1");
                 return;
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03326.java

@@ -114,7 +114,7 @@ public class FIRC03326 extends QCCatalogue {
             String[] split = Diagnosis.split("-");
             try {
                 if ((strConvertInt(graNumA) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]) + 1) ||
-                        (strConvertInt(parityNumB) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]))
+                        (strConvertInt(parityNumB) != strConvertInt(split[0]) + strConvertInt(split[1]))
                 ) {
                     status.set("-1");
                     return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP03308.java

@@ -75,7 +75,7 @@ public class FIRP03308 extends QCCatalogue {
            if(k){
                //查证匹配的疾病对应的入院病情是否填写为【无/4/4.无】
                if(n.equals("无") || n.equals("4") || n.equals("4.无")){
-                   status.set("1");
+                   status.set("-1");
                    return;
                }
 
@@ -96,7 +96,7 @@ public class FIRP03308 extends QCCatalogue {
                 if(StringUtil.isNotBlank(h)&&h.contains(name)){
                     f = true;
                     if(s.equals("无") || s.equals("4") || s.equals("4.无")){
-                        status.set("1");
+                         status.set("-1");
                         return;
                     }
                 }

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

@@ -106,11 +106,14 @@ public class LEA03290 extends QCCatalogue {
                 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;
+            for (String diagCollect : diagCollectList) {
+                String[] split = diagCollect.split(" ");
+                for (String diagCollectName : split) {
+                    if (StringUtil.isNotEmpty(leaveDiag) && StringUtil.isNotEmpty(diagCollectName)) {
+                        if (getLikeRate(leaveDiag, diagCollectName) || leaveDiag.contains(diagCollectName)) {
+                            status.set("0");
+                            return;
+                        }
                     }
                 }
             }
@@ -134,7 +137,7 @@ public class LEA03290 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

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

@@ -108,11 +108,14 @@ public class LEA03293 extends QCCatalogue {
             }
             //获取入院诊断
             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;
+            for (String diagCollect : diagCollectList) {
+                String[] split = diagCollect.split(" ");
+                for (String diagCollectName : split) {
+                    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/leavehospital/LEA03323.java

@@ -152,7 +152,7 @@ public class LEA03323 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

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

@@ -105,6 +105,7 @@ public class OPE03313 extends QCCatalogue {
             //获取术后首程病程录
             List<OperationDoc> operationDocs = inputInfo.getOperationDocs();
             if (ListUtil.isEmpty(operationDocs)) {
+                status.set("0");
                 return;
             }
             for (OperationDoc operationDoc : operationDocs) {

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

@@ -120,18 +120,21 @@ public class OPE03316 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;
+                                }
                             }
                         }
                     }
@@ -157,7 +160,7 @@ public class OPE03316 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

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

@@ -124,18 +124,21 @@ public class OPE03319 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;
+                                }
                             }
                         }
                     }
@@ -161,7 +164,7 @@ public class OPE03319 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

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

@@ -65,7 +65,7 @@ public class OPE03321 extends QCCatalogue {
                 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) || diag.getHospitalDiagName().contains("胎膜早破") )).forEach(diag ->
+                            diag.getHospitalDiagName().matches(rex) || diag.getHospitalDiagName().contains("胎膜早破"))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
 
@@ -94,7 +94,7 @@ public class OPE03321 extends QCCatalogue {
             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) || diagMap.get("诊断名称").contains("胎膜早破") )).forEach(diagMap ->
+                        diagMap.get("诊断名称").matches(rex) || diagMap.get("诊断名称").contains("胎膜早破"))).forEach(diagMap ->
                         diagList.add(diagMap.get("诊断名称")));
             }
         }
@@ -123,12 +123,15 @@ public class OPE03321 extends QCCatalogue {
                 if (StringUtil.isEmpty(operationDiagZ)) {
                     continue;
                 }
-                for (String diagCollectName : diagCollectList) {
-                    if ((StringUtil.isNotEmpty(operationDiagZ)) && 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(diagCollectName)) {
+                            if (StringUtil.isNotEmpty(operationDiagZ)) {
+                                if (getLikeRate(operationDiagZ, diagCollectName) || operationDiagZ.contains(diagCollectName)) {
+                                    status.set("0");
+                                    return;
+                                }
                             }
                         }
                     }
@@ -154,7 +157,7 @@ public class OPE03321 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

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

@@ -66,7 +66,7 @@ public class OPE03322 extends QCCatalogue {
                 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) || diag.getHospitalDiagName().contains("胎膜早破") )).forEach(diag ->
+                            diag.getHospitalDiagName().matches(rex) || diag.getHospitalDiagName().contains("胎膜早破"))).forEach(diag ->
                             diagList.add(diag.getHospitalDiagName()));
                 }
 
@@ -95,7 +95,7 @@ public class OPE03322 extends QCCatalogue {
             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) || diagMap.get("诊断名称").contains("胎膜早破") )).forEach(diagMap ->
+                        diagMap.get("诊断名称").matches(rex) || diagMap.get("诊断名称").contains("胎膜早破"))).forEach(diagMap ->
                         diagList.add(diagMap.get("诊断名称")));
             }
         }
@@ -125,18 +125,21 @@ public class OPE03322 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;
+                                }
                             }
                         }
                     }
@@ -162,7 +165,7 @@ public class OPE03322 extends QCCatalogue {
             JSONObject dataContent = data.getJSONObject(0);
             likeRate = dataContent.getDoubleValue("like_rate");
         }
-        if (likeRate > 0.9) {
+        if (likeRate > 0.7) {
             return true;
         }
         return false;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/preoperativediscussion/PRE03306.java

@@ -103,13 +103,13 @@ public class PRE03306 extends QCCatalogue {
                         String name = disease_name.get(i);
                         //判断病案首页中的出院诊断字段中的诊断名称是否有匹配胎膜早破-疾病列表中任一疾病名称
                         if (StringUtil.isNotBlank(h) && h.contains(name)) {
-                            status.set("1");
+                            status.set("-1");
                             return;
                         }
                     }
                     //判断是否匹配早破正则
                     if (getIsCompile(h)) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
@@ -122,13 +122,13 @@ public class PRE03306 extends QCCatalogue {
                     String name = disease_name.get(i);
                     //出院小结中的出院诊断字段是否有匹配胎膜早破-疾病列表中任一疾病名称
                     if (StringUtil.isNotBlank(k) && k.contains(name) ) {
-                        status.set("1");
+                        status.set("-1");
                         return;
                     }
                 }
                 //判断是否匹配早破正则
                 if (getIsCompile(k)) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03304.java

@@ -67,13 +67,13 @@ public class THR03304 extends QCCatalogue {
                 String name = disease_name.get(i);
                 if ((StringUtil.isNotBlank(b) && b.contains(name)) || (StringUtil.isNotBlank(c)
                         && c.contains(name)) || (StringUtil.isNotBlank(d) && d.contains(name))) {
-                    status.set("1");
+                    status.set("-1");
                     return;
                 }
             }
             //匹配到胎膜早破正则,输出，
-            if ((StringUtil.isNotBlank(b) && getIsCompile(b)) || (StringUtil.isNotBlank(b) && getIsCompile(c)) || (StringUtil.isNotBlank(b) && getIsCompile(d))) {
-                status.set("1");
+            if ((StringUtil.isNotBlank(b) && getIsCompile(b)) || (StringUtil.isNotBlank(c) && getIsCompile(c)) || (StringUtil.isNotBlank(b) && getIsCompile(d))) {
+                status.set("-1");
                 return;
             }
         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03309.java

@@ -98,7 +98,7 @@ public class THR03309 extends QCCatalogue {
                             String a = three.getStructureMap().get("病情记录");
                             //判断查房记录中的病情记录字段是否匹配正则，有则返回true,继续
                             if(!getIsCompile(a)){
-                                status.set("1");
+                                status.set("-1");
                                 return;
                             }
                         }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR03325.java

@@ -106,7 +106,7 @@ public class THR03325 extends QCCatalogue {
         String[] split = PPT.split("-");
         try {
             if ((strConvertInt(graNum) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]) + 1) ||
-                    (strConvertInt(parityNum) != strConvertInt(split[0]) + strConvertInt(split[1]) + strConvertInt(split[2]))
+                    (strConvertInt(parityNum) != strConvertInt(split[0]) + strConvertInt(split[1]))
             ) {
                 status.set("-1");
                 return;