症状缺少近期时间描述规则更新

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

@@ -29,25 +29,25 @@ public class BEH0006 extends QCCatalogue {
         if(chief_text.contains("检查") || chief_text.contains("术后")){
             status = "0";
         }
-        else if(chief_text.contains("年")){
-            List<Clinical> clinicals = chiefLabel.getClinicals();
-            if(clinicals.size()>0){
-                List<String> unitList = new ArrayList<>();
-                for (Clinical clinical:clinicals) {
-                    List<PD> timestamp = clinical.getTimestamp();
-                    if(timestamp != null){
-                        for (PD pd:timestamp) {
-                            if(!CatalogueUtil.isEmpty(pd.getUnit())){
-                                unitList.add(pd.getUnit());
+
+        List<Clinical> clinicals = chiefLabel.getClinicals();
+        if(clinicals.size()>0){
+            for (Clinical clinical:clinicals) {
+                List<PD> timestamp = clinical.getTimestamp();
+                if(timestamp != null){
+                    for (PD pd:timestamp) {
+                        if(!CatalogueUtil.isEmpty(pd.getUnit())){
+                            if(pd.getUnit().contains("天") || pd.getUnit().contains("周")){
+                                status = "0";
+                                break;
                             }
                         }
                     }
-
-                }
-                if(unitList.contains("天")){
-                    status = "0";
                 }
             }
-        }
+        }else {
+                status = "0";
+            }
+
     }
 }

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

@@ -23,28 +23,25 @@ import java.util.List;
 @Component
 public class BEH0018 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        status = "0";
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
-        String chief_text = presentLabel.getText();
-        if(chief_text.contains("年")){
-            List<Clinical> clinicals = presentLabel.getClinicals();
-            if(clinicals.size()>0){
-                List<String> unitList = new ArrayList<>();
-                for (Clinical clinical:clinicals) {
-                    List<PD> timestamp = clinical.getTimestamp();
-                    if(timestamp != null){
-                        for (PD pd:timestamp) {
-                            if(!CatalogueUtil.isEmpty(pd.getUnit())){
-                                unitList.add(pd.getUnit());
+        List<Clinical> clinicals = presentLabel.getClinicals();
+        if(clinicals.size()>0){
+            for (Clinical clinical:clinicals) {
+                List<PD> timestamp = clinical.getTimestamp();
+                if(timestamp != null){
+                    for (PD pd:timestamp) {
+                        if(!CatalogueUtil.isEmpty(pd.getUnit())){
+                            if(pd.getUnit().contains("天") || pd.getUnit().contains("周")){
+                                status = "0";
+                                break;
                             }
                         }
                     }
-
-                }
-                if(!unitList.contains("天")){
-                    status = "-1";
                 }
             }
+        }else {
+            status = "0";
         }
     }
-}
+}
+