1.修改bug

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

@@ -4,13 +4,10 @@ import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
 import com.lantone.qc.pub.model.InputInfo;
 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.model.label.PresentLabel;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 
@@ -23,19 +20,19 @@ import java.util.List;
 @Component
 public class BEH0018 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
-        if(inputInfo.getBeHospitalizedDoc() == null){
+        if (inputInfo.getBeHospitalizedDoc() == null) {
             status.set("0");
             return;
         }
         PresentLabel presentLabel = inputInfo.getBeHospitalizedDoc().getPresentLabel();
         List<PD> pds = presentLabel.getPds();
-        if(pds != null && pds.size()>0){
-            for (PD pd:pds) {
+        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("月")
+                if (!CatalogueUtil.isEmpty(pdName)) {
+                    if (pdName.contains("天") || pdName.contains("周") || pdName.contains("月")
                             || pdName.contains("时") || pdName.contains("半年") || pdName.contains("秒")
-                            || pdName.contains("日") || pdName.contains("今")){
+                            || pdName.contains("日") || pdName.contains("今") || isDate(pdName)) {
                         status.set("0");
                         break;
                     }
@@ -44,5 +41,10 @@ public class BEH0018 extends QCCatalogue {
         }
 
     }
+
+    private boolean isDate(String pdName) {
+        String regex = "[0-9]{4}.?[0-9]{2}.?[0-9]{2}";
+        return pdName.matches(regex);
+    }
 }
 

trans/src/main/java/com/lantone/qc/trans/changx/ChangxBeHospitalizedDocTrans.java

@@ -81,7 +81,7 @@ public class ChangxBeHospitalizedDocTrans extends ModelDocTrans {
             "病史提供者++++病史叙述者=病史陈述者",
             "婚育史:=婚育史",
             "外生殖器++++外生殖器文本框=",
-            "户口地址=联系地址",
+//            "户口地址=联系地址",
             "家庭住址++++现住址=现住址",
             "产次++++产=产次",
             "家长姓名++++家长=家长姓名",