1.月经史若包含“未行经”则不判断月经史相关规则

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

@@ -34,6 +34,11 @@ public class BEH0060 extends QCCatalogue {
                 }
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+                    String text = menstrualLabel.getText();
+                    if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
+                        status.set("0");
+                        return;
+                    }
                     List<Menses> mensesList = menstrualLabel.getMensesList();
                     for (Menses menses : mensesList) {
                         if (menses.getMenarcheAge() != null && StringUtil.isNotBlank(menses.getMenarcheAge().getName())) {

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

@@ -35,6 +35,11 @@ public class BEH0061 extends QCCatalogue {
                 }
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+                    String text = menstrualLabel.getText();
+                    if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
+                        status.set("0");
+                        return;
+                    }
                     List<Menses> mensesList = menstrualLabel.getMensesList();
                     if (ListUtil.isEmpty(mensesList)) {
                         return;

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

@@ -35,6 +35,11 @@ public class BEH0062 extends QCCatalogue {
                 }
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+                    String text = menstrualLabel.getText();
+                    if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
+                        status.set("0");
+                        return;
+                    }
                     List<Menses> mensesList = menstrualLabel.getMensesList();
                     if (ListUtil.isEmpty(mensesList)) {
                         return;

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

@@ -36,6 +36,11 @@ public class BEH0063 extends QCCatalogue {
                 }
                 if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                     MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+                    String text = menstrualLabel.getText();
+                    if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
+                        status.set("0");
+                        return;
+                    }
                     List<Menses> mensesList = menstrualLabel.getMensesList();
                     if (ListUtil.isEmpty(mensesList)) {
                         return;

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

@@ -45,6 +45,11 @@ public class BEH0064 extends QCCatalogue {
             }
             if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+                String text = menstrualLabel.getText();
+                if (StringUtil.isNotBlank(text) && text.contains("未行经")) {
+                    status.set("0");
+                    return;
+                }
                 List<Menses> mensesList = menstrualLabel.getMensesList();
                 if (ListUtil.isEmpty(mensesList)) {
                     return;

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

@@ -31,25 +31,24 @@ public class BEH0065 extends QCCatalogue {
             status.set("0"); //如果性别是男,就不报错
         } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
-            if (menstrualLabel != null) {
-                if (StringUtil.isNotBlank(menstrualLabel.getText()) && menstrualLabel.getText().contains("颜色")) {
-                    status.set("0");
-                    return;
-                }
-                List<Menses> mensesList = menstrualLabel.getMensesList();
-                if (ListUtil.isEmpty(mensesList)) {
-                    return;
+            String text = menstrualLabel.getText();
+            if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("颜色"))) {
+                status.set("0");
+                return;
+            }
+            List<Menses> mensesList = menstrualLabel.getMensesList();
+            if (ListUtil.isEmpty(mensesList)) {
+                return;
+            }
+            for (Menses menses : mensesList) {
+                if (menses.getClinicals() == null) {
+                    continue;
                 }
-                for (Menses menses : mensesList) {
-                    if (menses.getClinicals() == null) {
-                        continue;
-                    }
-                    List<Clinical> clinicals = menses.getClinicals();
-                    for (Clinical clinical : clinicals) {
-                        if (clinical.getName().contains("颜色")) {
-                            status.set("0");
-                            return;
-                        }
+                List<Clinical> clinicals = menses.getClinicals();
+                for (Clinical clinical : clinicals) {
+                    if (clinical.getName().contains("颜色")) {
+                        status.set("0");
+                        return;
                     }
                 }
             }

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

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Menses;
 import com.lantone.qc.pub.model.label.MenstrualLabel;
 import com.lantone.qc.pub.util.ListUtil;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -30,6 +31,11 @@ public class BEH0066 extends QCCatalogue {
             status.set("0"); //如果性别是男,就不报错
         } else if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
+            String text = menstrualLabel.getText();
+            if (StringUtil.isNotBlank(text) && text.contains("未行经")){
+                status.set("0");
+                return;
+            }
             List<Menses> mensesList = menstrualLabel.getMensesList();
             if (ListUtil.isEmpty(mensesList)) {
                 return;

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

@@ -39,7 +39,7 @@ public class BEH0067 extends QCCatalogue {
             if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
                 String labelText = menstrualLabel.getText();
-                if (StringUtil.isNotBlank(labelText) && labelText.contains("痛经")) {
+                if (StringUtil.isNotBlank(labelText) && (labelText.contains("未行经") ||labelText.contains("痛经"))) {
                     status.set("0");
                     return;
                 }

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

@@ -34,7 +34,12 @@ public class BEH0068 extends QCCatalogue {
             }
             if (inputInfo.getBeHospitalizedDoc().getMenstrualLabel() != null) {
                 MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
-                if (menstrualLabel == null || menstrualLabel.getLeukorrheas() == null) {
+                String text = menstrualLabel.getText();
+                if (StringUtil.isNotBlank(text) && text.contains("未行经")){
+                    status.set("0");
+                    return;
+                }
+                if (menstrualLabel.getLeukorrheas() == null) {
                     return;
                 }
                 if (menstrualLabel.getLeukorrheas().size() > 0) {