规则更新

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

@@ -29,7 +29,21 @@ public class BEH0006 extends QCCatalogue {
         if(chief_text.contains("检查") || chief_text.contains("术后") || chief_text.contains("药物")|| chief_text.contains("发现")){
             status.set("0");
         }else {
-            List<Clinical> clinicals = chiefLabel.getClinicals();
+            List<PD> pds = chiefLabel.getPds();
+            if(pds != null && pds.size()>0){
+                for (PD pd:pds) {
+                    String pdName = pd.getName();
+                    if(!CatalogueUtil.isEmpty(pdName)){
+                        if(pdName.contains("天") || pdName.contains("周")|| pdName.contains("月")
+                                || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
+                                || pdName.contains("日") || pdName.contains("今")){
+                            status.set("0");
+                            break;
+                        }
+                    }
+                }
+            }
+            /*List<Clinical> clinicals = chiefLabel.getClinicals();
             if(clinicals.size()>0){
                 for (Clinical clinical:clinicals) {
                     List<PD> timestamp = clinical.getTimestamp();
@@ -51,7 +65,7 @@ public class BEH0006 extends QCCatalogue {
                 }
             }else {
                 status.set("0");
-            }
+            }*/
         }
     }
 }

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/BeHospitalizedAI.java

@@ -176,6 +176,7 @@ public class BeHospitalizedAI extends ModelAI {
         ChiefLabel chiefLabel = inputInfo.getBeHospitalizedDoc().getChiefLabel();
         chiefLabel.setClinicals(presentLabel.getClinicals());
         chiefLabel.setDiags(presentLabel.getDiags());
+        chiefLabel.setPds(presentLabel.getPds());
     }
 
     public void putPresentCrfData(JSONObject jsonObject, InputInfo inputInfo) {

public/src/main/java/com/lantone/qc/pub/model/label/ChiefLabel.java

@@ -2,9 +2,11 @@ package com.lantone.qc.pub.model.label;
 
 import com.lantone.qc.pub.model.entity.Clinical;
 import com.lantone.qc.pub.model.entity.Diag;
+import com.lantone.qc.pub.model.entity.PD;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,4 +20,6 @@ import java.util.List;
 public class ChiefLabel extends GeneralLabel {
     private List<Clinical> clinicals;
     private List<Diag> diags;
+    //现病史中所有时间实体存入
+    private List<PD> pds = new ArrayList<>();
 }