规则更新

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

@@ -6,9 +6,11 @@ import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Address;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
@@ -21,6 +23,14 @@ public class BEH0043 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        //台州结构化
+        Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        if(StringUtils.isNotEmpty(structureMap.get("居住地"))){
+            status.set("0");
+            return;
+        }
+
+
         String text = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getText();
         if (StringUtil.isBlank(text)) {
             return;

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

@@ -5,8 +5,11 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Smoking;
 import com.lantone.qc.pub.util.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import java.util.Map;
+
 /**
  * @Description: 吸烟史未描述
  * @author: rengb
@@ -17,6 +20,12 @@ public class BEH0046 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        //台州结构化
+        Map<String, String> structureMap = inputInfo.getBeHospitalizedDoc().getStructureMap();
+        if(StringUtils.isNotEmpty(structureMap.get("吸烟"))){
+            status.set("0");
+            return;
+        }
         Smoking smoking = inputInfo.getBeHospitalizedDoc().getPersonalLabel().getSmoking();
         if (smoking != null && StringUtil.isNotBlank(smoking.getName())) {
             status.set("0");

trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

@@ -52,6 +52,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
             "民族=民族",
             "职业=职业",
             "出生地址=出生地",
+            "出生、生长史=居住地",
             "婚姻=婚姻",
             "地址=联系地址",
             "信息来源=病史陈述者",