修改逻辑及bug

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

@@ -37,7 +37,7 @@ public class BEH0005 extends QCCatalogue {
         if (chiefText.contains("检查") || chiefText.contains("术后") || chiefText.contains("药物")) {
             status.set("0");
         } else {
-            List<String> words = Lists.newArrayList("年", "月", "周", "天", "日", "时");
+            List<String> words = Lists.newArrayList("年", "月", "周", "天", "日", "时","分");
             String name;
             for (PD pd : pds) {
                 name = pd.getName();

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.PD;
 import com.lantone.qc.pub.model.label.PresentLabel;
+import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -29,10 +30,11 @@ public class BEH0018 extends QCCatalogue {
         if (pds != null && pds.size() > 0) {
             for (PD pd : pds) {
                 String pdName = pd.getName();
-                if (!CatalogueUtil.isEmpty(pdName)) {
+                if (StringUtil.isNotBlank(pdName)) {
                     if (pdName.contains("天") || pdName.contains("周") || pdName.contains("月")
-                            || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
-                            || pdName.contains("日") || pdName.contains("今") || pdName.contains("余年") || isDate(pdName) || pdName.contains("年")) {
+                            || pdName.contains("时") || pdName.contains("秒") || pdName.contains("半年")
+                            || pdName.contains("日") || pdName.contains("今") || pdName.contains("余年")
+                            || pdName.contains("年") || pdName.contains("分") || isDate(pdName)) {
                         status.set("0");
                         break;
                     }

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

@@ -35,7 +35,7 @@ public class BEH0065 extends QCCatalogue {
         } else {
             MenstrualLabel menstrualLabel = inputInfo.getBeHospitalizedDoc().getMenstrualLabel();
             String text = menstrualLabel.getText();
-            if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("颜色")|| text.contains("已绝经"))) {
+            if (StringUtil.isNotBlank(text) && (text.contains("未行经") || text.contains("颜色")|| text.contains("已绝经")|| text.contains("未来潮"))) {
                 status.set("0");
                 return;
             }

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

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