Merge remote-tracking branch 'origin/dev-shaoyf' into dev-shaoyf

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

@@ -6,6 +6,7 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.PD;
 import com.lantone.qc.pub.model.label.ChiefLabel;
+import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
@@ -41,7 +42,7 @@ public class BEH0001 extends QCCatalogue {
                 for (Clinical clinical : clinicals) {
                     String clinicalName = clinical.getName();
                     List<PD> timestamp = clinical.getTimestamp();
-                    if (timestamp == null) {
+                    if (ListUtil.isEmpty(timestamp)) {
                         if (StringUtils.isEmpty(info.get())) {
                             info.set(clinicalName);
                         } else {

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

@@ -21,6 +21,7 @@ import java.util.List;
 @Component
 public class BEH0006 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;

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

@@ -8,7 +8,6 @@ import com.lantone.qc.pub.model.entity.General;
 import com.lantone.qc.pub.model.entity.GeneralDesc;
 import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.util.ListUtil;
-import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -32,7 +31,7 @@ public class BEH0441 extends QCCatalogue {
             status.set("0");
             return;
         }
-        List<String> words = Lists.newArrayList("胃纳", "食纳", "食欲", "未纳", "纳眠", "饮食", "纳眠"
+        List<String> words = Lists.newArrayList("胃纳", "食纳", "食欲", "未纳", "纳眠", "饮食", "睡眠"
                 ,"禁食","未食","鼻饲","食","吃","饮");
         /*
         String presentText = presentLabel.getText();