现场问题整改

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

@@ -23,7 +23,9 @@ public class BEH0059 extends QCCatalogue {
         if (inputInfo.getBeHospitalizedDoc() != null) {
             if (inputInfo.getBeHospitalizedDoc().getStructureMap() == null
                     || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别") == null
-                    || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")) {
+                    || inputInfo.getBeHospitalizedDoc().getStructureMap().get("性别").contains("男")
+                    //加入判断，如果年龄小于15就不报规则
+                    || Integer.parseInt(inputInfo.getBeHospitalizedDoc().getStructureMap().get("年龄")) < 15) {
                 status.set("0"); //如果性别是男,就不报错
             } else {
                 String concatMenstrualText = concatMenstrualText(inputInfo);

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/yiwu/behospitalized/BEH02902.java

@@ -38,13 +38,17 @@ public class BEH02902 extends QCCatalogue {
                 || pacsText.contains("暂无")|| pacsText.contains("院")
                 || pacsText.contains("病理")
                 || pacsText.contains("科") || pacsText.contains("公司")
-                || pacsText.contains("社区卫生服务中心"))) {
+                || pacsText.contains("社区卫生服务中心")
+                || pacsText.contains("门诊部")
+                || pacsText.contains("综合门诊部"))) {
             status.set("0");
             return;
         }
         if (StringUtil.isNotBlank(pacsText1) && (pacsText1.contains("暂缺")
                 || pacsText1.contains("暂无") || pacsText1.contains("院")
                 || pacsText1.contains("科")|| pacsText1.contains("公司")
+                || pacsText1.contains("综合门诊部")
+                || pacsText1.contains("门诊部")
                 || pacsText.contains("社区卫生服务中心"))) {
             status.set("0");
             return;

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/yiwu/behospitalized/BEH0375.java

@@ -7,6 +7,7 @@ import com.lantone.qc.pub.model.InputInfo;
 import com.lantone.qc.pub.model.OutputInfo;
 import com.lantone.qc.pub.model.entity.Family;
 import com.lantone.qc.pub.model.label.MaritalLabel;
+import com.lantone.qc.pub.model.label.PersonalLabel;
 import com.lantone.qc.pub.util.ListUtil;
 import com.lantone.qc.pub.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
@@ -108,7 +109,7 @@ public class BEH0375 extends QCCatalogue {
             status.set("0");
             return;
         }
-        if(maritalText1!=null && maritalText1.contains("配偶健康状况")){
+        if((maritalText1!=null && maritalText1.contains("配偶健康状况")) || (maritalText1!=null && maritalText1.contains("健康状况"))){
             status.set("0");
         }
 

kernel/src/main/java/com/lantone/qc/kernel/catalogue/hospital/yiwu/firstpagerecord/FIRP0203.java

@@ -11,7 +11,7 @@ import java.util.Map;
 
 /**
  * @ClassName : FIRP0203
- * @Description : 出生地没有填写
+ * @Description : 出生地未填写
  * @Author : 楼辉荣
  * @Date: 2020-03-06 17:28ss
  */
@@ -22,6 +22,10 @@ public class FIRP0203 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String dischargeTime = firstpageStructureMap.get(Content.birth_address);
+            // 外国人不进行规则判断
+            if (!firstpageStructureMap.get(Content.nationality).equals("中国")){
+                return;
+            }
             if(CatalogueUtil.isEmpty(dischargeTime)){
                 status.set("-1");
                 Map<String, Object> structureExtMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();

trans/src/main/java/com/lantone/qc/trans/yiwu/YiwuDocTrans.java

@@ -123,9 +123,11 @@ public class YiwuDocTrans extends DocTrans {
                 case "住院病历信息":
                     YiWuMedicalRecordInfoDocTrans medicalRecordInfoDocTrans = new YiWuMedicalRecordInfoDocTrans();
                     inputInfo.setMedicalRecordInfoDoc(medicalRecordInfoDocTrans.extract(i));
+                    break;
                 case  "门诊":
                     YiWuOutDepDocTrans taiZhouOutDepDocTrans = new YiWuOutDepDocTrans();
                     inputInfo.setBeHospitalizedDoc(taiZhouOutDepDocTrans.extract(i));
+                    break;
                 default:
                     break;
             }