Merge remote-tracking branch 'origin/master'

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

@@ -23,7 +23,9 @@ public class BEH0003 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
 
         String chief_text = inputInfo.getBeHospitalizedDoc().getChiefLabel().getText();
-        if(CatalogueUtil.removeSpecialChar(chief_text).length()<=20)
+        int length = CatalogueUtil.removeSpecialChar(chief_text).length();
+        int length1 = chief_text.length();
+        if(CatalogueUtil.removeSpecialChar(chief_text).length()<20)
         {
             status.set("0");
         }

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

@@ -44,6 +44,10 @@ public class BEH0005 extends QCCatalogue {
             if (day != -1) {
                 time_index.add(day);
             }
+            int ri = chief_text.indexOf("日");
+            if (ri != -1) {
+                time_index.add(ri);
+            }
             int hour = chief_text.indexOf("时");
             if (hour != -1) {
                 time_index.add(hour);

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

@@ -26,7 +26,7 @@ public class BEH0006 extends QCCatalogue {
 
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         String chief_text = chiefLabel.getText();
-        if(chief_text.contains("检查") || chief_text.contains("术后") || chief_text.contains("药物")){
+        if(chief_text.contains("检查") || chief_text.contains("术后") || chief_text.contains("药物")|| chief_text.contains("发现")){
             status.set("0");
         }else {
             List<Clinical> clinicals = chiefLabel.getClinicals();
@@ -38,7 +38,7 @@ public class BEH0006 extends QCCatalogue {
                             if(!CatalogueUtil.isEmpty(pd.getName())){
                                 if(pd.getName().contains("天") || pd.getName().contains("周")|| pd.getName().contains("月")
                                         || pd.getName().contains("时") || pd.getName().contains("半年") || pd.getName().contains("秒")
-                                        || pd.getName().contains("日")){
+                                        || pd.getName().contains("日")|| pd.getName().contains("今")){
                                     status.set("0");
                                     break;
                                 }

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

@@ -31,7 +31,7 @@ public class BEH0018 extends QCCatalogue {
                 if(!CatalogueUtil.isEmpty(pdName)){
                     if(pdName.contains("天") || pdName.contains("周")|| pdName.contains("月")
                             || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
-                            || pdName.contains("日")){
+                            || pdName.contains("日") || pdName.contains("今")){
                         status.set("0");
                         break;
                     }