同邵逸夫一致

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

@@ -11,6 +11,7 @@ import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.springframework.stereotype.Component;
 
+import java.util.Arrays;
 import java.util.List;
 
 
@@ -22,6 +23,8 @@ import java.util.List;
  */
 @Component
 public class BEH0006 extends QCCatalogue {
+    private List<String> containList = Arrays.asList("半年", "术后");
+
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
@@ -32,31 +35,35 @@ public class BEH0006 extends QCCatalogue {
             status.set("0");
             return;
         }
-        List<Clinical> clinicalList = chiefLabel.getClinicals();
-        boolean flag = true;
-        // 主诉症状不超过1年就不报错，单位不包含“年”
-        if (ListUtil.isNotEmpty(clinicalList)) {
-            for (Clinical c : clinicalList) {
-                List<PD> pds = c.getTimestamp();
-                if (ListUtil.isNotEmpty(pds)) {
-                    for (PD pd : pds) {
-                        if (StringUtil.isNotBlank(pd.getName()) &&
-                                pd.getName().contains("年") && !"半年".equals(pd.getName())) {
-                            flag = false;
-                            break;
-                        }
-                    }
+//        List<Clinical> clinicalList = chiefLabel.getClinicals();
+//        boolean flag = true;
+//        // 主诉症状不超过1年就不报错，单位不包含“年”
+//        if (ListUtil.isNotEmpty(clinicalList)) {
+//            for (Clinical c : clinicalList) {
+//                List<PD> pds = c.getTimestamp();
+//                if (ListUtil.isNotEmpty(pds)) {
+//                    for (PD pd : pds) {
+//                        if (StringUtil.isNotBlank(pd.getName()) &&
+//                                pd.getName().contains("年") && !"半年".equals(pd.getName())) {
+//                            flag = false;
+//                            break;
+//                        }
+//                    }
+//                }
+//            }
+//            if (flag) {
+//                status.set("0");
+//                return;
+//            }
+//        }
+        String chiefText = chiefLabel.getText();
+        if (StringUtil.isNotBlank(chiefText)) {
+            for (String fild : containList) {
+                if (chiefText.contains(fild)) {
+                    status.set("0");
+                    return;
                 }
             }
-            if (flag) {
-                status.set("0");
-                return;
-            }
-        }
-        String chiefText = chiefLabel.getText();
-        if (StringUtil.isNotBlank(chiefText) && chiefText.contains("半年")) {
-            status.set("0");
-        } else {
             List<PD> pds = chiefLabel.getPds();
             if (pds != null && pds.size() > 0) {
                 if (pds.size() == 2) {
@@ -75,11 +82,13 @@ public class BEH0006 extends QCCatalogue {
                         }
                     }
                 }
-                // 如果都没包含，则报错
-                status.set("-1");
             } else {
-                status.set("0");
+                if (StringUtil.isNotBlank(chiefLabel.getText())) {
+                    status.set("0");
+                    return;
+                }
             }
+        }
             /*List<Clinical> clinicals = chiefLabel.getClinicals();
             if(clinicals.size()>0){
                 for (Clinical clinical:clinicals) {
@@ -103,6 +112,5 @@ public class BEH0006 extends QCCatalogue {
             }else {
                 status.set("0");
             }*/
-        }
     }
 }