类似疾病史未描述（乳腺癌）优化、辅助检查未注明时间优化、产科检查中破膜未破与胎膜早破诊断不符优化、外国人民族未填写优化

kernel/src/main/java/com/lantone/qc/kernel/catalogue/consultation/CON03305.java

@@ -85,6 +85,7 @@ public class CON03305 extends QCCatalogue {
             if(inputInfo.getBeHospitalizedDoc() != null) {
 
                 String b = inputInfo.getBeHospitalizedDoc().getStructureMap().get("初步诊断");
+                String c = inputInfo.getBeHospitalizedDoc().getStructureMap().get("补充诊断");
                 //遍历每个疾病并与入院记录中的各个字段相匹配
                 for (int i = 0; i < disease_name.size(); i++) {
                     String name = disease_name.get(i);
@@ -94,7 +95,7 @@ public class CON03305 extends QCCatalogue {
                     }
                 }
                 //匹配到胎膜早破正则,则提示，
-                if (getIsCompile(b)) {
+                if (getIsCompile(b)||getIsCompile(c)) {
                     status.set("-1");
                     return;
                 }

kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstcourserecord/FIRC03152.java

@@ -13,8 +13,8 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * @ClassName : FIRC0085
- * @Description : 未归纳出病史特点
+ * @ClassName : FIRC03152
+ * @Description : 病例特点依据不充分
  * @Author : rengb
  * @Date: 2020-03-06 17:28
  */

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

@@ -32,6 +32,9 @@ public class BEH0075 extends QCCatalogue {
             if (StringUtil.isNotBlank(familyText) && familyText.contains("类似疾病")) {
                 return;
             }
+            if(familyText.contains("乳腺癌") || familyText.contains("乳腺")){
+                return;
+            }
             boolean findSimilarDiag = false;
             for (Family family : families) {
                 if (family.getSimilarDiag() != null && StringUtil.isNotBlank(family.getSimilarDiag().getName())) {

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

@@ -33,7 +33,12 @@ public class BEH02903 extends QCCatalogue {
             return;
         }
 
-        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("病理") || pacsText.contains("暂无"))) {
+        if (StringUtil.isNotBlank(pacsText) && (pacsText.contains("暂缺") || pacsText.contains("病理") || pacsText.contains("暂无")) || pacsText.contains("无")) {
+            status.set("0");
+            return;
+        }
+        // 辅助检查未注明时间规则优化
+        if(StringUtil.isNotBlank(pacsText) && (pacsText.contains("20"))){
             status.set("0");
             return;
         }

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

@@ -22,6 +22,10 @@ public class FIRP0205 extends QCCatalogue {
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {
             Map<String, String> firstpageStructureMap = inputInfo.getFirstPageRecordDoc().getStructureMap();
             String dischargeTime = firstpageStructureMap.get(Content.nation);
+            //要把外国人的逻辑更新上去，如果不是中国国籍就不触发此规则
+            if (!firstpageStructureMap.get("国籍").equals("中国")){
+                return;
+            }
             if (CatalogueUtil.isEmpty(dischargeTime)) {
                 status.set("-1");
                 Map<String, Object> structureExtMap = inputInfo.getFirstPageRecordDoc().getStructureExtMap();