Browse Source

优化代码

zhoutg 4 years ago
parent
commit
ed5a036151

+ 2 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0006.java

@@ -53,6 +53,8 @@ public class BEH0006 extends QCCatalogue {
                         }
                     }
                 }
+                // 如果都没包含,则报错
+                status.set("-1");
             }
             /*List<Clinical> clinicals = chiefLabel.getClinicals();
             if(clinicals.size()>0){

+ 2 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0018.java

@@ -36,7 +36,8 @@ public class BEH0018 extends QCCatalogue {
                 List<PD> pds = c.getTimestamp();
                 if (ListUtil.isNotEmpty(pds)) {
                     for (PD pd : pds) {
-                        if ("年".equals(pd.getUnit()) && !"半年".equals(pd.getName())) {
+                        if (StringUtil.isNotBlank(pd.getName()) &&
+                                pd.getName().contains("年") && !"半年".equals(pd.getName())) {
                             flag = false;
                             break;
                         }